Changeset 451 for trunk/finance/finance.php

Timestamp:

Oct 24, 2012, 10:42:58 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Korekce tabulek Product a StockItem.

File:

• trunk/finance/finance.php (modified) (2 diffs)

trunk/finance/finance.php

@@ -170 +170 @@
       $Cash = $Cash[0];
     
-      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE (User='.$Member['Id'].') AND (Used = 1)');
+      $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)');
       $ConsumptionPlus = $DbResult2->fetch_row();
       $ConsumptionPlus = $ConsumptionPlus[0];
@@ -232 +234 @@
       $RowP2 = $DbResult2->fetch_array();
 
-      $DbResult2 = $this->Database->query('SELECT SUM(Price) AS Price, SUM(Consumption) AS Consumption FROM Product WHERE Segment='.$NetworkSegment['Id'].' AND Used=1');
+      $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)');
       $Row2 = $DbResult2->fetch_array();
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['Id']);