1177: Print single receipt fails

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

diff --git a/reporting/rep110.php b/reporting/rep110.php
index 6b392cd0ab3fe987d107348586c74b7d8726c636..cadfc522faaa708d481783878d95e297ff1d7d3f 100644 (file)
--- a/reporting/rep110.php
+++ b/reporting/rep110.php
@@ -44,14 +44,14 @@ function print_deliveries()
        $packing_slip = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
 
-       if ($from == null)
-               $from = 0;
-       if ($to == null)
-               $to = 0;
+       if (!$from || !$to) return;
+
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
        $tno = explode("-", $to);
+       $from = min($fno[0], $tno[0]);
+       $to = max($fno[0], $tno[0]);
 
        $cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -74,7 +74,7 @@ function print_deliveries()
                $rep->Info($params, $cols, null, $aligns);
        }
 
-       for ($i = $fno[0]; $i <= $tno[0]; $i++)
+       for ($i = $from; $i <= $to; $i++)
        {
                        if (!exists_customer_trans(ST_CUSTDELIVERY, $i))
                                continue;
@@ -153,21 +153,21 @@ function print_deliveries()
                        $DisplayFreight = number_format2($myrow["ov_freight"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-                       $linetype = true;
                        $doctype=ST_CUSTDELIVERY;
-                       include($path_to_root . "/reporting/includes/doctext.inc");
                        if ($packing_slip == 0)
                        {
-                               $rep->TextCol(3, 6, $doc_Sub_total, -2);
+                               $rep->TextCol(3, 6, _("Sub-total"), -2);
                                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
                                $rep->NewLine();
-                               $rep->TextCol(3, 6, $doc_Shipping, -2);
+                               $rep->TextCol(3, 6, _("Shipping"), -2);
                                $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))
                        {
+                               if ($tax_item['amount'] == 0)
+                                       continue;
                                $DisplayTax = number_format2($tax_item['amount'], $dec);
  
                                        if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
@@ -190,7 +190,7 @@ function print_deliveries()
                                                        $first = false;
                                        }
                                        else
-                                                       $rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+                                                       $rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
                                        }
                                else
                                {
@@ -203,7 +203,7 @@ function print_deliveries()
                                $DisplayTotal = number_format2($myrow["ov_freight"] +$myrow["ov_freight_tax"] + $myrow["ov_gst"] +
                                        $myrow["ov_amount"],$dec);
                                $rep->Font('bold');
-                               $rep->TextCol(3, 6, $doc_TOTAL_DELIVERY, - 2);
+                               $rep->TextCol(3, 6, _("TOTAL DELIVERY INCL. VAT"), - 2);
                                $rep->TextCol(6, 7,     $DisplayTotal, -2);
                                $words = price_in_words($myrow['Total'], ST_CUSTDELIVERY);
                                if ($words != "")
@@ -215,7 +215,7 @@ function print_deliveries()
                        }       
                        if ($email == 1)
                        {
-                               $rep->End($email, $doc_Delivery_no . " " . $myrow['reference'], $myrow, ST_CUSTDELIVERY);
+                               $rep->End($email);
                        }
        }
        if ($email == 0)