Changeset 803

Timestamp:

Feb 23, 2016, 7:18:38 PM (9 years ago)

Author:

chronos

Message:

• Added: Relation between StockMoveItem and StockSerialNumber so serial numbers can be associated with stock move items now.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Modules/Stock/Stock.php (modified) (6 diffs)

trunk/Application/UpdateTrace.php

@@ -1887 +1887 @@
   $Manager->Execute('ALTER TABLE `StockMove` DROP `BillCodeText`;');
   $Manager->Execute('ALTER TABLE `StockMoveItem` DROP `Text`;');
+}
+
+function UpdateTo803($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `StockMoveItemSerialRel` (
+  `Id` int(11) NOT NULL,
+  `StockMoveItem` int(11) NOT NULL,
+  `StockSerialNumber` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `StockSerialNumber` (`StockSerialNumber`),
+  KEY `StockMoveItem` (`StockMoveItem`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `StockMoveItemSerialRel` ADD FOREIGN KEY (`StockMoveItem`) '.
+    'REFERENCES `StockMoveItem`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+  $Manager->Execute('ALTER TABLE `StockMoveItemSerialRel` ADD FOREIGN KEY (`StockSerialNumber`) '.
+    'REFERENCES `StockSerialNumber`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
 }
 
@@ -1974 +1990 @@
       792 => array('Revision' => 800, 'Function' => 'UpdateTo800'),
       800 => array('Revision' => 802, 'Function' => 'UpdateTo802'),
+      802 => array('Revision' => 803, 'Function' => 'UpdateTo803'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 802; // Subversion revision
-$DatabaseRevision = 802; // SQL structure revision
+$Revision = 803; // Subversion revision
+$DatabaseRevision = 803; // SQL structure revision
 $ReleaseTime = strtotime('2016-02-23');

trunk/Common/Global.php

@@ -225 +225 @@
     }
   }
-  if($Found == false)
+  if(($_SESSION['OrderCol'] == '') or ($Found == false))
   {
     $_SESSION['OrderCol'] = $DefaultColumn;

trunk/Modules/Stock/Stock.php

@@ -17 +17 @@
   {
     global $Config;
-   
+
     $this->System->FormManager->RegisterClass('Product', array(
       'Title' => 'Produkty',
@@ -57 +57 @@
         'Parts' => array('Type' => 'TStockSerialNumberListStockSerialNumber', 'Caption' => 'Části', 'Default' => ''),
         'History' => array('Type' => 'TStockItemHistoryListStockSerialNumber', 'Caption' => 'Historie', 'Default' => ''),
+        'Sériové čísla' => array('Type' => 'TStockMoveItemSerialListSerial', 'Caption' => 'Skladové pohyby', 'Default' => ''),
       ),
     ));
@@ -106 +107 @@
         'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
           'ReadOnly' => true, 'SQL' => 'ROUND(`UnitPrice` * `Amount`, '.$Config['Finance']['Rounding'].')'),
+        'Položky pohybů' => array('Type' => 'TStockMoveItemSerialListItem', 'Caption' => 'Vztahy sériových čísel', 'Default' => ''),
+        'Sériové čísla' => array('Type' => 'String', 'Caption' => 'Sériové čísla', 'ReadOnly' => true,
+          'SQL' => 'SELECT GROUP_CONCAT(`StockSerialNumber`.`RegNumber` SEPARATOR ", ") FROM `StockMoveItemSerialRel` '.
+          'LEFT JOIN `StockSerialNumber` ON `StockSerialNumber`.`Id`=`StockMoveItemSerialRel`.`StockSerialNumber` '.
+          'WHERE `StockMoveItemSerialRel`.`StockMoveItem`=#Id'),
       ),
     ));
@@ -129 +135 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('StockMoveItemSerialRel', array(
+      'Title' => 'Vztah položky skladových pohybů a sériových čísel',
+      'Table' => 'StockMoveItemSerialRel',
+      'Items' => array(
+        'StockMoveItem' => array('Type' => 'TStockMoveItem', 'Caption' => 'Položky pohybu', 'Default' => ''),
+        'StockSerialNumber' => array('Type' => 'TStockSerialNumber', 'Caption' => 'Sériové číslo', 'Default' => ''),
+      ),
+    ));
     $this->System->FormManager->RegisterFormType('TStockMoveItemListStockMove', array(
       'Type' => 'ManyToOne',
@@ -157 +171 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TStockMoveItemSerialListItem', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMoveItemSerialRel',
+      'Id' => 'Id',
+      'Ref' => 'StockMoveItem',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TStockMoveItemSerialListSerial', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMoveItemSerialRel',
+      'Id' => 'Id',
+      'Ref' => 'StockSerialNumber',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TStockMove', array(
       'Type' => 'Reference',
@@ -162 +190 @@
       'Id' => 'Id',
       'Name' => '(SELECT `DocumentLineCode`.`Name` FROM `DocumentLineCode` WHERE `Id`=`StockMove`.`BillCode`)',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TStockMoveItem', array(
+      'Type' => 'Reference',
+      'Table' => 'StockMoveItem',
+      'Id' => 'Id',
+      'Name' => '(SELECT `Name` FROM `Product` WHERE `Product`.`Id`=`StockMoveItem`.`Product`)',
       'Filter' => '1',
     ));