X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=42d99bac05c178ebf098ab2a3e3e91d3a99c6fbe;hb=a92ebdde7985571d5ce5e9777b5b436ec3cec110;hp=3f7986bf6882a3df874a1aaae9b46bf138ad717d;hpb=a254199b8f60c441de8b5154c2a9a9ab2a4d95e3;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 3f7986bf..42d99bac 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, $systypes_array;
+	
 		$this->row = $this->pageHeight - $this->topMargin;
 
 		$upper = $this->row - 2 * $this->lineHeight;
-		$lower = $this->bottomMargin + 6 * $this->lineHeight;
-		$iline1 = $upper - 7 * $this->lineHeight;
+		$lower = $this->bottomMargin + 8 * $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;
@@ -12,7 +25,7 @@
 		$iline6 = $iline5 - 1.5 * $this->lineHeight;
 		$iline7 = $lower;
 		$right = $this->pageWidth - $this->rightMargin;
-		$width = ($right - $this->leftMargin) / 6;
+		$width = ($right - $this->leftMargin) / 5;
 		$icol = $this->pageWidth / 2;
 		$ccol = $this->cols[0] + 4;
 		$c2col = $ccol + 60;
@@ -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,25 +110,40 @@
 			$this->Text($ccol, $doc_Our_VAT_no, $c2col);
 			$this->Text($c2col, $this->company['gst_no'], $mcol);
 			$this->NewLine();
-		}	
+		}
+		if (($doctype == ST_SALESINVOICE || $doctype == ST_STATEMENT) && $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)
-			$this->Text($mcol + 180, sql2date($myrow['ord_date']));
+		$this->Text($mcol + 100, $doc_Date);
+		if ($doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER)
+			$this->Text($mcol + 180, sql2date($this->formData['ord_date']));
+		elseif ($doctype == ST_WORKORDER)	
+			$this->Text($mcol + 180, sql2date($this->formData['date_']));
 		else
-			$this->Text($mcol + 180, sql2date($myrow['tran_date']));
+			$this->Text($mcol + 180, sql2date($this->formData['tran_date']));
 		$this->NewLine();
 		$this->Text($mcol + 100, $doc_Invoice_no);
-		if ($doctype == 8 || $doctype == 9) // PO or SO
-			$this->Text($mcol + 180, $myrow['order_no']);
-		else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
+		if ($doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER) // QUOTE, PO or SO
+		{
+			if ($print_invoice_no == 1)
+				$this->Text($mcol + 180, $this->formData['order_no']);
+			else	
+				$this->Text($mcol + 180, $this->formData['reference']);
+		}		
+		elseif ($doctype == ST_WORKORDER)	
+			$this->Text($mcol + 180, $this->formData['id']);
+		else if (isset($this->formData['trans_no']) && isset($this->formData['reference'])) // INV/CRE/STA
 		{
 			if ($print_invoice_no == 1)
-				$this->Text($mcol + 180, $myrow['trans_no']);
+				$this->Text($mcol + 180, $this->formData['trans_no']);
 			else
-				$this->Text($mcol + 180, $myrow['reference']);
+				$this->Text($mcol + 180, $this->formData['reference']);
 		}
 
 		if ($this->pageNumber > 1 && !strstr($this->filename, "Bulk"))
@@ -129,37 +157,45 @@
 		$this->row = $this->row - $this->lineHeight - 5;
 
 		$temp = $this->row;
-		if ($doctype == 9)
+		if ($doctype == ST_SALESQUOTE || $doctype == ST_SALESORDER)
 		{
-			$this->Text($ccol, $myrow['name'], $icol);
+			$this->Text($ccol, $this->formData['name'], $icol);
+		}
+		elseif ($doctype == ST_WORKORDER)
+		{
+			$this->Text($ccol, $this->formData['location_name'], $icol);
+			$this->NewLine();
+			$this->TextWrapLines($ccol, $icol - $ccol, $this->formData['delivery_address']);
 		}
 		else
 		{
-			if ($doctype == 8) {
-				$name = $myrow['supp_name'];
-				$addr = $myrow['address'];
+			if ($doctype == ST_PURCHORDER || $doctype == ST_SUPPAYMENT) {
+				$name = $this->formData['supp_name'];
+				$addr = $this->formData['address'];
 			} else {
-				if (trim($branch['br_address']) != '') {
-					$name = $branch['br_name'];
-					$addr = $branch['br_address'];
+				if (isset($this->formData['br_address']) && 
+						trim($this->formData['br_address']) != '') {
+					$name = $this->formData['br_name'];
+					$addr = $this->formData['br_address'];
 				} else {
-					$name = $myrow['DebtorName'];
-					$addr = $myrow['address'];
+					$name = $this->formData['DebtorName'];
+					$addr = $this->formData['address'];
 				}
 			}
 			$this->Text($ccol, $name, $icol);
 			$this->NewLine();
 			$this->TextWrapLines($ccol, $icol - $ccol, $addr);
 		}
-		if ($sales_order != NULL)
+		if (isset($this->formData['deliver_to']))
 		{
 			$this->row = $temp;
-			if ($doctype == 8)
+			if ($doctype == ST_PURCHORDER)
 				$this->Text($mcol, $this->company['coy_name']);
-			else
-				$this->Text($mcol, $sales_order['deliver_to']);
+			elseif ($doctype != ST_SUPPAYMENT && isset($this->formData['deliver_to']))
+				$this->Text($mcol, $this->formData['deliver_to']);
 			$this->NewLine();
-			$this->TextWrapLines($mcol, $this->rightMargin - $mcol, $sales_order['delivery_address']);
+			if ($doctype != ST_SUPPAYMENT && isset($this->formData['deliver_to']))
+				$this->TextWrapLines($mcol, $this->rightMargin - $mcol, $this->formData['delivery_address']);
 		}
 		$this->row = $iline2 - $this->lineHeight - 1;
 		$col = $this->leftMargin;
@@ -169,37 +205,54 @@
 		$col += $width;
 		$this->TextWrap($col, $this->row, $width, $doc_Your_VAT_no, 'C');
 		$col += $width;
-		if ($doctype == 10)
+		if ($doctype == ST_SALESINVOICE)
 			$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"]))
-			$this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C');
+		if ($doctype == ST_PURCHORDER || $doctype == ST_SUPPAYMENT)
+			$this->TextWrap($col, $this->row, $width, $this->formData['supp_account_no'], 'C');
+		elseif ($doctype == ST_WORKORDER)
+			$this->TextWrap($col, $this->row, $width, $this->formData['wo_ref'], 'C');
+		elseif (isset($this->formData["customer_ref"]))
+			$this->TextWrap($col, $this->row, $width, $this->formData["customer_ref"], 'C');
+		elseif (isset($this->formData["debtor_ref"]))
+			$this->TextWrap($col, $this->row, $width, $this->formData["debtor_ref"], 'C');
 		$col += $width;	
-		if ($branch != null)
+		if (isset($this->formData['salesman']))
 		{
-			$id = $branch['salesman'];
-			$sql = "SELECT salesman_name  FROM ".TB_PREF."salesman WHERE salesman_code='$id'";
-			$result = db_query($sql,"could not get sales person");
-			$row = db_fetch($result);
-			$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
+			$id = $this->formData['salesman'];
+			//$sql = "SELECT salesman_name  FROM ".TB_PREF."salesman WHERE salesman_code='$id'";
+			//$result = db_query($sql,"could not get sales person");
+			//$row = db_fetch($result);
+			//$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
+			$this->TextWrap($col, $this->row, $width, get_salesman_name($id), 'C');
 		}		
+		elseif ($doctype == ST_SUPPAYMENT || $doctype == ST_CUSTPAYMENT)
+			$this->TextWrap($col, $this->row, $width, $systypes_array[$this->formData["type"]], 'C');
+		elseif ($doctype == ST_WORKORDER)
+			$this->TextWrap($col, $this->row, $width, $wo_types_array[$this->formData["type"]], 'C');
 		$col += $width;	
-		if ($doctype != 8 && isset($myrow['tax_id']))
-			$this->TextWrap($col, $this->row, $width, $myrow['tax_id'], 'C');
+		if ($doctype == ST_WORKORDER)
+			$this->TextWrap($col, $this->row, $width, $this->formData["StockItemName"], 'C');
+		elseif ($doctype != ST_PURCHORDER && isset($this->formData['tax_id']))
+			$this->TextWrap($col, $this->row, $width, $this->formData['tax_id'], 'C');
 		$col += $width;	
-		if ($doctype == 10)
+		if ($doctype == ST_SALESINVOICE)
 		{
-			$deliveries = get_parent_trans(10,$myrow['trans_no']);
+			$deliveries = get_parent_trans(ST_SALESINVOICE, $this->formData['trans_no']);
 			$line = "";
 			foreach ($deliveries as $delivery)
 			{
+				if ($print_invoice_no == 0)
+				{
+					$ref = get_reference(ST_CUSTDELIVERY, $delivery);
+					if ($ref)
+						$delivery = $ref;
+				}		
 				if ($line == "")
 					$line .= "$delivery";
 				else
@@ -207,20 +260,46 @@
 			}		
 			$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'];
-		$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');
+		elseif ($doctype == ST_CUSTDELIVERY)
+		{
+			$ref = $this->formData['order_'];
+			if ($print_invoice_no == 0)
+			{
+				$ref = get_reference(ST_SALESORDER, $this->formData['order_']);
+				if (!$ref)
+					$ref = $this->formData['order_'];
+			}		
+			$this->TextWrap($col, $this->row, $width, $ref, 'C');
+		}
+		elseif ($doctype == ST_WORKORDER)
+			$this->TextWrap($col, $this->row, $width, $this->formData["location_name"], 'C');
+		elseif (isset($this->formData['order_']) && $this->formData['order_'] != 0)
+			$this->TextWrap($col, $this->row, $width, $this->formData['order_'], 'C');
 		$col += $width;	
-		if ($doctype == 9)
-			$this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
-		else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
-			$this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
-		
+		if ($doctype == ST_SALESORDER || $doctype == ST_SALESQUOTE)
+			$this->TextWrap($col, $this->row, $width, sql2date($this->formData['delivery_date']), 'C');
+		elseif ($doctype == ST_WORKORDER)	
+			$this->TextWrap($col, $this->row, $width, $this->formData["units_issued"], 'C');
+		elseif ($doctype != ST_PURCHORDER && $doctype != ST_CUSTCREDIT && $doctype != ST_CUSTPAYMENT &&
+			$doctype != ST_SUPPAYMENT && isset($this->formData['due_date']))
+			$this->TextWrap($col, $this->row, $width, sql2date($this->formData['due_date']), 'C');
+		if ((!isset($packing_slip) || $packing_slip == 0) && ($doctype != ST_STATEMENT)) //!
+		{
+			$this->row -= (2 * $this->lineHeight);
+			if ($doctype == ST_WORKORDER)
+				$str = sql2date($this->formData["required_by"]);
+			else
+			{
+				$id = $this->formData['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);
+				$str = $row["terms"];
+			}	
+			$this->Font('italic');
+			$this->TextWrap($ccol, $this->row, $right-$ccol, $doc_Payment_Terms . ":  " . $str);
+			$this->Font();
+		}
 		$this->row = $iline5 - $this->lineHeight - 1;
 		$this->Font('bold');
 		$count = count($this->headers);
@@ -230,45 +309,49 @@
 		$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');
-		$this->NewLine();
+		if ($doctype != ST_WORKORDER)
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $this->formData['curr_code'], 'C');
+		$this->row -= $this->lineHeight;
 
-		if (isset($bankaccount['bank_name']))
+		if (isset($this->formData['bank_name']))
 		{
-			$txt = $doc_Bank . ": ".$bankaccount['bank_name']. ", " . $doc_Bank_Account . ": " . $bankaccount['bank_account_number'];
+			$txt = $doc_Bank . ": ".$this->formData['bank_name']. ", " . $doc_Bank_Account . ": " . $this->formData['bank_account_number'];
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $txt, 'C');
-			$this->NewLine();
+			$this->row -= $this->lineHeight;
 		}	
-		if ($doctype == 10 && $branch['disable_branch'] > 0) // payment links
+		if ($doctype == ST_SALESINVOICE && $this->formData['disable_branch'] > 0) // payment links
 		{
-			if ($branch['disable_branch'] == 1)
+			if ($this->formData['disable_branch'] == 1)
 			{
-				$amt = number_format($myrow["ov_freight"] + $myrow["ov_gst"] +	$myrow["ov_amount"], user_price_dec());
+				$amt = number_format($this->formData["ov_freight"] + $this->formData["ov_gst"] +	$this->formData["ov_amount"], user_price_dec());
 				$txt = $doc_Payment_Link . " PayPal: ";
-				$name = urlencode($this->title . " " . $myrow['reference']);
+				$name = urlencode($this->title . " " . $this->formData['reference']);
 				$url = "https://www.paypal.com/xclick/business=" . $this->company['email'] . "&item_name=" .
-					$name . "&amount=" . $amt . "&currency_code=" . $myrow['curr_code'];
+					$name . "&amount=" . $amt . "&currency_code=" . $this->formData['curr_code'];
 				$this->fontSize -= 2;
 				$this->TextWrap($ccol, $this->row, $right - $ccol, $txt, 'C');
-				$this->NewLine();
+				$this->row -= $this->lineHeight;
 				$this->SetTextColor(0, 0, 255);
 				$this->TextWrap($ccol, $this->row, $right - $ccol, $url, 'C');
 				$this->SetTextColor(0, 0, 0);
 				$this->addLink($url, $ccol, $this->row, $this->pageWidth - $this->rightMargin, $this->row + $this->lineHeight);
 				$this->fontSize += 2;
-				$this->NewLine();
+				$this->row -= $this->lineHeight;
 			}
 		}
+		if ($doc_Extra != "")
+		{
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Extra, 'C');
+			$this->row -= $this->lineHeight;
+		}
 		if ($this->params['comments'] != '')
 		{
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
-			$this->NewLine();
+			$this->row -= $this->lineHeight;
 		}
-		$legal = get_company_pref('legal_text');
-		if (($doctype == 10 || $doctype == 12) && $legal != "") 
+		if (($doctype == ST_SALESINVOICE || $doctype == ST_STATEMENT) && $this->company['legal_text'] != "") 
 		{
-			$this->TextWrap($ccol, $this->row, $right - $ccol, $legal, 'C');
-			$this->NewLine();
+			$this->TextWrapLines($ccol, $right - $ccol, $this->company['legal_text'], 'C');
 		}
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;