X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=c3fd180b9baab9f7b6f98efadee875b038390b56;hb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;hp=64f391de30daf9e1f6501871aa551601d2d208d0;hpb=95303d7b5280820af76ddbd8908b120813f1e763;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 64f391de..c3fd180b 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -11,10 +11,12 @@
 ***********************************************************************/
 		// 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;
+		$lower = $this->bottomMargin + 8 * $this->lineHeight;
 		$iline1 = $upper - 7.5 * $this->lineHeight;
 		$iline2 = $iline1 - 8 * $this->lineHeight;
 		$iline3 = $iline2 - 1.5 * $this->lineHeight;
@@ -23,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;
@@ -119,7 +121,7 @@
 		$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_']));
@@ -127,8 +129,13 @@
 			$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
-			$this->Text($mcol + 180, $myrow['order_no']);
+		if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO
+		{
+			if ($print_invoice_no == 1)
+				$this->Text($mcol + 180, $myrow['order_no']);
+			else	
+				$this->Text($mcol + 180, $myrow['reference']);
+		}		
 		elseif ($doctype == 26)	
 			$this->Text($mcol + 180, $myrow['id']);
 		else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
@@ -150,7 +157,7 @@
 		$this->row = $this->row - $this->lineHeight - 5;
 
 		$temp = $this->row;
-		if ($doctype == 9)
+		if ($doctype == 7 || $doctype == 9)
 		{
 			$this->Text($ccol, $myrow['name'], $icol);
 		}
@@ -201,8 +208,6 @@
 		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;
@@ -222,7 +227,7 @@
 			$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
 		}		
 		elseif ($doctype == 26)
-			$this->TextWrap($col, $this->row, $width, wo_types::name($myrow["type"]), 'C');
+			$this->TextWrap($col, $this->row, $width, $wo_types_array[$myrow["type"]], 'C');
 		$col += $width;	
 		if ($doctype == 26)
 			$this->TextWrap($col, $this->row, $width, $myrow["StockItemName"], 'C');
@@ -231,10 +236,16 @@
 		$col += $width;	
 		if ($doctype == 10)
 		{
-			$deliveries = get_parent_trans(10,$myrow['trans_no']);
+			$deliveries = get_parent_trans(ST_SALESINVOICE, $myrow['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
@@ -242,29 +253,45 @@
 			}		
 			$this->TextWrap($col, $this->row, $width, $line, 'C');
 		}
+		elseif ($doctype == 13)
+		{
+			$ref = $myrow['order_'];
+			if ($print_invoice_no == 0)
+			{
+				$ref = get_reference(ST_SALESORDER, $myrow['order_']);
+				if (!$ref)
+					$ref = $myrow['order_'];
+			}		
+			$this->TextWrap($col, $this->row, $width, $ref, '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');
-		else
-		{
-			$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']))
+		elseif ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
-		
+		if (!isset($packing_slip) || $packing_slip == 0)
+		{
+			$this->row -= (2 * $this->lineHeight);
+			if ($doctype == 26)
+				$str = sql2date($myrow["required_by"]);
+			else
+			{
+				$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);
+				$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);
@@ -276,13 +303,13 @@
 		$this->row = $iline7 - $this->lineHeight - 6;
 		if ($doctype != 26)
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C');
-		$this->NewLine();
+		$this->row -= $this->lineHeight;
 
 		if (isset($bankaccount['bank_name']))
 		{
 			$txt = $doc_Bank . ": ".$bankaccount['bank_name']. ", " . $doc_Bank_Account . ": " . $bankaccount['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
 		{
@@ -295,24 +322,23 @@
 					$name . "&amount=" . $amt . "&currency_code=" . $myrow['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 ($this->params['comments'] != '')
 		{
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
-			$this->NewLine();
+			$this->row -= $this->lineHeight;
 		}
 		if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
 		{
-			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
-//			$this->NewLine();
+			$this->TextWrapLines($ccol, $right - $ccol, $this->company['legal_text'], 'C');
 		}
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;