Option to suppress tax rates on documents. To be used for tax on tax

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index ea5234ae13fa086cd8a7945e8fc08c1bb72e905f..78a59495f1766e6d8818844e78914cb9f026e917 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -32,7 +32,7 @@ print_invoices();
 
 function print_invoices()
 {
-       global $path_to_root;
+       global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates;
        
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -109,7 +109,8 @@ function print_invoices()
                        }
                        else
                                $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
-                       $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j);
+                       $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+                       $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j, $contacts);
                        $rep->NewPage();
 
                        $result = get_customer_trans_details($j, $i);
@@ -168,19 +169,36 @@ function print_invoices()
                        $rep->TextCol(6, 7,     $DisplayFreight, -2);
                        $rep->NewLine();
                        $tax_items = get_trans_tax_details($j, $i);
+                       $first = true;
                while ($tax_item = db_fetch($tax_items))
                {
                        $DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
+                       
+                       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'])
                        {
-                                       $rep->TextCol(3, 7, $doc_Included . " " . $tax_item['tax_type_name'] .
-                                               " (" . $tax_item['rate'] . "%) " . $doc_Amount . ": " . $DisplayTax, -2);
+                               if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+                               {
+                                       if ($first)
+                                       {
+                                                       $rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
+                                                       $rep->TextCol(6, 7,     number_format2($sign*$tax_item['net_amount'], $dec), -2);
+                                                       $rep->NewLine();
+                                       }
+                                               $rep->TextCol(3, 6, $tax_type_name, -2);
+                                               $rep->TextCol(6, 7,     $DisplayTax, -2);
+                                               $first = false;
+                               }
+                               else
+                                               $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();