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

trunk/Modules/Finance/Manage.php

@@ -231 +231 @@
 
     // Celkovy prehled
-    $DbResult = $this->Database->query('SELECT SUM(Product.SellPrice) AS Price FROM StockItem '.
-      'JOIN Product ON StockItem.Product = Product.Id WHERE (StockItem.TimeElimination IS NULL) AND (StockItem.Segment IS NOT NULL)');
+    $DbResult = $this->Database->query('SELECT SUM(Product.SellPrice) AS Price FROM StockSerialNumber '.
+      'JOIN Product ON StockSerialNumber.Product = Product.Id WHERE (StockSerialNumber.TimeElimination IS NULL) AND (StockSerialNumber.Segment IS NOT NULL)');
     $Row = $DbResult->fetch_row();
     $TotalDeviceCost = $Row[0];
@@ -252 +252 @@
     $Output .= 'Stav pokladny: Členové('.$TotalMemberCash.')';
 
-    $DbResult = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockItem '.
-      'JOIN Product ON StockItem.Product = Product.Id WHERE (StockItem.TimeElimination IS NULL) AND (StockItem.Segment IS NOT NULL)');
+    $DbResult = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockSerialNumber '.
+      'JOIN Product ON StockSerialNumber.Product = Product.Id WHERE (StockSerialNumber.TimeElimination IS NULL) '.
+        'AND (StockSerialNumber.Segment IS NOT NULL)');
     $Row = $DbResult->fetch_row();
     $TotalConsumption = $Row[0];