Changeset 302 for trunk/finance

Timestamp:

Jan 20, 2011, 6:37:24 AM (14 years ago)

Author:

george

Message:

• Opraveno: Vkládání nových plateb a faktůr.

File:

• trunk/finance/manage.php (modified) (3 diffs)

trunk/finance/manage.php

@@ -143 +143 @@
   }
 
-  function InsertLiability($Subject, $Value, $Time, $BillId, $Text, $TimePayment = '')
+  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, $DocumentLine)
   {
     global $LastInsertTime;
 
-    if($TimePayment != '') $TimePayment = TimeToMysqlDateTime($TimePayment);
-    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($Time), 'TimeDue' => TimeToMysqlDateTime($Time + 3600*24*15), 'TimePayment' => $TimePayment, 'Value' => $Value, 'Bill' => $BillId));
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode));
     $Output = '.'; //$this->Database->LastQuery.'<br />';
     $LastInsertTime = $Time;
-    $this->CheckAdvancesAndLiabilities($Subject);
-    return($Output);
-  }
-
-  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text)
+    //$this->CheckAdvancesAndLiabilities($Subject);
+    return($Output);
+  }
+
+  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $DocumentLine)
   {
     global $LastInsertTime;
 
-    $this->Database->insert('FinanceCashFlow', array('Text' => $Text, 'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable));
-    if($Value >= 0)
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
+    $this->Database->insert('FinanceOperation', array('Text' => $Text, 'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
+    /*if($Value >= 0)
     {
       $this->Database->insert('FinanceAdvances', array('Subject' => $Subject, 'Value' => $Value, 'TimeCreation' => TimeToMysqlDateTime($Time), 'CashFlowId' => $this->Database->insert_id, 'Direction' => 'In'));
     }
     $LastInsertTime = $Time;
-    $this->CheckAdvancesAndLiabilities($Subject);
+    */
+    //$this->CheckAdvancesAndLiabilities($Subject);
   }
 
@@ -216 +218 @@
     $Form = new Form('NewPayment');
     $Form->LoadValuesFromForm();
-    $this->InsertMoney($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['Cash'], $Form->Values['Taxable'], $Form->Values['Time'], $Form->Values['Text']);
+    $this->InsertMoney($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['Cash'], $Form->Values['Taxable'], $Form->Values['Time'], $Form->Values['Text'], $Form->Values['DocumentLine']);
     $Output = $this->SystemMessage('Finance', 'Platba vložena.');
     $this->System->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
@@ -235 +237 @@
     $Form->LoadvaluesFromForm();
     //print_r($Form->Values);
-    //$this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['Time'], $BillId, $Text, $TimePayment = '')
+    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], $Form->Values['DocumentLine']);
     $Output = $this->SystemMessage('Finance', 'Faktura vložena..');
     $this->System->Modules['Log']->NewRecord('Finance', 'NewInvoiceInserted');