Changeset 710 for trunk/Modules

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

Files:

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

trunk/Modules/Customer/Customer.php

@@ -35 +35 @@
         'UserRel' => array('Type' => 'TUserCustomerRelListCustomer', 'Caption' => 'Přiřazení uživatelé', 'Default' => ''),
         'ServiceRel' => array('Type' => 'TServiceCustomerRelListCustomer', 'Caption' => 'Placené služby', 'Default' => ''),
-        'Consumption' => array('Type' => 'TCustomerStockItem', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
+        'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
       ),
     ));   

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())

trunk/Modules/Stock/Stock.php

@@ -30 +30 @@
         'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
         'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => '', 'Null' => true),
-        'StockItems' => array('Type' => 'TStockItemListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
+        'StockSerialNumbers' => array('Type' => 'TStockSerialNumberListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
         'NetworkDevices' => array('Type' => 'TNetworkDeviceListProduct', 'Caption' => 'Síťová zařízení', 'Default' => ''),
       ),
     ));
-    $this->System->FormManager->RegisterClass('StockItem', array(
+    $this->System->FormManager->RegisterClass('StockSerialNumber', array(
       'Title' => 'Skladové položky',
-      'Table' => 'StockItem',
+      'Table' => 'StockSerialNumber',
       'DefaultSortColumn' => 'Id',
       'Items' => array(
@@ -51 +51 @@
         'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek sítě', 'Default' => '', 'Null' => true),
         'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
-        'Esemble' => array('Type' => 'TStockItem', 'Caption' => 'Celek', 'Default' => ''),
-        'Parts' => array('Type' => 'TStockItemListStockItem', 'Caption' => 'Části', 'Default' => ''),
+        'Esemble' => array('Type' => 'TStockSerialNumber', 'Caption' => 'Celek', 'Default' => ''),
+        'Parts' => array('Type' => 'TStockSerialNumberListStockSerialNumber', 'Caption' => 'Části', 'Default' => ''),
       ),
     ));
@@ -62 +62 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
         'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => '', 'Null' => true),
-        'Items' => array('Type' => 'TStockItemListStock', 'Caption' => 'Položky', 'Default' => ''),
+        'Items' => array('Type' => 'TStockSerialNumberListStock', 'Caption' => 'Položky', 'Default' => ''),
         'ItemsCount' => array('Type' => 'Integer', 'Caption' => 'Položek', 'Default' => '',
-          'ReadOnly' => true, 'SQL' => '(SELECT COUNT(*) FROM `StockItem` WHERE '.
-          '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))'),
+          'ReadOnly' => true, 'SQL' => '(SELECT COUNT(*) FROM `StockSerialNumber` WHERE '.
+          '(`StockSerialNumber`.`Stock`=#Id) AND (`StockSerialNumber`.`TimeElimination` IS NULL))'),
         'TotalPrice' => array('Type' => 'Integer', 'Caption' => 'Celková cena', 'Default' => '',
-          'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockItem` WHERE '.
-          '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
+          'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockSerialNumber` WHERE '.
+          '(`StockSerialNumber`.`Stock`=#Id) AND (`StockSerialNumber`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
       ),
     ));
+    $this->System->FormManager->RegisterClass('StockMove', array(
+      'Title' => 'Skladový pohyb',
+      'Table' => 'StockMove',
+      'DefaultSortColumn' => 'Time',
+      'Items' => array(
+        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
+        'BillCode' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'StockFrom' => array('Type' => 'TStock', 'Caption' => 'Zdrojový sklad', 'Default' => '', 'Null' => true),
+        'StockTo' => array('Type' => 'TStock', 'Caption' => 'Cílový sklad', 'Default' => '', 'Null' => true),
+        'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
+        'Price' => array('Type' => 'Float', 'Caption' => 'Cena', 'Default' => '',
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`StockMoveItem`.`UnitPrice` * `StockMoveItem`.`Amount`) FROM `StockMoveItem` '.
+          'WHERE `StockMoveItem`.`StockMove`=#Id)'),
+        'Items' => array('Type' => 'TStockMoveItemListStockMove', 'Caption' => 'Položky', 'Default' => ''),
+      ),        
+      'BeforeInsert' => array($this, 'BeforeInsertStockMove'),
+    ));
+    $this->System->FormManager->RegisterClass('StockMoveItem', array(
+      'Title' => 'Položka skladového pohybu',
+      'Table' => 'StockMoveItem',
+      'DefaultSortColumn' => 'Text',
+      'Items' => array(
+        'StockMove' => array('Type' => 'TStockMove', 'Caption' => 'Skladový pohyb', 'Default' => ''),
+        'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => ''),
+        'Amount' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
+        'Text' => array('Type' => 'String', 'Caption' => 'Text', 'Default' => ''),
+        'UnitPrice' => array('Type' => 'Integer', 'Caption' => 'Jednotková cena', 'Default' => '0', 'Suffix' => 'Kč'),
+      ),        
+    ));
+    $this->System->FormManager->RegisterFormType('TStockMoveItemListStockMove', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'StockMoveItem',
+      'Id' => 'Id',
+      'Ref' => 'StockMove',
+      'Filter' => '1',
+    ));  
+    $this->System->FormManager->RegisterFormType('TStockMove', array(
+      'Type' => 'Reference',
+      'Table' => 'StockMove',
+      'Id' => 'Id',
+      'Name' => 'BillCode',
+      'Filter' => '1',
+    ));
+  }
+
+  function BeforeInsertStockMove($Form)
+  {
+        if(array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
+          else $Year = date("Y", $Form->Values['ValidFrom']);
+    $DocumentLine = $Form->Values['DocumentLine'];
+    $Form->Values['BillCode'] = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    return($Form->Values);
   }
 }