Changeset 486 for trunk/finance/manage.php

Timestamp:

Feb 10, 2013, 9:20:06 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Příprava na zrušení tabulek dokladů a jejich převedení na tabulky File a FinanceInvoice.

File:

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

trunk/finance/manage.php

@@ -133 +133 @@
       $DbRow = $DbResult->fetch_array();
       $Advances = $DbRow[0];
-      $DbResult = $this->Database->select('FinanceClaimsLiabilities', '*', 'Subject='.$Subject.' AND TimePayment IS NULL AND Value > 0 ORDER BY TimeCreation LIMIT 1');
+      $DbResult = $this->Database->select('FinanceInvoice', '*', 'Subject='.$Subject.
+      ' AND TimePayment IS NULL AND Value > 0 ORDER BY TimeCreation LIMIT 1');
       //echo($Database->error);
       if($DbResult->num_rows > 0)
@@ -140 +141 @@
         if($Advances > $OpenedClaim['Value'])
         {
-          $this->Database->update('FinanceClaimsLiabilities', 'Id='.$OpenedClaim['Id'], array('TimePayment' => TimeToMysqlDateTime($LastInsertTime)));
-          $this->Database->insert('FinanceAdvances', array('Subject' => $OpenedClaim['Subject'], 'Value' => -$OpenedClaim['Value'], 'TimeCreation' => TimeToMysqlDateTime($LastInsertTime), 'CashFlowId' => $OpenedClaim['Id'], 'Direction' => 'In'));
+          $this->Database->update('FinanceInvoice', 'Id='.$OpenedClaim['Id'], 
+            array('TimePayment' => TimeToMysqlDateTime($LastInsertTime)));
+          $this->Database->insert('FinanceAdvances', array('Subject' => 
+            $OpenedClaim['Subject'], 'Value' => -$OpenedClaim['Value'], 
+            'TimeCreation' => TimeToMysqlDateTime($LastInsertTime), 
+            'CashFlowId' => $OpenedClaim['Id'], 'Direction' => 'In'));
           //echo($Database->LastQuery);
         } else break;
@@ -154 +159 @@
 
     $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
-    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 
+    $this->Database->insert('FinanceInvoice', array( 
       'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
       'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode,
       'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
+    $InvoiceId = $this->Database->insert_id;
+    $this->Database->insert('FinanceInvoice', array('FinanceInvoice' => $InvoiceId, 
+      'Description' => $Text, 'Price' => $Value, 'Quantity' => 1, 'VAT' => 0));
     $Output = '.'; //$this->Database->LastQuery.'<br />';
     //$LastInsertTime = $Time;
@@ -253 +261 @@
       $Form->Values['DocumentLine'], NULL, NULL);
     $LastId = $this->Database->insert_id;
-    $DbResult = $this->Database->select('FinanceClaimsLiabilities', 'BillCode', 'Id='.$LastId);
+    $DbResult = $this->Database->select('FinanceInvoice', 'BillCode', 'Id='.$LastId);
     $DbRow = $DbResult->fetch_assoc();
     $Output = $this->SystemMessage('Finance', 'Faktura vložena '.$DbRow['BillCode'].'.');
@@ -360 +368 @@
     $Output .= $Finance->RecalculateSegmentParameters();
     $Output .= $Finance->LoadTariffs();
-    //$InvoiceGenerator->CustomGenerate();
     $Output .= $Finance->RecalculateMemberPayment();
 
@@ -446 +453 @@
           $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
             $BillItems, time(), time() + 3600 * 24 * INVOICE_DUE_DAYS, $BillCode, $Period['From'], $Period['To']);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 
+          $this->Database->insert('FinanceInvoice', array( 
             'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
-            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)', 
-            'Text' => 'Vyúčtování služeb za období '.$TimePeriodText, 
+            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL '.INVOICE_DUE_DAYS.' DAY)',             
             'Bill' => $BillId, 'BillCode' => $BillCode));
+          $InvoiceId = $this->Database->insert_id;
+          $this->Database->insert('FinanceInvoiceItem', array('FinanceInvoice' => $InvoiceId,
+            'Value' => $PayPerPeriod, 'Text' => 'Vyúčtování služeb za období '.$TimePeriodText,
+           'Quantity' => 1, 'VAT' => 0));
+          
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -531 +542 @@
       //$Member['BillingPeriodLastDate'] = '2009-04-01';
       $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
+      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceInvoice WHERE (Subject='.$Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())
       {
@@ -550 +561 @@
   function GenerateBills()
   {
-    // FinanceClaimsLiablities
-    $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities WHERE (BillCode <> "") AND (Value != 0) AND (Bill = 0)');
+    // FinanceInvoice
+    $DbResult = $this->Database->query('SELECT * FROM FinanceInvoice WHERE (BillCode <> "") AND (Value != 0) AND (Bill = 0)');
     while($Row = $DbResult->fetch_assoc())
     {
@@ -558 +569 @@
         MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), 
         $Row['BillCode'], 'invoice', MysqlDateToTime($Row['PeriodFrom']), MysqlDateToTime($Row['PeriodTo']));
-      $this->Database->update('FinanceClaimsLiabilities', 'Id='.$Row['Id'], array('Bill' => $BillId));
+      $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('Bill' => $BillId));
       echo('.');
     }