Changeset 807

Timestamp:

Mar 6, 2016, 10:37:04 AM (9 years ago)

Author:

chronos

Message:

• Added: Min amount of products needed permanently avaialble on stock.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/Stock/Stock.php (modified) (2 diffs)

trunk/Application/UpdateTrace.php

@@ -1903 +1903 @@
   $Manager->Execute('ALTER TABLE `StockMoveItemSerialRel` ADD FOREIGN KEY (`StockSerialNumber`) '.
     'REFERENCES `StockSerialNumber`(`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
+}
+
+function UpdateTo807($Manager)
+{
+  $Manager->Execute('ALTER TABLE `Product` ADD `StockMinCount` INT NOT NULL AFTER `UnitOfMeasure`;');
 }
 
@@ -1991 +1996 @@
       800 => array('Revision' => 802, 'Function' => 'UpdateTo802'),
       802 => array('Revision' => 803, 'Function' => 'UpdateTo803'),
+      803 => array('Revision' => 807, 'Function' => 'UpdateTo807'),
     ));
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 803; // Subversion revision
-$DatabaseRevision = 803; // SQL structure revision
-$ReleaseTime = strtotime('2016-02-23');
+$Revision = 807; // Subversion revision
+$DatabaseRevision = 807; // SQL structure revision
+$ReleaseTime = strtotime('2016-03-06');

trunk/Modules/Stock/Stock.php

@@ -32 +32 @@
         'Supplier' => array('Type' => 'TSubject', 'Caption' => 'Dodavatel', 'Default' => '', 'Null' => true),
         'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => '', 'Null' => true),
-        'StockSerialNumbers' => array('Type' => 'TStockSerialNumberListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
-        'StockState' => array('Type' => 'Integer', 'Caption' => 'Síťová zařízení', 'Default' => '', 'ReadOnly' => true, 
-          'SQL' => 'SELECT SUM(`Amount`) FROM `StockMoveItem` WHERE `StockMoveItem`.`Product`=#Id'),
+        'StockSerialNumbers' => array('Type' => 'TStockSerialNumberListProduct', 'Caption' => 'Položky na skladě', 'Default' => ''),
+        'StockState' => array('Type' => 'Integer', 'Caption' => 'Počet na skladě', 'Default' => '', 'ReadOnly' => true,
+          'SQL' => 'SELECT IFNULL(SUM(`Amount`), 0) FROM `StockMoveItem` WHERE `StockMoveItem`.`Product`=#Id'),
+        'StockMinCount' => array('Type' => 'Integer', 'Caption' => 'Skladové minimum', 'Default' => '0'),
         'StockMoves' => array('Type' => 'TStockMoveItemListProduct', 'Caption' => 'Pohyby na skladě', 'Default' => ''),
         'NetworkDevices' => array('Type' => 'TNetworkDeviceListProduct', 'Caption' => 'Síťová zařízení', 'Default' => ''),
-      ),
-    ));
+        'StockShortage' => array('Type' => 'TStockState', 'Caption' => 'Stav skladu', 'Default' => '', 'ReadOnly' => true,
+          'SQL' => 'SELECT (IFNULL(SUM(`Amount`), 0) >= `StockMinCount`) FROM `StockMoveItem` WHERE `StockMoveItem`.`Product`=#Id'),
+      ),
+    ));
+
     $this->System->FormManager->RegisterClass('StockSerialNumber', array(
       'Title' => 'Skladové položky',
@@ -234 +238 @@
       'Filter' => '1',
     ));
+
+    $this->System->FormManager->RegisterFormType('TStockState', array(
+      'Type' => 'Enumeration',
+      'States' => array('<span style="color:red;">Nedostatek</span>',
+        '<span style="color:green;">Dostatek</span>'),
+    ));
   }