Changeset 884 for trunk

Timestamp:

Sep 8, 2020, 5:26:30 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Wrong decimal separator and uninitialized Value database column for Fio Import.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (1 diff)
• Modules/FinanceBankAPI/ImportFio.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 883; // Subversion revision
+$Revision = 884; // Subversion revision
 $DatabaseRevision = 882; // SQL structure revision
 $ReleaseTime = strtotime('2020-09-08');

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -42 +42 @@
           $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
-            'ValueUser' => Abs($DbRow['Value']), 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
+            'ValueUser' => Abs($DbRow['Value']), 'Value' => 0, 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
             'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'Group' => $FinanceGroup['Id']));
           $Id = $this->Database->insert_id;

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -27 +27 @@
       if ($DbResult->num_rows == 0)
       {
+        $Record['Value'] = str_replace(",", ".", $Record['Value']);
         $Output .= '<tr>';
         $this->Database->insert('FinanceBankImport', array('Time' => TimeToMysqlDate($Record['Date']),