[0000215} Wrong text in deliver to and not printing it.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2c034a758ae6d70966d9809b0897be6b2198abb1..6719df179bd8c56e5b08b061619683003ff9c7df 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+20-Mar-2010 Joe Hunt/RodW
+# [0000215} Wrong text in deliver to and not printing it.
+$ /reporting/includes/doctext.inc
+  /reporting/includes/doctext2.inc
+  /reporting/header2.inc
+  
 15-Mar-2010 Janusz Dobrowolski
 # Missing check for customer/bramch selected ([0000216])
 $ /sales/sales_order_entry.php

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index db0e8a888ce1eb09b4ca686558464bff8fbc5a77..06ef61f0b7c99ff9f314d415923e4a0c0dfc7ea8 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
        {

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index aa5d3055aa8877058ad91e4bd1264a882d45cc8d..b465df3a09e69d3d9b94805d2876d74c36096b2a 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
        {

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 6a8c3b8efd73a9e80cc9f2c91c41e66a30f0a3da..d839ec424936381a51bf5af6548b998a1378c7de 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -188,12 +188,12 @@
                if ($sales_order != NULL)
                {
                        $this->row = $temp;
-                       if ($doctype == ST_PURCHORDER)
+                       if ($doctype == ST_PURCHORDER) // comment out the next line if you don't want to print company name
                                $this->Text($mcol, $this->company['coy_name']);
                        elseif ($doctype != ST_SUPPAYMENT && isset($sales_order['deliver_to']))
                                $this->Text($mcol, $sales_order['deliver_to']);
                        $this->NewLine();
-                       if ($doctype != ST_SUPPAYMENT && isset($sales_order['deliver_to']))
+                       if ($doctype != ST_SUPPAYMENT && isset($sales_order['delivery_address']))
                                $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $sales_order['delivery_address']);
                }
                $this->row = $iline2 - $this->lineHeight - 1;