Bug [0000050] Invoice no. on all sales reports

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 190791ed704b140b8e966580129f1a3972fd5d39..86460088a150e77f3e115d4fcf75371a14171996 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+04-Swp-2008 Joe Hunt
+# Bug [0000050] Invoice no. on all sales reports
+$ /reporting/includes/doctext.inc
+  /reporting/includes/doctext2.inc
+  
 04-Sep-2008 Joe Hunt
 # Bug [0000052] Inventory Valuation Report
 $ /reporting/rep301.php

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index 5753447dd7445bbcf5e63c12610debde7acebf13..0208c46beaf0a2b085d74f53f3c430387f294db5 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -18,7 +18,7 @@ if (isset($header2type))
        $doc_Customers_Ref = _("Customers Reference:");
        $doc_Our_Order_No = _("Our Order No");
        $doc_Domicile = _("Domicile");
-       if($doctype == 13) {
+       if($doctype == 13 || $doctype == 8 || $doctype == 9) {
         $doc_Bank_Account = '';
         $doc_Please_Quote = _("All amounts stated in");
   } else {
@@ -65,7 +65,7 @@ if (isset($emailtype))
 }
 if (isset($header2type) || isset($linetype))
 {
-       $doc_Invoice_no = $doctype==13 ? _("Delivery Note No.") : _("Invoice No.");
+       $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==8 || $doctype==9) ? _("Order no.") : _("Invoice No.")));
        $doc_Delivery_no = "Delivery Note No.";
        $doc_Order_no = _("Order no.");
 }

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 0bbe57e71559557c9e1e320f5b4404dbc6513552..7c33519b7a5c588cb100b0d2a150d6ac5a5fc704 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -18,7 +18,7 @@ if (isset($header2type))
        $doc_Customers_Ref = "Customers Reference:";
        $doc_Our_Order_No = "Our Order No";
        $doc_Domicile = "Domicile";
-       if($doctype == 13) {
+       if($doctype == 13 || $doctype == 8 || $doctype == 9) {
         $doc_Bank_Account = '';
         $doc_Please_Quote = "All amounts stated in";
   } else {
@@ -35,11 +35,11 @@ if (isset($header2type))
                if ($doctype == 8)
                        $this->title = "PURCHASE ORDER";
                else if ($doctype == 9)
-                       $this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
+                       $this->title = ($print_as_quote==1 ? "QUOTE" : "SALES ORDER");
                else if ($doctype == 10)
                        $this->title = "INVOICE";
                else if ($doctype == 13)
-                       $this->title = _("DELIVERY NOTE");
+                       $this->title = "DELIVERY NOTE";
                else
                        $this->title = "CREDIT NOTE";
                if ($doctype == 8)
@@ -65,7 +65,7 @@ if (isset($emailtype))
 }
 if (isset($header2type) || isset($linetype))
 {
-       $doc_Invoice_no = $doctype==13 ? "Delivery Note No." : "Invoice No.";
+       $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : "Invoice No."));
        $doc_Order_no = "Order no.";
 }
 if (isset($linetype))