Fixed delivery adress prinitng on sales documents.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0b123687e2e3a0ea3fa21d7e24cd8833693da2e8..58360a07b6f4d5cc556b9ab0242d9f0a70146959 100644 (file)
--- 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 c7b5db0a99e49bd8dfde485296347c1cd15d7be9..481fd16092bdc2cca05d8c6d558f807460815e73 100644 (file)
--- 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;