From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sat, 20 Mar 2010 09:03:01 +0000 (+0000)
Subject: [0000215} Wrong text in deliver to and not printing it.
X-Git-Tag: 2.3-final~930
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7a263b90f425c0510cf235df962a9933d990f7a3;p=fa-stable.git

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

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2c034a75..6719df17 100644
--- 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 db0e8a88..06ef61f0 100644
--- 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 aa5d3055..b465df3a 100644
--- 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 6a8c3b8e..d839ec42 100644
--- 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;