Changeset 719 for trunk/Modules/Finance/Import.php

Timestamp:

Jan 2, 2015, 11:16:56 PM (10 years ago)

Author:

chronos

Message:

• Added: Support for Hidden items in form types values.
• Added: Support for Filtered items in form types values.
• Modified: FinanceOperation Value splitted to (Direction * Value). Direction can be +1 or -1 depends on if money goes out or in company.
• Added: Menu "Incomes and spends" is now splitted to incomes/spends of bank account or treasury. Direction and document line is filled automatically.

File:

• trunk/Modules/Finance/Import.php (modified) (2 diffs)

trunk/Modules/Finance/Import.php

@@ -120 +120 @@
   }
   
-  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
+  function InsertMoney($Subject, $Value, $Direction, $Cash, $Taxable, $Time, $Text, $DocumentLine)
   {
     $Year = date('Y', $Time);
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
-    // TODO: Fixed BankAccount=1
+    // TODO: Fixed BankAccount=1, allow to select bank account for import
     $this->Database->insert('FinanceOperation', array('Text' => $Text, 
-      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 
+      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction, 
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode,
       'BankAccount' => 1));
@@ -139 +139 @@
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      if($_POST['Money'.$I] < 0) $DocumentLine = 4;
-        else $DocumentLine = 3;
+        // TODO: Use links to database records instead of contants
+      if($_POST['Money'.$I] < 0) {
+        $DocumentLine = 4;
+        $Direction = -1;
+      } else {
+        $DocumentLine = 3;
+        $Direction = 1;
+      }
       $Date = explode('-', $_POST['Date'.$I]);
       $Date = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
-      $this->InsertMoney($_POST['Subject'.$I], $_POST['Money'.$I], 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $Direction, 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
       $Output .= $I.', ';
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');