From 5db6030e4d0126be8883347574111be381478256 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 17 Mar 2009 13:56:30 +0000
Subject: [PATCH] Changed so company domicile is printed on invoices and
 statements if filled out

---
 CHANGELOG.txt                  |  4 ++++
 reporting/includes/header2.inc | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fdd9ad2b..c2eeb68d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+17-Mar-2009 Joe Hunt
+! Changed so company domicile is printed on invoices and statements if filled out.
+$ /reporting/includes/header2.inc
+
 17-Mar-2009 Janusz Dobrowolski
 + Added default delivery required by parameter, removed custom company fileds/names.
 $ /admin/company_preferences.php
diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 2f23a36a..6298149b 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -14,7 +14,7 @@
 
 		$upper = $this->row - 2 * $this->lineHeight;
 		$lower = $this->bottomMargin + 6 * $this->lineHeight;
-		$iline1 = $upper - 7 * $this->lineHeight;
+		$iline1 = $upper - 7.5 * $this->lineHeight;
 		$iline2 = $iline1 - 8 * $this->lineHeight;
 		$iline3 = $iline2 - 1.5 * $this->lineHeight;
 		$iline4 = $iline3 - 1.5 * $this->lineHeight;
@@ -107,7 +107,13 @@
 			$this->Text($ccol, $doc_Our_VAT_no, $c2col);
 			$this->Text($c2col, $this->company['gst_no'], $mcol);
 			$this->NewLine();
-		}	
+		}
+		if (($doctype == 10 || $doctype == 12) && $this->company['domicile'] != "")
+		{
+			$this->Text($ccol, $doc_Domicile, $c2col);
+			$this->Text($c2col, $this->company['domicile'], $mcol);
+			$this->NewLine();
+		}
 		$this->Font();
 		$this->row = $adrline;
 		$this->NewLine(3);
@@ -276,10 +282,9 @@
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
 			$this->NewLine();
 		}
-		$legal = get_company_pref('legal_text');
-		if (($doctype == 10 || $doctype == 12) && $legal != "") 
+		if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
 		{
-			$this->TextWrap($ccol, $this->row, $right - $ccol, $legal, 'C');
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
 			$this->NewLine();
 		}
 		$this->Font();
-- 
2.30.2