Changeset 629

Timestamp:

Jan 2, 2014, 5:07:34 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Doplněn parametr rok u dalších vkládaných položek finančních operací a faktur.

Location:

trunk/Modules

Files:

• Finance/Import.php (modified) (1 diff)
• Finance/Manage.php (modified) (1 diff)
• FinanceBankAPI/FileImport.php (modified) (2 diffs)

trunk/Modules/Finance/Import.php

@@ -122 +122 @@
   function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
   {
-
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $Year = date('Y', $Time);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
     // TODO: Fixed BankAccount=1
     $this->Database->insert('FinanceOperation', array('Text' => $Text, 

trunk/Modules/Finance/Manage.php

@@ -106 +106 @@
     global $LastInsertTime;
     
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $Year = date('Y', $TimeCreation);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
     $SumValue = 0;
     foreach($Items as $Item)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -36 +36 @@
           if($DbRow['Value'] >= 0) $DocumentLine = 3; // Receive money
             else $DocumentLine = 4; // Send money
-          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+          $Year = date('Y', MysqlDateTimeToTime($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,
@@ -134 +135 @@
   function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
   {
-
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($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));
   }