Changeset 720 for trunk/Modules/Finance/UserState.php

Timestamp:

Jan 3, 2015, 5:55:34 PM (10 years ago)

Author:

chronos

Message:

• Modified: Invoice negative values replaced by Direction column which is used to determine if invoice is in or out invoice.

File:

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

trunk/Modules/Finance/UserState.php

@@ -12 +12 @@
           'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
                 '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
-                'Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')))';
+                'Time, -(Value*Direction) as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')))';
 
     $Output = '<div style="text-align:center">Výpis finančních operací</div>';
@@ -104 +104 @@
       'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
-      'Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+      'Time, -(Value*Direction) as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
     $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
     $DbRow = $DbResult->fetch_array();