Changeset 748 for trunk/Common

Timestamp:

Sep 30, 2015, 11:55:11 PM (9 years ago)

Author:

chronos

Message:

• Added: Configuration of finance numbers rounding.
• Fixed: Use BillCode column as reference to DocumentLineCode table.
• Fixed: More ValueSign converted to FinanceOperationGroup and FinanceInvoiceGroup.

Location:

trunk/Common/Setup

Files:

• DefaultConfig.php (modified) (1 diff)
• Updates.php (modified) (3 diffs)

trunk/Common/Setup/DefaultConfig.php

@@ -45 +45 @@
         array('Name' => 'Finance/MainSubjectId', 'Type' => 'Integer', 'Default' => '1', 'Title' => 'Id hlavního subjektu'),
         array('Name' => 'Finance/DirectoryId', 'Type' => 'Integer', 'Default' => '1', 'Title' => 'Id adresáře souborů dokladů'),
+        array('Name' => 'Finance/Rounding', 'Type' => 'Integer', 'Default' => '2', 'Title' => 'Počet desetinných míst zaokrouhlování'),
         array('Name' => 'MainRouter/HostName', 'Type' => 'String', 'Default' => 'localhost', 'Title' => 'Hlavní brána'),
         array('Name' => 'MainRouter/UserName', 'Type' => 'String', 'Default' => 'admin', 'Title' => 'Uživatelské jméno'),

trunk/Common/Setup/Updates.php

@@ -1489 +1489 @@
 }
 
-function UpdateTo748($Manager)
+function UpdateTo747($Manager)
 {
   $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `ValueUser` FLOAT NOT NULL AFTER `Value`;');
@@ -1506 +1506 @@
   $Manager->Execute('ALTER TABLE `FinanceInvoice` DROP `Direction`, DROP `ValueSign`;');
   // Check manual vs. calculated value from items
-  // SELECT * FROM (SELECT `FinanceInvoice`.`Id`, ((SELECT SUM(`Price` * `Quantity`) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=`FinanceInvoice`.`Id`) * `FinanceInvoiceGroup`.`ValueSign`) AS `Sum`,`FinanceInvoice`.`Value` FROM `FinanceInvoice` LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group`) AS `T` WHERE `Sum` != `Value`
+  // SELECT * FROM (SELECT `FinanceInvoice`.`Id`, ((SELECT SUM(CEIL(`Price` * `Quantity`)) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=`FinanceInvoice`.`Id`) * `FinanceInvoiceGroup`.`ValueSign`) AS `Sum`,`FinanceInvoice`.`Value` FROM `FinanceInvoice` LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group`) AS `T` WHERE `Sum` != `Value`
+}
+
+function UpdateTo748($Manager)
+{
+  $DbResult = $Manager->Database->query('SELECT * FROM (SELECT `FinanceInvoice`.`Id`, ((SELECT SUM(`Price` * `Quantity`) FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=`FinanceInvoice`.`Id`) * `FinanceInvoiceGroup`.`ValueSign`) AS `Sum`,`FinanceInvoice`.`Value` FROM `FinanceInvoice` LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group`) AS `T` WHERE `Sum` != `Value`');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $Manager->Database->query('UPDATE `FinanceInvoiceItem` SET `Price` = -`Price` WHERE `FinanceInvoice`='.$DbRow['Id']);
+  }
 }
 
@@ -1579 +1588 @@
       740 => array('Revision' => 741, 'Function' => 'UpdateTo741'),
       741 => array('Revision' => 742, 'Function' => 'UpdateTo742'),
-      742 => array('Revision' => 748, 'Function' => 'UpdateTo748'),
+      742 => array('Revision' => 747, 'Function' => 'UpdateTo747'),
+      747 => array('Revision' => 748, 'Function' => 'UpdateTo748'),
     ));
   }