Initialized upgrade procedures for FA 2.4

[fa-stable.git] / reporting / rep110.php

diff --git a/reporting/rep110.php b/reporting/rep110.php
index db7c1c941474c6fc9bd852d29e890fc4d8f0358d..6b392cd0ab3fe987d107348586c74b7d8726c636 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -34,7 +34,7 @@ print_deliveries();
 
 function print_deliveries()
 {
-       global $path_to_root, $packing_slip, $alternative_tax_include_on_docs;
+       global $path_to_root, $packing_slip, $alternative_tax_include_on_docs, $suppress_tax_rates;
 
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -169,7 +169,13 @@ function print_deliveries()
                        while ($tax_item = db_fetch($tax_items))
                        {
                                $DisplayTax = number_format2($tax_item['amount'], $dec);
-                               if ($tax_item['included_in_price'])
+ 
+                                       if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+                                               $tax_type_name = $tax_item['tax_type_name'];
+                                       else
+                                               $tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
+ 
+                                       if ($tax_item['included_in_price'])
                                {
                                                if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
                                        {
@@ -179,19 +185,16 @@ function print_deliveries()
                                                                $rep->TextCol(6, 7,     number_format2($tax_item['net_amount'], $dec), -2);
                                                                $rep->NewLine();
                                                }
-                                                       $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
-                                                               $tax_item['rate'] . "%)", -2);
+                                                       $rep->TextCol(3, 6, $tax_type_name, -2);
                                                        $rep->TextCol(6, 7,     $DisplayTax, -2);
                                                        $first = false;
                                        }
                                        else
-                                                       $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
-                                                               " (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2);
+                                                       $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
                                        }
                                else
                                {
-                                               $rep->TextCol(3, 6, $tax_item['tax_type_name'] . " (" .
-                                                       $tax_item['rate'] . "%)", -2);
+                                               $rep->TextCol(3, 6, $tax_type_name, -2);
                                                $rep->TextCol(6, 7,     $DisplayTax, -2);
                                        }
                                        $rep->NewLine();
@@ -212,11 +215,6 @@ function print_deliveries()
                        }       
                        if ($email == 1)
                        {
-                               if ($myrow['email'] == '')
-                               {
-                                       $myrow['email'] = $branch['email'];
-                                       $myrow['DebtorName'] = $branch['br_name'];
-                               }
                                $rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY);
                        }
        }