Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / reporting / includes / doctext.inc

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index e0b1e83e6c88321a7333558c9ce71651e22cc249..0f47b5450d436bad3f2c3a935e332a115f7bf96c 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -16,7 +16,10 @@ if (isset($header2type))
        if ($doctype == ST_PURCHORDER || $doctype == ST_SUPPAYMENT) // Purchase Order
        {
                $doc_Charge_To = _("Order To");
-               $doc_Delivered_To = _("Charge To");
+               if ($doctype == ST_PURCHORDER)
+                       $doc_Delivered_To = _("Deliver To");
+               else    
+                       $doc_Delivered_To = _("Charge To");
        }
        else
        {
@@ -126,8 +129,12 @@ if (isset($header2type) || isset($linetype))
        $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? _("Delivery Note No.") : 
                ($doctype == ST_CUSTPAYMENT ? _("Receipt No.") :
                ($doctype == ST_SUPPAYMENT ? _("Remittance No.") :
-               (($doctype==ST_SALESQUOTE || $doctype==ST_PURCHORDER || $doctype==ST_SALESORDER) ? _("Order No.") : 
-               ($doctype==ST_SALESINVOICE ? _("Invoice No.") : ($doctype==ST_WORKORDER ? _("Work Order No.") : _("Credit No.")))))));
+               ($doctype == ST_PURCHORDER ? _("Purchase Order No.") :
+               ($doctype == ST_SALESORDER ? _("Order No.") :
+               ($doctype == ST_SALESQUOTE ? _("Quotation No.") :
+               ($doctype == ST_SALESINVOICE ? _("Invoice No.") :
+               ($doctype == ST_WORKORDER ? _("Work Order No.") : _("Credit No.")))))))));
+
        $doc_Delivery_no = _("Delivery Note No.");
        $doc_Order_no = _("Order No.");
 }