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

Timestamp:

Sep 30, 2015, 11:55:11 PM (9 years ago)

Author:

chronos

Message:

• Added: Configuration of finance numbers rounding.
• Fixed: Use BillCode column as reference to DocumentLineCode table.
• Fixed: More ValueSign converted to FinanceOperationGroup and FinanceInvoiceGroup.

File:

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

trunk/Modules/Finance/UserState.php

@@ -9 +9 @@
   function ShowFinanceOperation($Subject)
   {
-    $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo` '.
-      'FROM `FinanceOperation` WHERE (`Subject`='.$Subject['Id'].')) UNION ALL '.
+    $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` '.
+      'FROM `FinanceOperation` '.
+      'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceOperation`.`BillCode` '.
+      'WHERE (`Subject`='.$Subject['Id'].') '.
+      ') UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
-      '`Time`, -`Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo` FROM `FinanceInvoice` WHERE (`Subject`='.$Subject['Id'].')))';
+      '`Time`, -`Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceInvoice` '.
+      'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceInvoice`.`BillCode` '.
+      'WHERE (`Subject`='.$Subject['Id'].')))';
 
     $Output = '<div style="text-align:center">Výpis finančních operací</div>';
@@ -46 +51 @@
       if($Row['Value'] == -0) $Row['Value'] = 0;
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
-      if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillCode'].'</a>';
-      else $Invoice = NotBlank($Row['BillCode']);
+      if($Row['BillName'] == '') $Row['BillName'] = 'PDF';
+      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillName'].'</a>';
+        else $Invoice = NotBlank($Row['BillName']);
       if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
-      else $Period = '&nbsp;';
+        else $Period = '&nbsp;';
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td>'.
           '<td style="text-align: left;">'.$Row['Text'].'</td>'.