Rerun

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index 16768d677df3041406fd406fc8c22688d7e1f1df..78e7b68720b1eccab49d0e47ce54015df9376f9f 100644 (file)
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -127,6 +127,8 @@ class gettext_native_support
     {
         if ($path === false) 
                $path = "./locale";
+           if ($domain == "")
+               $domain = "?";
                if ($version) {
        // To avoid need for apache server restart after change of *.mo file
        // we have to include file version as part of filename.

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 481fd16092bdc2cca05d8c6d558f807460815e73..9c9b36b7c3e5032524ae2b4da035a45b818b2b79 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -186,9 +186,9 @@
                        $this->NewLine();
                        $this->TextWrapLines($ccol, $icol - $ccol, $addr);
                }
+               $this->row = $temp;
                if (isset($this->formData['deliver_to']))
                {
-                       $this->row = $temp;
                        if ($doctype == ST_PURCHORDER)
                                $this->Text($mcol, $this->company['coy_name']);
                        elseif ($doctype != ST_SUPPAYMENT && isset($this->formData['deliver_to']))
@@ -196,10 +196,11 @@
                                $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($this->formData['delivery_address']))
                                $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $this->formData['delivery_address']);
-               }
+               }       // if you need the company name in purchase order then write it as first line in location addresss.     
+               elseif ($doctype == ST_PURCHORDER && isset($this->formData['delivery_address']))
+                       $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $this->formData['delivery_address']);
                $this->row = $iline2 - $this->lineHeight - 1;
                $col = $this->leftMargin;
                $this->TextWrap($col, $this->row, $width, $doc_Customers_Ref, 'C');