Fixed error during new category addition.

[fa-stable.git] / reporting / includes / header2.inc

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index c71ce254f49cc9b2dc3c87d2e3dbc071f81fff20..98bb9428165f5caf2ea672cb2c2dc3987aa82679 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -1,20 +1,21 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+               // New version (without vertical lines)
 
                $this->row = $this->pageHeight - $this->topMargin;
 
                $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 +108,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);
@@ -189,7 +196,9 @@
                $this->TextWrap($col, $this->row, $width, $doc_Due_Date, 'C');
                $this->row = $iline3 - $this->lineHeight - 1;
                $col = $this->leftMargin;
-               if (isset($sales_order["customer_ref"]))
+               if ($doctype == 8)
+                       $this->TextWrap($col, $this->row, $width, $myrow['supp_account_no'], 'C');
+               elseif (isset($sales_order["customer_ref"]))
                        $this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C');
                $col += $width; 
                if ($branch != null)
@@ -274,10 +283,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();