From 20be871bac38cfbee474e5cc3e388100aa343fb1 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Thu, 23 Sep 2010 08:08:04 +0000 Subject: [PATCH] Rerun --- includes/lang/gettext.php | 2 ++ reporting/includes/header2.inc | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php index 16768d67..78e7b687 100644 --- 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 481fd160..9c9b36b7 100644 --- 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'); -- 2.30.2