Changeset 808

Timestamp:

Mar 6, 2016, 5:06:42 PM (9 years ago)

Author:

chronos

Message:

• Added: Table FinanceTreasuryCheck for tracking treasury check records.

Location:

trunk

Files:

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

trunk/Application/UpdateTrace.php

@@ -1908 +1908 @@
 {
   $Manager->Execute('ALTER TABLE `Product` ADD `StockMinCount` INT NOT NULL AFTER `UnitOfMeasure`;');
+}
+
+function UpdateTo808($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `FinanceTreasuryCheck` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Treasury` int(11) NOT NULL,
+    `Time` datetime NOT NULL,
+    `Value1` int(11) NOT NULL,
+    `Value2` int(11) NOT NULL,
+    `Value5` int(11) NOT NULL,
+    `Value10` int(11) NOT NULL,
+    `Value20` int(11) NOT NULL,
+    `Value50` int(11) NOT NULL,
+    `Value100` int(11) NOT NULL,
+    `Value200` int(11) NOT NULL,
+    `Value500` int(11) NOT NULL,
+    `Value1000` int(11) NOT NULL,
+    `Value2000` int(11) NOT NULL,
+    `Value5000` int(11) NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `Treasury` (`Treasury`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+  $Manager->Execute('ALTER TABLE `FinanceTreasuryCheck`
+    ADD CONSTRAINT `FinanceTreasuryCheck_ibfk_1` FOREIGN KEY (`Treasury`) REFERENCES `FinanceTreasury` (`Id`);');
+
+  // IS menu item
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Kontrola pokladen", "1", "/is/?t=FinanceTreasuryCheck&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Pokladny"');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+        "VALUES (NULL , 'Kontrola pokladen', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
+
 }
 
@@ -1997 +2036 @@
       802 => array('Revision' => 803, 'Function' => 'UpdateTo803'),
       803 => array('Revision' => 807, 'Function' => 'UpdateTo807'),
+      807 => array('Revision' => 808, 'Function' => 'UpdateTo808'),
     ));
   }

trunk/Application/Version.php

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

trunk/Modules/Finance/Finance.php

@@ -425 +425 @@
           'WHERE `FinanceOperation`.`Treasury`=#Id)'),
         'Operations' => array('Type' => 'TFinanceOperationListTreasury', 'Caption' => 'Operace', 'Default' => ''),
-      ),
+        'Check' => array('Type' => 'TFinanceTreasuryCheckListTreasury', 'Caption' => 'Kontrola', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('FinanceTreasuryCheck', array(
+      'Title' => 'Kontrola pokladen',
+      'Table' => 'FinanceTreasuryCheck',
+      'DefaultSortColumn' => 'Time',
+      'Items' => array(
+        'Treasury' => array('Type' => 'TFinanceTreasury', 'Caption' => 'Pokladna', 'Default' => ''),
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'Value1' => array('Type' => 'Integer', 'Caption' => 'Hodnota 1', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value2' => array('Type' => 'Integer', 'Caption' => 'Hodnota 2', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value5' => array('Type' => 'Integer', 'Caption' => 'Hodnota 5', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value10' => array('Type' => 'Integer', 'Caption' => 'Hodnota 10', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value20' => array('Type' => 'Integer', 'Caption' => 'Hodnota 20', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value50' => array('Type' => 'Integer', 'Caption' => 'Hodnota 50', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value100' => array('Type' => 'Integer', 'Caption' => 'Hodnota 100', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value200' => array('Type' => 'Integer', 'Caption' => 'Hodnota 200', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value500' => array('Type' => 'Integer', 'Caption' => 'Hodnota 500', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value1000' => array('Type' => 'Integer', 'Caption' => 'Hodnota 1000', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value2000' => array('Type' => 'Integer', 'Caption' => 'Hodnota 2000', 'Default' => '0', 'Suffix' => 'ks'),
+        'Value5000' => array('Type' => 'Integer', 'Caption' => 'Hodnota 5000', 'Default' => '0', 'Suffix' => 'ks'),
+        'Sum' => array('Type' => 'Integer', 'Caption' => 'Součet', 'Default' => '0', 'Suffix' => 'Kč',
+          'SQL' => '(`Value1` * 1 + `Value2` * 2 + `Value5` * 5 + `Value10` * 10 + '.
+          '`Value20` * 20 + `Value50` * 50 + `Value100` * 100 + `Value200` * 200 + '.
+          '`Value500` * 500 + `Value1000` * 1000 + `Value2000` * 2000 + `Value5000` * 5000)'),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TFinanceTreasuryCheckListTreasury', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'FinanceTreasuryCheck',
+      'Id' => 'Id',
+      'Ref' => 'Treasury',
+      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterFormType('TFinanceTreasury', array(