X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=2f23a36ac719b2a5d0ccb1a06dfc3b7315269334;hb=e8f8879003c1918b59e6da26be7f3927115ec21f;hp=16e97f9a1b542345d6f9bfa70b5b1ef9ddac8995;hpb=78c4b687c8f92a92e2933e7d8ee84d3ef89788ee;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 16e97f9a..2f23a36a 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -1,4 +1,14 @@
 <?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>.
+***********************************************************************/
 
 		$this->row = $this->pageHeight - $this->topMargin;
 
@@ -135,12 +145,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 +179,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 +206,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'];
@@ -193,16 +230,13 @@
 		$col += $width;	
 		if ($doctype == 9)
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
-		else if ($doctype != 8 && isset($myrow['due_date']))
+		else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
 		
 		$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 +276,12 @@
 			$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 != "") 
+		{
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $legal, 'C');
+			$this->NewLine();
+		}
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;
 ?>
\ No newline at end of file