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

Timestamp:

Feb 23, 2016, 4:44:03 PM (9 years ago)

Author:

chronos

Message:

• Modified: StockMove now have single column for Stock and direction of move is given by Group column and StockMoveGroup Direction.
• Modified: StockMove BillCode made reference to DocumentLineCode.

File:

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

trunk/Modules/Stock/Stock.php

@@ -16 +16 @@
   function DoStart()
   {
+    global $Config;
+   
     $this->System->FormManager->RegisterClass('Product', array(
       'Title' => 'Produkty',
@@ -21 +23 @@
       'DefaultSortColumn' => 'Name',
       'Items' => array(
+        'Manufacturer' => array('Type' => 'TSubject', 'Caption' => 'Výrobce', 'Default' => '', 'Null' => true),
+        'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'SellPrice' => array('Type' => 'Integer', 'Caption' => 'Prodejní cena', 'Default' => '0', 'Suffix' => 'Kč'),
@@ -27 +31 @@
         'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => '', 'Suffix' => 'Watt'),
         'Supplier' => array('Type' => 'TSubject', 'Caption' => 'Dodavatel', 'Default' => '', 'Null' => true),
-        'Manufacturer' => array('Type' => 'TSubject', 'Caption' => 'Výrobce', 'Default' => '', 'Null' => true),
-        'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
         'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => '', 'Null' => true),
         'StockSerialNumbers' => array('Type' => 'TStockSerialNumberListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
@@ -79 +81 @@
       'DefaultSortColumn' => 'Time',
       'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+        'Group' => array('Type' => 'TStockMoveGroup', 'Caption' => 'Skupina', 'Default' => ''),
+        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Označení', 'Default' => '', 'ReadOnly' => true),
         '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),
+        'Stock' => array('Type' => 'TStock', 'Caption' => 'Sklad', 'Default' => '', 'Null' => true),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
         'Price' => array('Type' => 'Float', 'Caption' => 'Cena', 'Default' => '',
@@ -91 +92 @@
       ),
       'BeforeInsert' => array($this, 'BeforeInsertStockMove'),
-    ));
-    $this->System->FormManager->RegisterClass('StockMoveUnion', array(
-      'Title' => 'Skladový pohyb',
-      'BaseTable' => 'StockMove',
-      'DefaultSortColumn' => 'Time',
-      'SQL' => '(SELECT *, -1 AS `Direction`, `StockFrom` AS `Stock`, `StockTo` AS `StockOther` FROM `StockMove`) '.
-        'UNION (SELECT *, 1 AS `Direction`, `StockTo` AS `Stock`, `StockFrom` AS `StockOther` FROM `StockMove`)',
-      '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' => ''),
-        'Stock' => array('Type' => 'TStock', 'Caption' => 'První sklad', 'Default' => '', 'Null' => true),
-        'StockOther' => array('Type' => 'TStock', 'Caption' => 'Druhý 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 `TX`.`Direction` * SUM(`StockMoveItem`.`UnitPrice` * `StockMoveItem`.`Amount`) FROM `StockMoveItem` '.
-          'WHERE `StockMoveItem`.`StockMove`=#Id)'),
-        'Items' => array('Type' => 'TStockMoveItemListStockMove', 'Caption' => 'Položky', 'Default' => ''),
-      ),
-      'BeforeInsert' => array($this, 'BeforeInsertStockMove'),
+      //'AfterInsert' => array($this, 'AfterInsertStockMove'),
+      //'BeforeModify' => array($this, 'BeforeModifyStockMove'),
     ));
     $this->System->FormManager->RegisterClass('StockMoveItem', array(
       'Title' => 'Položka skladového pohybu',
       'Table' => 'StockMoveItem',
-      'DefaultSortColumn' => 'Text',
+      'DefaultSortColumn' => 'Product',
       'Items' => array(
         'StockMove' => array('Type' => 'TStockMove', 'Caption' => 'Skladový pohyb', 'Default' => ''),
         'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => ''),
+        'UnitPrice' => array('Type' => 'Integer', 'Caption' => 'Jednotková cena', 'Default' => '0', 'Suffix' => 'Kč'),
         '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č'),
+        'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
+          'ReadOnly' => true, 'SQL' => 'ROUND(`UnitPrice` * `Amount`, '.$Config['Finance']['Rounding'].')'),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('StockMoveGroup', array(
+      'Title' => 'Skupina skladových pohybů',
+      'Table' => 'StockMoveGroup',
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => '0'),
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => '0'),
+        'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
+        'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'Items' => array('Type' => 'TStockMoveListGroup', 'Caption' => 'Operace', 'Default' => ''),
       ),
     ));
@@ -148 +143 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TStockMoveListGroup', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMove',
+      'Id' => 'Id',
+      'Ref' => 'Group',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterFormType('TStockMoveStock', array(
       'Type' => 'ManyToOne',
-      'Table' => 'StockMoveUnion',
+      'Table' => 'StockMove',
       'Id' => 'Id',
       'Ref' => 'Stock',
@@ -159 +161 @@
       'Table' => 'StockMove',
       'Id' => 'Id',
-      'Name' => 'BillCode',
+      'Name' => '(SELECT `DocumentLineCode`.`Name` FROM `DocumentLineCode` WHERE `Id`=`StockMove`.`BillCode`)',
       'Filter' => '1',
     ));
@@ -172 +174 @@
       'Type' => 'Reference',
       'Table' => 'Stock',
+      'Id' => 'Id',
+      'Name' => 'Name',
+      'Filter' => '1',
+    ));
+    $this->System->FormManager->RegisterFormType('TStockMoveGroup', array(
+      'Type' => 'Reference',
+      'Table' => 'StockMoveGroup',
       'Id' => 'Id',
       'Name' => 'Name',
@@ -196 +205 @@
     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);
+    $Group = $this->System->Modules['Finance']->GetFinanceGroupById($Form->Values['Group'], 'StockMoveGroup');
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     return($Form->Values);
   }