Changeset 477 for trunk/finance/manage.php

Timestamp:

Jan 1, 2013, 11:01:51 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Údaje o firmě se v dokladech nyní generují obecně dle databáze a předvoleného hlavního id v konfiguračního souboru namísto fixních údajů.
• Upraveno: Tabulka bankovních účtů nyní může obsahovat také účty vázané na ostatní subjekty.
• Přidáno: Předchystání tabulek pro evidenci nabízených služeb zákazníkům.

File:

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

trunk/finance/manage.php

@@ -10 +10 @@
   function Show()
   {
-    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
-
-    if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; else $Operation = '';
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'Manage')) 
+      return('Nemáte oprávnění');
+
+    if(array_key_exists('Operation', $_GET)) $Operation = $_GET['Operation']; 
+      else $Operation = '';
     //$Operation = 'ImportOldData';
     switch($Operation)
@@ -143 +145 @@
   }
 
-  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, $DocumentLine)
+  function InsertLiability($Subject, $Value, $TimeCreation, $TimeDue, $Text, 
+    $DocumentLine, $PeriodFrom, $PeriodTo)
   {
     global $LastInsertTime;
 
     $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));
+    $this->Database->insert('FinanceClaimsLiabilities', array('Text' => $Text, 
+      'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation), 
+      'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $Value, 'BillCode' => $BillCode,
+      'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo)));
     $Output = '.'; //$this->Database->LastQuery.'<br />';
     //$LastInsertTime = $Time;
@@ -240 +246 @@
     $Form->LoadvaluesFromForm();
     //print_r($Form->Values);
-    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], $Form->Values['DocumentLine']);
+    $this->InsertLiability($Form->Values['Subject'], $Form->Values['Value'], 
+      $Form->Values['TimeCreation'], $Form->Values['TimeDue'], $Form->Values['Text'], 
+      $Form->Values['DocumentLine'], NULL, NULL);
     $LastId = $this->Database->insert_id;
     $DbResult = $this->Database->select('FinanceClaimsLiabilities', 'BillCode', 'Id='.$LastId);
@@ -360 +368 @@
           $Output .= $TimePeriodText.': '.$Member['MonthlyTotal'].' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
           $BillCode = $Finance->GetNextDocumentLineNumber(6); // Faktury vydané
-          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], array(array('Description' => 'Připojení k Internetu', 'Price' => $PayPerPeriod, 'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode);
-          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 'Text' => 'Připojení k Internetu za období '.$TimePeriodText, 'Bill' => $BillId, 'BillCode' => $BillCode));
+          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], 
+            array(array('Description' => 'Připojení k Internetu', 'Price' => $PayPerPeriod, 
+            'Quantity' => 1)), time(), time() + 3600 * 24 * 15, $BillCode, $Period['From'], $Period['To']);
+          $this->Database->insert('FinanceClaimsLiabilities', array('Value' => $PayPerPeriod, 
+            'Subject' => $Member['Subject'], 'TimeCreation' => 'NOW()', 
+            'TimeDue' => 'DATE_ADD(NOW(), INTERVAL 15 DAY)', 
+            'Text' => 'Připojení k Internetu za období '.$TimePeriodText, 
+            'Bill' => $BillId, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
           $this->Database->update('Member', 'Id='.$Member['Id'], array('BillingPeriodLastDate' => TimeToMysqlDateTime($Period['To'])));
@@ -453 +467 @@
     while($Row = $DbResult->fetch_assoc())
     {
-      $BillId = $this->System->Modules['Bill']->CreateBill($Row['Subject'], array(array('Description' => $Row['Text'], 'Price' => $Row['Value'], 'Quantity' => 1)), MysqlDateTimeToTime($Row['TimeCreation']), MysqlDateTimeToTime($Row['TimeDue']), $Row['BillCode']);
+      $BillId = $this->System->Modules['Bill']->CreateBill($Row['Subject'], 
+        array(array('Description' => $Row['Text'], 'Price' => $Row['Value'], 'Quantity' => 1)), 
+        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));
       echo('.');