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

Timestamp:

Jul 3, 2015, 11:36:07 PM (9 years ago)

Author:

chronos

Message:

• Modified: Changed Direction column of FinanceOperation and Invoices to more general ValueSign.
• FinanceOperationGroup and InvoiceGroup tables introduced and operations and invoices are now linked directly

to group id instead of DocumentLine.

File:

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

trunk/Modules/Finance/Manage.php

@@ -100 +100 @@
   }
 
-  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Direction, $Items,
-  $DocumentLine, $PeriodFrom, $PeriodTo)
+  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $ValueSign, $Items,
+  $Group, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $Year = date('Y', $TimeCreation);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
     $SumValue = 0;
-    foreach($Items as $Item)
+    foreach($Items as $Item) {
       $SumValue = $SumValue + ceil($Item['Price'] * $Item['Quantity']);
+    }
     $this->Database->insert('FinanceInvoice', array(
       'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue,
-      'Direction' => $Direction, 'BillCode' => $BillCode,
+      'ValueSign' => $ValueSign, 'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
-      'Generate' => 1, 'DocumentLine' => $DocumentLine));
+      'Generate' => 1, 'Group' => $FinanceGroup['Id']));
     $InvoiceId = $this->Database->insert_id;
     foreach($Items as $Item)
@@ -166 +167 @@
         // We can't produce negative invoice except storno invoice.
         // TODO: In case of negative invoice it is not sufficient to reverse invoicing direction
-        // Other subject should invoice only possitive items. Negative items should be somehow removed.
+        // Other subject should invoice only positive items. Negative items should be somehow removed.
         if($MonthlyTotal >= 0) {
-          $DocumentLine = DOC_LINE_INVOICE_OUT;
-          $Direction = 1; // Standard out invoice
+          $InvoiceGroupId = INVOICE_GROUP_OUT;
         } else {
-          $DocumentLine = DOC_LINE_INVOICE_IN;
-          $Direction = -1; // In case of negative total value generate reverse invoice for other subject
-          foreach($InvoiceItems as $Index => $Item)
-          $InvoiceItems[$Index]['Price'] = -$Item['Price'];
+          $InvoiceGroupId = INVOICE_GROUP_IN;
+        }
+
+        // Load invoice group
+        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoice');
+        foreach($InvoiceItems as $Index => $Item) {
+          $InvoiceItems[$Index]['Price'] = $Item['Price'] * $FinanceGroup['ValueSign'];
         }
 
@@ -182 +185 @@
           $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $Direction, $InvoiceItems, $DocumentLine, $Period['From'], $Period['To']);
+            $FinanceGroup['ValueSign'], $InvoiceItems, $FinanceGroup, $Period['From'], $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -354 +357 @@
         '<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`*`Direction`) AS `Value`, `File` FROM `FinanceOperation` WHERE (`Subject`='.$Member['Subject'].')) UNION ALL '.
+      $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT `Text`, `Time`, (`Value`*`ValueSign`) AS `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`*`Direction`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
+        '`Time`, -(`Value`*`ValueSign`) AS `Value`, `File` FROM `FinanceInvoice` WHERE (`Subject`='.
         $Member['Subject'].')) ORDER BY `Time` DESC) AS `T1` WHERE (`T1`.`Time` > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())