Changeset 719 for trunk/Modules/FinanceBankAPI

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/FinanceBankAPI/FileImport.php (modified) (3 diffs)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -34 +34 @@
         { 
           $DbRow2 = $DbResult2->fetch_assoc();
-          if($DbRow['Value'] >= 0) $DocumentLine = 3; // Receive money
-            else $DocumentLine = 4; // Send money
+          // TODO: Replace constants by links to real database numbers 
+          if($DbRow['Value'] >= 0) {
+                $DocumentLine = 3; // Receive money
+                $Direction = 1;                  
+          } else {
+                $DocumentLine = 4; // Send money
+                $Direction = -1;
+          }
           $Year = date('Y', MysqlDateToTime($DbRow['Time']));
           $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0, 
-            'Value' => $DbRow['Value'], 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
+            'Value' => Abs($DbRow['Value']), 'Direction' => $Direction, 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
             'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'DocumentLine' => $DocumentLine));
           $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $this->Database->insert_id));
@@ -133 +139 @@
   }
   
-  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);
-    $this->Database->insert('FinanceOperation', array('Text' => $Text, 'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
+    $this->Database->insert('FinanceOperation', array('Text' => $Text, 
+        'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction,
+        'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
   }
 
@@ -147 +155 @@
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      if($_POST['Money'.$I] < 0) $DocumentLine = 4;
-        else $DocumentLine = 3;
-      $Date = explode('-', $_POST['Date'.$I]);
+      // 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');