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

Timestamp:

Mar 25, 2014, 12:38:20 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Typ sazby DPH jako samostatná tabulka.

File:

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

trunk/Modules/Finance/Manage.php

@@ -151 +151 @@
         $InvoiceItems = array();
         $MonthlyTotal = 0;
-        $DbResult2 = $this->Database->query('SELECT Service.*, FinanceVAT.Value AS VAT '.
-          'FROM ServiceCustomerRel LEFT JOIN Service '.
-          'ON Service.Id=ServiceCustomerRel.Service '.
-          'LEFT JOIN FinanceVAT ON FinanceVAT.Id=Service.VAT '.
-          'WHERE (ServiceCustomerRel.Customer='.
-          $Member['Id'].') AND (ServiceCustomerRel.Action IS NULL) ');
+        $DbResult2 = $this->Database->query('SELECT `Service`.* '.
+          'FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
+          'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` '.
+          'WHERE (`ServiceCustomerRel`.`Customer`='.
+          $Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL) ');
         while($Service = $DbResult2->fetch_assoc())
         {
           $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => $Service['VAT']);
+            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType($Service['VAT']));
           $MonthlyTotal += $Service['Price'];
         }
@@ -166 +165 @@
         {
           $InvoiceItems[] = array('Description' => 'Spotřeba energie', 'Price' => -$Member['MonthlyPlus'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => 2);
+            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType(VAT_TYPE_BASE));
           $MonthlyTotal -= $Member['MonthlyPlus'];
         }