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 2c5449445d86c2ff2c102b48c4138da13a92fafb..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");
 
@@ -64,6 +64,7 @@ function print_invoices()
        if ($email == 0)
        {
                $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
+               $rep->SetHeaderType('Header2');
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
@@ -73,7 +74,7 @@ function print_invoices()
        {
                for ($j = ST_SALESINVOICE; $j <= ST_CUSTCREDIT; $j++)
                {
-                       if (isset($_POST['PARAM_7']) && $_POST['PARAM_7'] != $j)
+                       if (isset($_POST['PARAM_6']) && $_POST['PARAM_6'] != $j)
                                continue;
                        if (!exists_customer_trans($j, $i))
                                continue;
@@ -91,6 +92,7 @@ function print_invoices()
                        if ($email == 1)
                        {
                                $rep = new FrontReport("", "", user_pagesize());
+                           $rep->SetHeaderType('Header2');
                                $rep->currency = $cur;
                                $rep->Font();
                                if ($j == ST_SALESINVOICE)
@@ -107,12 +109,16 @@ function print_invoices()
                        }
                        else
                                $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
-                       $rep->Header2($myrow, $branch, $sales_order, $baccount, $j);
+                       $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, $j);
+                       $rep->NewPage();
 
                        $result = get_customer_trans_details($j, $i);
                        $SubTotal = 0;
                        while ($myrow2=db_fetch($result))
                        {
+                               if ($myrow2["quantity"] == 0)
+                                       continue;
+                                       
                                $Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
                                   user_price_dec());
                                $SubTotal += $Net;
@@ -136,7 +142,7 @@ function print_invoices()
                                $rep->row = $newrow;
                                //$rep->NewLine(1);
                                if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                                       $rep->Header2($myrow, $branch, $sales_order, $baccount,$j);
+                                       $rep->NewPage();
                        }
 
                        $comments = get_comments($j, $i);
@@ -153,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);
@@ -169,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
                        {
@@ -192,6 +206,12 @@ function print_invoices()
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2);
                        $rep->TextCol(6, 7, $DisplayTotal, -2);
+                       $words = price_in_words($myrow['Total'], $j);
+                       if ($words != "")
+                       {
+                               $rep->NewLine(1);
+                               $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+                       }       
                        $rep->Font();
                        if ($email == 1)
                        {