Changeset 748 for trunk/Modules/Finance/Bill.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/Bill.php (modified) (5 diffs)

trunk/Modules/Finance/Bill.php

@@ -52 +52 @@
   function GenerateHTML()
   {
-    $DbResult = $this->Database->query('SELECT `FinanceInvoice`.*, `FinanceInvoiceGroup`.`Direction` FROM `FinanceInvoice` '.
+    $Finance = &$this->System->Modules['Finance'];
+    $Finance->LoadMonthParameters(0);
+
+    $DbResult = $this->Database->query('SELECT `FinanceInvoice`.*, `FinanceInvoiceGroup`.`Direction`, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceInvoice` '.
       'LEFT JOIN `FinanceInvoiceGroup` ON `FinanceInvoiceGroup`.`Id`=`FinanceInvoice`.`Group` '.
+      'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceInvoice`.`BillCode` '.
       'WHERE `FinanceInvoice`.`Id`='.$this->InvoiceId);
     $Invoice = $DbResult->fetch_assoc();
@@ -72 +76 @@
     $SubjectFrom['Account'] = $SubjectFromAccount['NumberFull'];
 
-    $Dodavka = array();
     $InvoiceItems = array();
-    $DbResult = $this->Database->select('FinanceInvoiceItem', '*, CEIL(`Price` * `Quantity`) AS `Total`', '`FinanceInvoice`='.$this->InvoiceId);
+    $DbResult = $this->Database->select('FinanceInvoiceItem', '*, ROUND(`Price` * `Quantity`, '.$Finance->Rounding.') AS `Total`', '`FinanceInvoice`='.$this->InvoiceId);
     while($Item = $DbResult->fetch_assoc())
     {
@@ -108 +111 @@
       '<tr><td width="50%" valign="top">'.
       '<strong>Platební podmínky:</strong><br>'.
-      'Číslo dokladu: '.$Invoice['BillCode'].'<br>'.
+      'Číslo dokladu: '.$Invoice['BillName'].'<br>'.
       'Variabilní symbol: '.$VarSym.'<br>'.
       'Specifický symbol: '.$this->SpecificSymbol.'<br>'.
@@ -153 +156 @@
   function GenerateHTML()
   {
-    $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `FinanceOperationGroup`.`Direction` FROM `FinanceOperation` '.
+    $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `FinanceOperationGroup`.`Direction`, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceOperation` '.
       'LEFT JOIN `FinanceOperationGroup` ON `FinanceOperationGroup`.`Id`=`FinanceOperation`.`Group` '.
+      'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceOperation`.`BillCode` '.
       'WHERE `FinanceOperation`.`Id`='.$this->OperationId);
     $Operation = $DbResult->fetch_assoc();
@@ -195 +199 @@
       '</td><td width="50%" valign="top">'.
       '<font size="5"><strong>'.$Desc['Type'].' POKLADNÍ DOKLAD</strong></font><br><br>'.
-      'Číslo dokladu: '.$Operation['BillCode'].'<br>'.
+      'Číslo dokladu: '.$Operation['BillName'].'<br>'.
       'Datum vystavení: '.HumanDate($Operation['Time']).'<br>'.
       '</td></tr>'.