Changeset 747 for trunk/Common

Timestamp:

Sep 21, 2015, 12:12:26 AM (9 years ago)

Author:

chronos

Message:

• Modified: Removed columns ValueSign and Direction from FinanceOperation and FinanceInvoice tables. For both tables Value field will be computed as sum from items multiplied by ValueSign of selected group.

This solves problem with inconsistency between invoice and invoice items values and inconsistency between selected document line and incorrect positive or negative values.

Location:

trunk/Common

Files:

• Form/Form.php (modified) (2 diffs)
• Setup/Updates.php (modified) (2 diffs)

trunk/Common/Form/Form.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../Database.php');
 include_once(dirname(__FILE__).'/Types/Type.php');
 
@@ -232 +231 @@
     foreach($this->Definition['Items'] as $Index => $Item)
     {
-      if(!array_key_exists('ReadOnly', $Item)) $Item['ReadOnly'] = false;
-      if($Item['ReadOnly'] == false)
+      if(array_key_exists($Index, $this->Values))
       if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or
       (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and

trunk/Common/Setup/Updates.php

@@ -1489 +1489 @@
 }
 
+function UpdateTo748($Manager)
+{
+  $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `ValueUser` FLOAT NOT NULL AFTER `Value`;');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `ValueUser`=`Value`');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Value`=`ValueUser`*`ValueSign`');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=1 WHERE (`ValueSign`=1) AND (`Cash`=1)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=2 WHERE (`ValueSign`=-1) AND (`Cash`=1)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=3 WHERE (`ValueSign`=1) AND (`Cash`=0)');
+  $Manager->Execute('UPDATE `FinanceOperation` SET `Group`=4 WHERE (`ValueSign`=-1) AND (`Cash`=0)');
+  $Manager->Execute('ALTER TABLE `FinanceOperation` DROP `Direction`, DROP `ValueSign`;');
+
+  // SELECT FinanceInvoice.* FROM `FinanceInvoice` LEFT JOIN FinanceInvoiceGroup ON FinanceInvoiceGroup.Id=FinanceInvoice.Group WHERE FinanceInvoice.ValueSign != FinanceInvoiceGroup.ValueSign
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=1 WHERE (`ValueSign`=-1)');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Group`=2 WHERE (`ValueSign`=1)');
+  $Manager->Execute('UPDATE `FinanceInvoice` SET `Value`=`Value`*`ValueSign`');
+  $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`
+}
 
 class Updates
@@ -1557 +1576 @@
       735 => array('Revision' => 736, 'Function' => 'UpdateTo736'),
       736 => array('Revision' => 739, 'Function' => 'UpdateTo739'),
-          739 => array('Revision' => 740, 'Function' => 'UpdateTo740'),
+      739 => array('Revision' => 740, 'Function' => 'UpdateTo740'),
       740 => array('Revision' => 741, 'Function' => 'UpdateTo741'),
       741 => array('Revision' => 742, 'Function' => 'UpdateTo742'),
+      742 => array('Revision' => 748, 'Function' => 'UpdateTo748'),
     ));
   }