Changeset 627 for trunk/Modules/Finance/Manage.php

Timestamp:

Jan 2, 2014, 12:42:49 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Přejmenováno v Invoice sloupec TimeCreation na Time.
• Přidáno: Umožnění přidávat faktury a finanční operace i pro starší neuzavřené účetní období. Rok pro dokladovou řadu se určí podle data vytvoření.

File:

• trunk/Modules/Finance/Manage.php (modified) (2 diffs)

trunk/Modules/Finance/Manage.php

@@ -111 +111 @@
         $SumValue = $SumValue + $Item['Price'] * $Item['Quantity'];
     $this->Database->insert('FinanceInvoice', array(
-          'Subject' => $Subject, 'TimeCreation' => TimeToMysqlDateTime($TimeCreation),
+          'Subject' => $Subject, 'Time' => TimeToMysqlDateTime($TimeCreation),
           'TimeDue' => TimeToMysqlDateTime($TimeDue), 'Value' => $SumValue, 'BillCode' => $BillCode,
           'PeriodFrom' => TimeToMysqlDate($PeriodFrom), 'PeriodTo' => TimeToMysqlDate($PeriodTo),
@@ -352 +352 @@
         '<th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Částka [Kč]</th></tr>'."\n";
       $DbResult = $this->Database->query('SELECT T1.* FROM ((SELECT Text, Time, Value AS Value, File FROM FinanceOperation WHERE (Subject='.$Member['Subject'].')) UNION ALL '.
-        '(SELECT CONCAT(`Text`, (SELECT GROUP_CONCAT(`Description` SEPARATOR "<br/>") FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`)) AS `Text`, TimeCreation as Time, -Value as Value, File FROM FinanceInvoice WHERE (Subject='.
+        '(SELECT CONCAT(`Text`, (SELECT GROUP_CONCAT(`Description` SEPARATOR "<br/>") FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`)) AS `Text`, Time, -Value as Value, File FROM FinanceInvoice WHERE (Subject='.
         $Member['Subject'].')) ORDER BY Time DESC) AS T1 WHERE (T1.Time > "'.$Member['BillingPeriodLastDate'].'")');
       while($DbRow = $DbResult->fetch_assoc())