Changeset 710 for trunk/Modules/Stock/Stock.php

Timestamp:

Dec 29, 2014, 12:09:46 AM (10 years ago)

Author:

chronos

Message:

• Modified: Table StockItem renamed to StockSerialNumber.
• Added: Preparation for improvement of stock handling. Stock items change should be covered by tables StockMove and StockMoveItem. Each StockMove have to have BillCode identification accoroding stock move document line.

File:

• trunk/Modules/Stock/Stock.php (modified) (3 diffs)

trunk/Modules/Stock/Stock.php

@@ -30 +30 @@
         'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
         'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => '', 'Null' => true),
-        'StockItems' => array('Type' => 'TStockItemListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
+        'StockSerialNumbers' => array('Type' => 'TStockSerialNumberListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
         'NetworkDevices' => array('Type' => 'TNetworkDeviceListProduct', 'Caption' => 'Síťová zařízení', 'Default' => ''),
       ),
     ));
-    $this->System->FormManager->RegisterClass('StockItem', array(
+    $this->System->FormManager->RegisterClass('StockSerialNumber', array(
       'Title' => 'Skladové položky',
-      'Table' => 'StockItem',
+      'Table' => 'StockSerialNumber',
       'DefaultSortColumn' => 'Id',
       'Items' => array(
@@ -51 +51 @@
         'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek sítě', 'Default' => '', 'Null' => true),
         'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
-        'Esemble' => array('Type' => 'TStockItem', 'Caption' => 'Celek', 'Default' => ''),
-        'Parts' => array('Type' => 'TStockItemListStockItem', 'Caption' => 'Části', 'Default' => ''),
+        'Esemble' => array('Type' => 'TStockSerialNumber', 'Caption' => 'Celek', 'Default' => ''),
+        'Parts' => array('Type' => 'TStockSerialNumberListStockSerialNumber', 'Caption' => 'Části', 'Default' => ''),
       ),
     ));
@@ -62 +62 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => '', 'Null' => true),
-        'Items' => array('Type' => 'TStockItemListStock', 'Caption' => 'Položky', 'Default' => ''),
+        'Items' => array('Type' => 'TStockSerialNumberListStock', 'Caption' => 'Položky', 'Default' => ''),
         'ItemsCount' => array('Type' => 'Integer', 'Caption' => 'Položek', 'Default' => '',
-          'ReadOnly' => true, 'SQL' => '(SELECT COUNT(*) FROM `StockItem` WHERE '.
-          '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))'),
+          'ReadOnly' => true, 'SQL' => '(SELECT COUNT(*) FROM `StockSerialNumber` WHERE '.
+          '(`StockSerialNumber`.`Stock`=#Id) AND (`StockSerialNumber`.`TimeElimination` IS NULL))'),
         'TotalPrice' => array('Type' => 'Integer', 'Caption' => 'Celková cena', 'Default' => '',
-          'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockItem` WHERE '.
-          '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
+          'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockSerialNumber` WHERE '.
+          '(`StockSerialNumber`.`Stock`=#Id) AND (`StockSerialNumber`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
       ),
     ));
+    $this->System->FormManager->RegisterClass('StockMove', array(
+      'Title' => 'Skladový pohyb',
+      'Table' => 'StockMove',
+      'DefaultSortColumn' => 'Time',
+      'Items' => array(
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
+        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'StockFrom' => array('Type' => 'TStock', 'Caption' => 'Zdrojový sklad', 'Default' => '', 'Null' => true),
+        'StockTo' => array('Type' => 'TStock', 'Caption' => 'Cílový sklad', 'Default' => '', 'Null' => true),
+        'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
+        'Price' => array('Type' => 'Float', 'Caption' => 'Cena', 'Default' => '',
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`StockMoveItem`.`UnitPrice` * `StockMoveItem`.`Amount`) FROM `StockMoveItem` '.
+          'WHERE `StockMoveItem`.`StockMove`=#Id)'),
+        'Items' => array('Type' => 'TStockMoveItemListStockMove', 'Caption' => 'Položky', 'Default' => ''),
+      ),        
+      'BeforeInsert' => array($this, 'BeforeInsertStockMove'),
+    ));
+    $this->System->FormManager->RegisterClass('StockMoveItem', array(
+      'Title' => 'Položka skladového pohybu',
+      'Table' => 'StockMoveItem',
+      'DefaultSortColumn' => 'Text',
+      'Items' => array(
+        'StockMove' => array('Type' => 'TStockMove', 'Caption' => 'Skladový pohyb', 'Default' => ''),
+        'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => ''),
+        'Amount' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
+        'Text' => array('Type' => 'String', 'Caption' => 'Text', 'Default' => ''),
+        'UnitPrice' => array('Type' => 'Integer', 'Caption' => 'Jednotková cena', 'Default' => '0', 'Suffix' => 'Kč'),
+      ),        
+    ));
+    $this->System->FormManager->RegisterFormType('TStockMoveItemListStockMove', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMoveItem',
+      'Id' => 'Id',
+      'Ref' => 'StockMove',
+      'Filter' => '1',
+    ));  
+    $this->System->FormManager->RegisterFormType('TStockMove', array(
+      'Type' => 'Reference',
+      'Table' => 'StockMove',
+      'Id' => 'Id',
+      'Name' => 'BillCode',
+      'Filter' => '1',
+    ));
+  }
+
+  function BeforeInsertStockMove($Form)
+  {
+        if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+          else $Year = date("Y", $Form->Values['ValidFrom']);
+    $DocumentLine = $Form->Values['DocumentLine'];
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    return($Form->Values);
   }
 }