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 6c4e08a1058997d3d34aad6b7573287dfcb53be9..98bb9428165f5caf2ea672cb2c2dc3987aa82679 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -1,10 +1,21 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/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;
@@ -97,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);
@@ -135,12 +152,21 @@
                }
                else
                {
-                       if ($doctype == 8)
-                               $this->Text($ccol, $myrow['supp_name'], $icol);
-                       else
-                               $this->Text($ccol, $myrow['DebtorName'], $icol);
+                       if ($doctype == 8) {
+                               $name = $myrow['supp_name'];
+                               $addr = $myrow['address'];
+                       } else {
+                               if (trim($branch['br_address']) != '') {
+                                       $name = $branch['br_name'];
+                                       $addr = $branch['br_address'];
+                               } else {
+                                       $name = $myrow['DebtorName'];
+                                       $addr = $myrow['address'];
+                               }
+                       }
+                       $this->Text($ccol, $name, $icol);
                        $this->NewLine();
-                       $this->TextWrapLines($ccol, $icol - $ccol, $myrow['address']);
+                       $this->TextWrapLines($ccol, $icol - $ccol, $addr);
                }
                if ($sales_order != NULL)
                {
@@ -160,14 +186,19 @@
                $col += $width;
                $this->TextWrap($col, $this->row, $width, $doc_Your_VAT_no, 'C');
                $col += $width;
-               $this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C');
+               if ($doctype == 10)
+                       $this->TextWrap($col, $this->row, $width, $doc_Delivery_no, 'C');
+               else
+                       $this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C');
                $col += $width;
                $this->TextWrap($col, $this->row, $width, $doc_Payment_Terms, 'C');
                $col += $width;
                $this->TextWrap($col, $this->row, $width, $doc_Due_Date, 'C');
                $this->row = $iline3 - $this->lineHeight - 1;
                $col = $this->leftMargin;
-               if ($sales_order != NULL)
+               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)
@@ -182,7 +213,20 @@
                if ($doctype != 8 && isset($myrow['tax_id']))
                        $this->TextWrap($col, $this->row, $width, $myrow['tax_id'], 'C');
                $col += $width; 
-               if (isset($myrow['order_']))
+               if ($doctype == 10)
+               {
+                       $deliveries = get_parent_trans(10,$myrow['trans_no']);
+                       $line = "";
+                       foreach ($deliveries as $delivery)
+                       {
+                               if ($line == "")
+                                       $line .= "$delivery";
+                               else
+                                       $line .= ",$delivery";
+                       }               
+                       $this->TextWrap($col, $this->row, $width, $line, 'C');
+               }
+               elseif (isset($myrow['order_']))
                        $this->TextWrap($col, $this->row, $width, $myrow['order_'], 'C');
                $col += $width; 
                $id = $myrow['payment_terms'];
@@ -199,10 +243,7 @@
                $this->row = $iline5 - $this->lineHeight - 1;
                $this->Font('bold');
                $count = count($this->headers);
-               if (user_pagesize() == "Letter")
-                       $this->cols[$count] += 40;
-               else    
-                       $this->cols[$count] += 5;
+               $this->cols[$count] = $right - 3;
                for ($i = 0; $i < $count; $i++)
                        $this->TextCol($i, $i + 1, $this->headers[$i], -2);
                $this->Font();
@@ -242,6 +283,11 @@
                        $this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
                        $this->NewLine();
                }
+               if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
+               {
+                       $this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
+                       $this->NewLine();
+               }
                $this->Font();
                $temp = $iline6 - $this->lineHeight - 2;
 ?>
\ No newline at end of file