X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=90cf3b63f5636866a97a62695333bb7b782517e8;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=a857da9b957af4d5ff59538d9c01e5fa6ced39c1;hpb=39ef29ec4c57a03feabd4ecfa599e71f35b3dddb;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index a857da9b..90cf3b63 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -58,7 +58,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 +119,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 +127,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 +150,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);
 		}
@@ -258,7 +258,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');
@@ -312,7 +312,7 @@
 		if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
 		{
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
-			$this->NewLine();
+//			$this->NewLine();
 		}
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;