From 3e90488d3be93212ae6acf2b2d233672d07a2a12 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 29 Mar 2009 09:43:13 +0000 Subject: [PATCH] [0000126] Fixed invoice references on credit note document. --- reporting/includes/doctext.inc | 9 ++++++--- reporting/includes/doctext2.inc | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index 3218e26..b28bb90 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -33,7 +33,9 @@ if (isset($header2type)) $doc_Please_Quote = _("All amounts stated in"); } else { $doc_Bank_Account = _("Bank Account"); - $doc_Please_Quote = _("Please quote Invoice no. when paying. All amounts stated in"); + $doc_Please_Quote = $doctype==10 ? + _("Please quote Invoice no. when paying. All amounts stated in") : + _("Please quote Credit no. when paying. All amounts stated in"); } $doc_Address = _("Address"); $doc_Phone_Fax_Email = _("Phone/Fax/Email"); @@ -75,7 +77,8 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==8 || $doctype==9) ? _("Order no.") : _("Invoice No."))); + $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==8 || $doctype==9) ? _("Order no.") : + ($doctype==10 ? _("Invoice No.") : _("Credit No.")))); $doc_Delivery_no = _("Delivery Note No."); $doc_Order_no = _("Order no."); } @@ -87,7 +90,7 @@ if (isset($linetype)) $doc_Shipping = _("Shipping"); $doc_Included = _("Included"); $doc_Amount = _("Amount"); - $doc_TOTAL_INVOICE = _("TOTAL INVOICE"); + $doc_TOTAL_INVOICE = $doctype ==10 ? _("TOTAL INVOICE") : _("TOTAL CREDIT"); $doc_TOTAL_ORDER = _("TOTAL ORDER EX VAT"); $doc_TOTAL_PO = _("TOTAL PO EX VAT"); $doc_TOTAL_DELIVERY = _("TOTAL DELIVERY INCL. VAT"); diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc index b76aa9c..689cbb5 100644 --- a/reporting/includes/doctext2.inc +++ b/reporting/includes/doctext2.inc @@ -32,7 +32,8 @@ if (isset($header2type)) $doc_Bank_Account = ''; $doc_Please_Quote = "All amounts stated in"; } else { - $doc_Please_Quote = "Please quote Invoice no. when paying. All amounts stated in"; + $doc_Please_Quote = "Please quote ".($doctype==10 ? "Invoice" : "Credit") + ." no. when paying. All amounts stated in"; $doc_Bank_Account = "Bank Account"; } $doc_Address = "Address"; @@ -75,7 +76,8 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : "Invoice No.")); + $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : + ($doctype==10 ? "Invoice No." : "Credit No."))); $doc_Delivery_no = "Delivery Note No."; $doc_Order_no = "Order no."; } @@ -87,7 +89,7 @@ if (isset($linetype)) $doc_Shipping = "Shipping"; $doc_Included = "Included"; $doc_Amount = "amount"; - $doc_TOTAL_INVOICE = "TOTAL INVOICE"; + $doc_TOTAL_INVOICE = $doctype==10 ? "TOTAL INVOICE" : "TOTAL CREDIT"; $doc_TOTAL_ORDER = "TOTAL ORDER EX VAT"; $doc_TOTAL_PO = "TOTAL PO EX VAT"; $doc_TOTAL_DELIVERY = "TOTAL DELIVERY INCL. VAT"; -- 2.30.2