Fixed delivery note's invoice deadline date description

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

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index c76cfed9a7f92f80bc79de5aa8ca6b47fc9ac191..355cda64a5f3db8c36933671eb47f499320c4f3c 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
        {
@@ -31,6 +34,8 @@ if (isset($header2type))
                $doc_Due_Date = _("Valid until");
        elseif ($doctype == ST_SALESORDER)
                $doc_Due_Date = _("Delivery Date");
+       elseif($doctype == ST_CUSTDELIVERY)
+               $doc_Due_Date = _("To Be Invoiced Before");
        else
                $doc_Due_Date = _("Due Date");
        $doc_Your_Ref = _("Your Ref");
@@ -126,13 +131,18 @@ 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 ? _("Word 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))
 {
+
        if ($doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER || 
                $doctype == ST_SALESINVOICE || $doctype == ST_CUSTCREDIT || $doctype == ST_CUSTDELIVERY)
        {
@@ -143,10 +153,10 @@ if (isset($linetype))
                $doc_TOTAL_INVOICE = $doctype ==ST_SALESINVOICE ? _("TOTAL INVOICE") : _("TOTAL CREDIT");
                $doc_TOTAL_ORDER = _("TOTAL ORDER EX VAT");
                $doc_TOTAL_ORDER2 = _("TOTAL ORDER VAT INCL.");
-               $doc_TOTAL_PO = _("TOTAL PO EX VAT");
+               $doc_TOTAL_PO = _("TOTAL PO");
                $doc_TOTAL_DELIVERY = _("TOTAL DELIVERY INCL. VAT");
        }
-       elseif ($doctype == ST_SUPPAYMENT || ST_CUSTPAYMENT)
+       elseif ($doctype == ST_SUPPAYMENT || $doctype == ST_CUSTPAYMENT)
        {
                $doc_Towards = _("As advance / full / part / payment towards:");
                $doc_by_Cheque = _("By Cash / Cheque* / Draft No.");
@@ -172,4 +182,4 @@ if (isset($linetype))
                $doc_Over = _("Over");
        }
 }
-?>
\ No newline at end of file
+?>