A couple of additional fixes to changed document reports.

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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 25399a4b1471c36e7797ab9d8e8dc55c808b990c..181a0344ecbf582bb5a55d531e989fe1fa7e74f5 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -143,20 +143,18 @@ function print_sales_orders()
                $DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-               $linetype = true;
                $doctype = ST_SALESORDER;
-               include($path_to_root . "/reporting/includes/doctext.inc");
 
-               $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();
 
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
                if ($myrow['tax_included'] == 0) {
-                       $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+                       $rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
                        $rep->TextCol(6, 7,     $DisplayTotal, -2);
                        $rep->NewLine();
                }
@@ -187,7 +185,7 @@ function print_sales_orders()
                                        $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
                        {
@@ -202,7 +200,7 @@ function print_sales_orders()
 
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
                $rep->Font('bold');
-               $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
+               $rep->TextCol(3, 6, _("TOTAL ORDER VAT INCL."), - 2);
                $rep->TextCol(6, 7,     $DisplayTotal, -2);
                $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
                if ($words != "")
@@ -213,7 +211,7 @@ function print_sales_orders()
                $rep->Font();
                if ($email == 1)
                {
-                       $rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
+                       $rep->End($email);
                }
        }
        if ($email == 0)