Changeset 710 for trunk/Modules/Finance/Finance.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/Finance/Finance.php (modified) (2 diffs)

trunk/Modules/Finance/Finance.php

@@ -203 +203 @@
       $Cash = $Cash[0];
 
-      $DbResult2 = $this->Database->query('SELECT SUM(`Product`.`Consumption`) * `StockItem`.`Amount` '.
-          'FROM `StockItem` JOIN `Product` ON `Product`.`Id` = `StockItem`.`Product` '.
-          'WHERE (`StockItem`.`Location` = '.$Member['Id'].') AND (`StockItem`.`TimeElimination` IS NULL)');
+      $DbResult2 = $this->Database->query('SELECT SUM(`Product`.`Consumption`) * `StockSerialNumber`.`Amount` '.
+          'FROM `StockSerialNumber` JOIN `Product` ON `Product`.`Id` = `StockSerialNumber`.`Product` '.
+          'WHERE (`StockSerialNumber`.`Location` = '.$Member['Id'].') AND (`StockSerialNumber`.`TimeElimination` IS NULL)');
       $ConsumptionPlus = $DbResult2->fetch_row();
       $ConsumptionPlus = $ConsumptionPlus[0];
@@ -265 +265 @@
       $RowP2 = $DbResult2->fetch_array();
 
-      $DbResult2 = $this->Database->query('SELECT SUM(`Product`.`BuyPrice`) * `StockItem`.`Amount` AS `Price`, '.
-          'SUM(`Product`.`Consumption`) * `StockItem`.`Amount` AS `Consumption` '.
-          'FROM `StockItem` JOIN `Product` ON `Product`.`Id` = `StockItem`.`Product` '.
-          'WHERE (`StockItem`.`Segment`='.$NetworkSegment['Id'].') AND (`StockItem`.`TimeElimination` IS NULL)');
+      $DbResult2 = $this->Database->query('SELECT SUM(`Product`.`BuyPrice`) * `StockSerialNumber`.`Amount` AS `Price`, '.
+          'SUM(`Product`.`Consumption`) * `StockSerialNumber`.`Amount` AS `Consumption` '.
+          'FROM `StockSerialNumber` JOIN `Product` ON `Product`.`Id` = `StockSerialNumber`.`Product` '.
+          'WHERE (`StockSerialNumber`.`Segment`='.$NetworkSegment['Id'].') AND (`StockSerialNumber`.`TimeElimination` IS NULL)');
       $Row2 = $DbResult2->fetch_array();
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['Id']);