Changed so company domicile is printed on invoices and statements if filled out

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fdd9ad2b975a76bbaeaa287c82a472279cac2c31..c2eeb68d958d9f2903c08a14593d523d2ac25047 100644 (file)
--- 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 2f23a36ac719b2a5d0ccb1a06dfc3b7315269334..6298149b2317940814228707438a2ffe1228440b 100644 (file)
--- 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();