X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=7fae9f64fa2a5dac79f9dff8629be2c7adf28a1e;hb=3141d7755efbca4d2eb7babc1d31629295451885;hp=9ee5b8136533adfcb9df7d9c911c5729518685ed;hpb=813a5c558638f7937da410b969a7935dd0de7342;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 9ee5b813..7fae9f64 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -1,10 +1,23 @@
 <?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)
 
+	global $wo_types_array;
+	
 		$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;
@@ -47,7 +60,7 @@
 		if ($this->company['coy_logo'] != '')
 		{
 			$logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
-			$this->AddImage($logo, $ccol, $this->row - 10, 0, 40);
+			$this->AddImage($logo, $ccol, $this->row, 0, 40);
 		}
 		else
 		{
@@ -97,19 +110,29 @@
 			$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);
 		$this->Text($mcol + 100, $doc_Date.":");
-		if ($doctype == 8 || $doctype == 9)
+		if ($doctype == 7 || $doctype == 8 || $doctype == 9)
 			$this->Text($mcol + 180, sql2date($myrow['ord_date']));
+		elseif ($doctype == 26)	
+			$this->Text($mcol + 180, sql2date($myrow['date_']));
 		else
 			$this->Text($mcol + 180, sql2date($myrow['tran_date']));
 		$this->NewLine();
 		$this->Text($mcol + 100, $doc_Invoice_no);
-		if ($doctype == 8 || $doctype == 9) // PO or SO
+		if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO
 			$this->Text($mcol + 180, $myrow['order_no']);
+		elseif ($doctype == 26)	
+			$this->Text($mcol + 180, $myrow['id']);
 		else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
 		{
 			if ($print_invoice_no == 1)
@@ -129,10 +152,16 @@
 		$this->row = $this->row - $this->lineHeight - 5;
 
 		$temp = $this->row;
-		if ($doctype == 9)
+		if ($doctype == 7 || $doctype == 9)
 		{
 			$this->Text($ccol, $myrow['name'], $icol);
 		}
+		elseif ($doctype == 26)
+		{
+			$this->Text($ccol, $myrow['location_name'], $icol);
+			$this->NewLine();
+			$this->TextWrapLines($ccol, $icol - $ccol, $myrow['delivery_address']);
+		}
 		else
 		{
 			if ($doctype == 8) {
@@ -169,14 +198,21 @@
 		$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 (isset($sales_order["customer_ref"]))
+		if ($doctype == 8)
+			$this->TextWrap($col, $this->row, $width, $myrow['supp_account_no'], 'C');
+		elseif ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $myrow['wo_ref'], 'C');
+		elseif (isset($sales_order["customer_ref"]))
 			$this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C');
 		$col += $width;	
 		if ($branch != null)
@@ -187,21 +223,47 @@
 			$row = db_fetch($result);
 			$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
 		}		
+		elseif ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $wo_types_array[$myrow["type"]], 'C');
 		$col += $width;	
-		if ($doctype != 8 && isset($myrow['tax_id']))
+		if ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $myrow["StockItemName"], 'C');
+		elseif ($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 ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $myrow["location_name"], 'C');
+		elseif (isset($myrow['order_']))
 			$this->TextWrap($col, $this->row, $width, $myrow['order_'], 'C');
+		$col += $width;
+		if ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
+		elseif (!isset($packing_slip) || $packing_slip == 0)
+		{
+			$id = $myrow['payment_terms'];
+			$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
+			$result = db_query($sql,"could not get paymentterms");
+			$row = db_fetch($result);
+			$this->TextWrap($col, $this->row, $width, $row["terms"], 'C');
+		}	
 		$col += $width;	
-		$id = $myrow['payment_terms'];
-		$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
-		$result = db_query($sql,"could not get paymentterms");
-		$row = db_fetch($result);
-		$this->TextWrap($col, $this->row, $width, $row["terms"], 'C');
-		$col += $width;	
-		if ($doctype == 9)
+		if ($doctype == 9 || $doctype == 7)
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
+		elseif ($doctype == 26)	
+			$this->TextWrap($col, $this->row, $width, $myrow["units_issued"], 'C');
 		else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
 		
@@ -214,7 +276,8 @@
 		$this->Font();
 		$this->Font('italic');
 		$this->row = $iline7 - $this->lineHeight - 6;
-		$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C');
+		if ($doctype != 26)
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C');
 		$this->NewLine();
 
 		if (isset($bankaccount['bank_name']))
@@ -248,6 +311,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