Added an alternative way of presenting tax included on invoices.

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index d80046525d51e41f4f15aef17af756c017e05c23..275498c9d184b06f92baf88756132f7d74f2cecc 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;
        
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -159,14 +159,7 @@ function print_invoices()
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $linetype = true;
                        $doctype = $j;
-                       if ($rep->currency != $myrow['curr_code'])
-                       {
-                               include($path_to_root . "/reporting/includes/doctext2.inc");
-                       }
-                       else
-                       {
-                               include($path_to_root . "/reporting/includes/doctext.inc");
-                       }
+                       include($path_to_root . "/reporting/includes/doctext.inc");
 
                        $rep->TextCol(3, 6, $doc_Sub_total, -2);
                        $rep->TextCol(6, 7,     $DisplaySubTot, -2);
@@ -175,14 +168,29 @@ 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 ($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_item['tax_type_name'] . " (" .
+                                                       $tax_item['rate'] . "%)", -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);
                                }
                        else
                        {