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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index fd48fba9..7fae9f64 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -11,6 +11,8 @@
 ***********************************************************************/
 		// New version (without vertical lines)
 
+	global $wo_types_array;
+	
 		$this->row = $this->pageHeight - $this->topMargin;
 
 		$upper = $this->row - 2 * $this->lineHeight;
@@ -58,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
 		{
@@ -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,7 +129,7 @@
 			$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']);
@@ -150,7 +152,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);
 		}
@@ -222,7 +224,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');
@@ -249,7 +251,7 @@
 		$col += $width;
 		if ($doctype == 26)
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
-		else
+		elseif (!isset($packing_slip) || $packing_slip == 0)
 		{
 			$id = $myrow['payment_terms'];
 			$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
@@ -258,7 +260,7 @@
 			$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');