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

Timestamp:

Apr 6, 2015, 11:08:10 PM (9 years ago)

Author:

chronos

Message:

• Modified: Merged NetworkLink Interface1 and Interface2 to single column in subtable of NetworkInterface.
• Added: Table NetworkLinkType.
• Fixed: Do not show symbol "-" if network interface doesn't have a name.

File:

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

trunk/Modules/Stock/Stock.php

@@ -68 +68 @@
           'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockSerialNumber` WHERE '.
           '(`StockSerialNumber`.`Stock`=#Id) AND (`StockSerialNumber`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
+        'Moves' => array('Type' => 'TStockMoveStock', 'Caption' => 'Pohyby', 'Default' => ''),
       ),
     ));
@@ -83 +84 @@
         '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('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' => ''),
@@ -107 +128 @@
       'Filter' => '1',
     ));  
+    $this->System->FormManager->RegisterFormType('TStockMoveStock', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMoveUnion',
+      'Id' => 'Id',
+      'Ref' => 'Stock',
+      'Filter' => '1',
+    ));      
     $this->System->FormManager->RegisterFormType('TStockMove', array(
       'Type' => 'Reference',