Changeset 710 for trunk/Modules/Finance

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.

Location:

trunk/Modules/Finance

Files:

• Consumption.php (modified) (1 diff)
• Devices.php (modified) (1 diff)
• Finance.php (modified) (2 diffs)
• Manage.php (modified) (2 diffs)
• Overview.php (modified) (1 diff)
• Zivnost.php (modified) (2 diffs)

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'];

trunk/Modules/Finance/Devices.php

@@ -17 +17 @@
       $Output .= '<tr><td style="text-align: left" colspan="3"><strong>Segment: '.$Segment['Name'].' ('.$Segment['Users'].')</strong></td><td style="font-weight: Bold;" align="right">'.$Segment['Price'].'</td></tr>';
       $DbResult2 = $this->Database->query('SELECT Product.Consumption AS Consumption, Product.Name AS Name, '.
-         'StockItem.BuyPrice AS Price, StockItem.TimeEnlistment AS Date '.
-         'FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+         'StockSerialNumber.BuyPrice AS Price, StockSerialNumber.TimeEnlistment AS Date '.
+         'FROM StockSerialNumber JOIN Product ON Product.Id = StockSerialNumber.Product WHERE (StockSerialNumber.Segment='.$Segment['Id'].') AND (StockSerialNumber.TimeElimination IS NULL)');
       while($Row = $DbResult2->fetch_assoc())
       {

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']);

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];

trunk/Modules/Finance/Overview.php

@@ -56 +56 @@
     $TotalGain = 0;
     $TotalExpense = 0;
-    $DbResult = $this->Database->query('SELECT SUM(Product.Consumption) * StockItem.Amount FROM StockItem '.
-      'JOIN Product ON Product.Id=StockItem.Product WHERE (StockItem.TimeElimination IS NULL)');
+    $DbResult = $this->Database->query('SELECT SUM(Product.Consumption) * StockSerialNumber.Amount FROM StockSerialNumber '.
+      'JOIN Product ON Product.Id=StockSerialNumber.Product WHERE (StockSerialNumber.TimeElimination IS NULL)');
     $Row = $DbResult->fetch_array();
     $TotalConsumption = $this->System->Modules['Finance']->W2Kc($Row[0]);

trunk/Modules/Finance/Zivnost.php

@@ -43 +43 @@
 
     // SmallAssets
-    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockItem WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination IS NULL))');
+    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockSerialNumber WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($StartTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($StartTime).'") OR (TimeElimination IS NULL))');
     //$Output .= $Database->error;
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['Start'] = $Row[0] + 0;
-    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockItem WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination IS NULL))');
+    $DbResult = $this->Database->query('SELECT SUM(SellPrice) FROM StockSerialNumber WHERE (TimeEnlistment < "'.TimeToMysqlDateTime($EndTime).'") AND (TimeEnlistment != 0) AND ((TimeElimination > "'.TimeToMysqlDateTime($EndTime).'") OR (TimeElimination IS NULL))');
     $Row = $DbResult->fetch_array();
     $Balance['SmallAssets']['End'] = $Row[0] + 0;
@@ -263 +263 @@
         $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">';
         $Output .= '<tr><th>Název</th><th>Hodnota [Kč]</th><th>Datum zakoupení</th><th>Datum vyřezení</th></tr>';
-        $DbResult = $this->Database->query('SELECT Product.Name AS Name, StockItem.SellPrice AS Price, StockItem.TimeEnlistment AS TimeEnlistment, StockItem.TimeElimination AS TimeElimination '.
-          'FROM StockItem JOIN Product ON Product.Id = StockItem.Product '.
+        $DbResult = $this->Database->query('SELECT Product.Name AS Name, StockSerialNumber.SellPrice AS Price, StockSerialNumber.TimeEnlistment AS TimeEnlistment, StockSerialNumber.TimeElimination AS TimeElimination '.
+          'FROM StockSerialNumber JOIN Product ON Product.Id = StockSerialNumber.Product '.
           'WHERE (TimeElimination IS NOT NULL)');
         while($Row = $DbResult->fetch_array())