Rerun

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

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 2550dbb7247eca23da79deb3e35442e15e73901f..be6c730e51b4d62878b9434451567db562a58dab 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.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
        {
@@ -54,14 +57,13 @@ if (isset($header2type))
                $doc_Customers_Ref = "Customers Reference";
                $doc_Our_Order_No = "Our Order No";
        }
+       $doc_Extra = "";
        $doc_Our_VAT_no = "Our VAT No.";
        $doc_Domicile = "Domicile";
        if($doctype == ST_CUSTDELIVERY || $doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER ||
                $doctype == ST_SUPPAYMENT || $doctype == ST_CUSTPAYMENT) {
                if ($doctype == ST_CUSTPAYMENT)
                        $doc_Extra = "* Subject to Realisation of the Cheque.";
-               else    
-                       $doc_Extra = "";
                $doc_Bank_Account = '';
                $doc_Please_Quote = "All amounts stated in";
   } else {
@@ -123,13 +125,16 @@ if (isset($emailtype))
 }
 if (isset($header2type) || isset($linetype))
 {
-       $doc_Invoice_no = ($doctype==ST_CUSTDELIVERY ? "Delivery Note No." :
+       $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.";
+       $doc_Order_no = "Order No.";
 }
 if (isset($linetype))
 {