From 13533be035e695a9deeb5c96549574dbbf325f3b Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 22 Sep 2010 16:06:39 +0000 Subject: [PATCH] Fixed delivery adress prinitng on sales documents. --- CHANGELOG.txt | 4 ++++ reporting/includes/header2.inc | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0b123687..58360a07 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +22-Sep-2010 Janusz Dobrowolski +# Fixed delivery address printing in pdf documents. +$ /reporting/includes/header2.inc + 20-Sep-2010 Janusz Dobrowolski # Fixed third party module installation. $ /admin/inst_module.php diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc index c7b5db0a..481fd160 100644 --- a/reporting/includes/header2.inc +++ b/reporting/includes/header2.inc @@ -191,14 +191,14 @@ $this->row = $temp; if ($doctype == ST_PURCHORDER) $this->Text($mcol, $this->company['coy_name']); - elseif ($doctype != ST_SUPPAYMENT && isset($sales_order['deliver_to'])) + elseif ($doctype != ST_SUPPAYMENT && isset($this->formData['deliver_to'])) { - $this->Text($mcol, $sales_order['deliver_to']); + $this->Text($mcol, $this->formData['deliver_to']); $this->NewLine(); } // if you need the company name in purchase order then write it as first line in location addresss. - if ($doctype != ST_SUPPAYMENT && isset($sales_order['delivery_address'])) - $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $sales_order['delivery_address']); + if ($doctype != ST_SUPPAYMENT && isset($this->formData['delivery_address'])) + $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $this->formData['delivery_address']); } $this->row = $iline2 - $this->lineHeight - 1; $col = $this->leftMargin; -- 2.30.2