Changeset 747 for trunk/Modules/Finance/Manage.php

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.

File:

• trunk/Modules/Finance/Manage.php (modified) (4 diffs)

trunk/Modules/Finance/Manage.php

@@ -100 +100 @@
   }
 
-  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $ValueSign, $Items,
-  $Group, $PeriodFrom, $PeriodTo, $Direction)
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Items,
+    $Group, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $Year = date('Y', $TimeCreation);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     $SumValue = 0;
     foreach($Items as $Item) {
@@ -113 +113 @@
     $this->Database->insert('FinanceInvoice', array(
       'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
-      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
-      'ValueSign' => $ValueSign, 'BillCode' => $BillCode, 'Direction' => $Direction,
+      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue * $Group['ValueSign'],
+      'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
-      'Generate' => 1, 'Group' => $FinanceGroup['Id']));
+      'Generate' => 1, 'Group' => $Group['Id']));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -185 +185 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], 
-                $Period['To'], $FinanceGroup['Direction']);
+            $InvoiceItems, $FinanceGroup, $Period['From'],
+            $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -358 +358 @@
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Popis</th>'.
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
-      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
         '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ", ") FROM `FinanceInvoiceItem` '.
         'WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, '.
-        '`Time`, -(`Value`*`ValueSign`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
+        '`Time`, -`Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
         $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())