Allow reuse of references previously used on voided documents.

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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 05bb3048e57c6e8b1a5cf34f00ff54574b6ff0f2..db7c1c941474c6fc9bd852d29e890fc4d8f0358d 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;
+       global $path_to_root, $packing_slip, $alternative_tax_include_on_docs;
 
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -101,7 +101,8 @@ function print_deliveries()
                        }
                        else
                                $rep->title = _('DELIVERY NOTE');
-                       $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY);
+                       $contacts = get_branch_contacts($branch['branch_code'], 'delivery', $branch['debtor_no']);
+                       $rep->SetCommonData($myrow, $branch, $sales_order, '', ST_CUSTDELIVERY, $contacts);
                        $rep->NewPage();
 
                        $result = get_customer_trans_details(ST_CUSTDELIVERY, $i);
@@ -154,14 +155,7 @@ function print_deliveries()
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                        $linetype = true;
                        $doctype=ST_CUSTDELIVERY;
-                       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");
                        if ($packing_slip == 0)
                        {
                                $rep->TextCol(3, 6, $doc_Sub_total, -2);
@@ -171,13 +165,28 @@ function print_deliveries()
                                $rep->TextCol(6, 7,     $DisplayFreight, -2);
                                $rep->NewLine();
                                $tax_items = get_trans_tax_details(ST_CUSTDELIVERY, $i);
+                               $first = true;
                        while ($tax_item = db_fetch($tax_items))
                        {
                                $DisplayTax = number_format2($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($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
                                {