Changeset 297 for trunk

Timestamp:

Oct 2, 2010, 8:18:49 PM (14 years ago)

Author:

george

Message:

• Opraveno: Generování časů vystavení a splatnosti u nových dokladů.

Location:

trunk

Files:

• finance/bills.php (modified) (2 diffs)
• finance/manage.php (modified) (2 diffs)
• sql/updates/295.sql (modified) (1 diff)

trunk/finance/bills.php

@@ -62 +62 @@
         'Datum zdanitel. plnění: '.HumanDate($Bill['TimeCreate']).'<br>'.
         'Datum splatnosti: '.HumanDate($Bill['TimeDue']).'<br>';
-        //if(($Bill['TimeFrom'] != '0000-00-00 00:00:00') and ($Bill['TimeTo'] != '0000-00-00 00:00:00'))
-        //  $Output .= 'Fakturované období: '.HumanDate($Bill['TimeFrom']).' - '.HumanDate($Bill['TimeTo']).'<br>';
         $Output .= '</td></tr>'.
         '<tr><td colspan="2">'.
@@ -122 +120 @@
   }
 
-  function CreateBill($SubjectId, $Items, $TimeFrom, $TimeTo, $BillCode = '', $Type = 'invoice')
-  {
-    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime(time()), 'Subject' => $SubjectId, 'TimeFrom' => TimeToMysqlDateTime($TimeFrom), 'TimeTo' => TimeToMysqlDateTime($TimeTo), 'TimeDue' => TimeToMysqlDateTime($TimeFrom + 15 * 24 * 3600), 'BillCode' => $BillCode, 'Type' => $Type));
+  function CreateBill($SubjectId, $Items, $TimeCreate, $TimeDue, $BillCode = '', $Type = 'invoice')
+  {
+    $this->Database->insert('FinanceBills', array('TimeCreate' => TimeToMysqlDateTime($TimeCreate), 'Subject' => $SubjectId, 'TimeDue' => TimeToMysqlDateTime($TimeDue), 'BillCode' => $BillCode, 'Type' => $Type));
     $BillId = $this->Database->insert_id;
     foreach($Items as $Item)

trunk/finance/manage.php

@@ -541 +541 @@
           $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 síti', 'Price' => $PayPerPeriod, 'Quantity' => 1)), $Period['From'], $Period['To'], $BillCode);
+          $BillId = $this->System->Modules['Bill']->CreateBill($Member['Subject'], array(array('Description' => 'Připojení k síti', '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 síti za období '.$TimePeriodText, 'Bill' => $BillId, 'BillCode' => $BillCode));
           $Output .= $this->SendPaymentEmail($Member['Id']);
@@ -624 +624 @@
   {
     // FinanceClaimsLiablities
-    $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities WHERE (BillCode <> "") AND (Value >= 0) AND (BillId = 0)');
+    $DbResult = $this->Database->query('SELECT * FROM FinanceClaimsLiabilities WHERE (BillCode <> "") AND (Value >= 0) AND (Bill = 0)');
     while($Row = $DbResult->fetch_assoc())
     {

trunk/sql/updates/295.sql

@@ -1 +1 @@
 UPDATE `FinanceClaimsLiabilities` SET TimeDue = CONCAT(YEAR(TimeCreation), "-", MONTH(TimeCreation), "-16") WHERE (TimeDue = 0) AND (TimeCreation <= CONCAT(YEAR(TimeCreation), "-", MONTH(TimeCreation), "-16"));
 
-UPDATE `FinanceClaimsLiabilities` SET TimeDue = TimeCreation WHERE TimeDue=0;
+UPDATE `FinanceClaimsLiabilities` SET TimeDue = TimeCreation WHERE TimeDue="0000-00-00 00:00:00";