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

trunk/Modules/Finance/Consumption.php

@@ -17 +17 @@
     while($Segment = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+      $DbResult2 = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockSerialNumber '.
+                'JOIN Product ON Product.Id = StockSerialNumber.Product WHERE (StockSerialNumber.Segment='.$Segment['Id'].') '.
+                'AND (StockSerialNumber.TimeElimination IS NULL)');
       $Row2 = $DbResult2->fetch_assoc();
       $CelkovaSpotreba = $CelkovaSpotreba + $Row2['Consumption'];