Merged changes from main trunk up to version_2_1_4

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

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 16460053bebe45fb9b014c1024c163072de0b89a..92f27507146a60b36ca82ba2c53d600d5f591f3a 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -13,8 +13,16 @@ if (isset($header2type))
 {
        $doc_Cust_no = "Cust no";
        $doc_Date = "Date";
-       $doc_Charge_To = "Charge To";
-       $doc_Delivered_To = "Delivered To";
+       if ($doctype == 8) // Purchase Order
+       {
+               $doc_Charge_To = "Order To";
+               $doc_Delivered_To = "Charge To";
+       }
+       else
+       {
+               $doc_Charge_To = "Charge To";
+               $doc_Delivered_To = "Delivered To";
+       }       
        $doc_Shipping_Company = "Shipping Company";
        if ($doctype == 9)
                $doc_Due_Date = "Delivery Date";
@@ -86,7 +94,7 @@ if (isset($header2type))
 }
 if (isset($emailtype))
 {
-       $doc_Dear_Sirs = "Dear Sirs";
+       $doc_Dear_Sirs = "Dear";
        $doc_AttachedFile = "Attached you will find ";
        $doc_Kindest_regards = "Kindest regards";
        $doc_Payment_Link = "You can pay through";