Changeset 749

Timestamp:

Oct 3, 2015, 8:32:52 AM (9 years ago)

Author:

chronos

Message:

• Fixed: SQL query in trade summary.

File:

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

trunk/Modules/Finance/Zivnost.php

@@ -325 +325 @@
         $Output .= '<table style="font-size: smaller;" border="1" cellspacing="0" cellpadding="3">';
         $Output .= '<tr><th>Datum</th><th>Název</th><th>Hodnota [Kč]</th><th>Doklad</th></tr>';
-        $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceOperation` '.
+        $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `DocumentLineCode`.`Name` AS `BillName` '.
+          'FROM `FinanceOperation` '.
           'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id` = `FinanceOperation`.`BillCode` '.
-          'WHERE `Subject=`'.$_GET['Id'].' ORDER BY `Time`');
+          'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id` = `FinanceOperation`.`Group` '.
+          'WHERE `Subject`='.$_GET['Id'].' ORDER BY `Time`');
         while($Row = $DbResult->fetch_array())
         {
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.$Row['Text'].
-            '</td><td>'.($Row['Value']*$Row['ValueSign']).'</td><td>'.$Row['BillName'].'</td></tr>';
+            '</td><td>'.$Row['Value'].'</td><td>'.$Row['BillName'].'</td></tr>';
         }
         $Output .= '</table></td><td style="vertical-align: top;">';
@@ -340 +342 @@
         $DbResult = $this->Database->query('SELECT `FinanceInvoice`.*, (SELECT GROUP_CONCAT(Description SEPARATOR ",") '.
           'FROM FinanceInvoiceItem WHERE `FinanceInvoiceItem`.`FinanceInvoice` = `FinanceInvoice`.`Id`) AS `Text`, `DocumentLineCode`.`Name` AS `BillName` '.
-          'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id` = `FinanceOperation`.`BillCode` '.
+          'FROM `FinanceInvoice` '.
+          'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id` = `FinanceInvoice`.`BillCode` '.
           'WHERE `Subject`='.$_GET['Id'].' ORDER BY `Time`');
         while($Row = $DbResult->fetch_array())
         {
           $Output .= '<tr><td>'.HumanDate($Row['Time']).'</td><td>'.HumanDate($Row['TimePayment']).
-            '</td><td>'.$Row['Text'].'</td><td>'.round($Row['Value'] * $Row['ValueSign'], $Finance->Rounding).'</td><td>'.$Row['BillName'].'</td></tr>';
+            '</td><td>'.$Row['Text'].'</td><td>'.round($Row['Value'], $Finance->Rounding).'</td><td>'.$Row['BillName'].'</td></tr>';
         }
         $Output .= '</table></td></tr></table>';