X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=11284eda20f273f0b6a7181c90a44a7fad919ef6;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=0649d763f52c3deff233acc91717ca733a09b607;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 0649d763..11284eda 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -31,7 +31,7 @@ print_sales_quotations();
 
 function print_sales_quotations()
 {
-	global $path_to_root, $print_as_quote, $print_invoice_no, $no_zero_lines_amount;
+	global $path_to_root, $print_as_quote, $SysPrefs, $pic_height;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -47,6 +47,10 @@ function print_sales_quotations()
 	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
+	$pictures = $SysPrefs->print_item_images_on_quote();
+	// If you want a larger image, then increase $pic_height f.i.
+	// $pic_height += 25;
+	
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
 	// $headers in doctext.inc
@@ -70,7 +74,7 @@ function print_sales_quotations()
 		if ($email == 1)
 		{
 			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
-			if ($print_invoice_no == 1)
+			if ($SysPrefs->print_invoice_no() == 1)
 				$rep->filename = "SalesQuotation" . $i . ".pdf";
 			else	
 				$rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
@@ -107,7 +111,7 @@ function print_sales_quotations()
 			$rep->TextColLines(1, 2, $myrow2['description'], -2);
 			$newrow = $rep->row;
 			$rep->row = $oldrow;
-			if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
+			if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !$SysPrefs->no_zero_lines_amount())
 			{
 				$rep->TextCol(2, 3,	$DisplayQty, -2);
 				$rep->TextCol(3, 4,	$myrow2['units'], -2);
@@ -116,6 +120,20 @@ function print_sales_quotations()
 				$rep->TextCol(6, 7,	$DisplayNet, -2);
 			}
 			$rep->row = $newrow;
+			
+			if ($pictures)
+			{
+				$image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
+				if (file_exists($image))
+				{
+					//$rep->NewLine();
+					if ($rep->row - $pic_height < $rep->bottomMargin)
+						$rep->NewPage();
+					$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
+					$rep->row -= $pic_height;
+					$rep->NewLine();
+				}
+			}
 			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->NewPage();
@@ -128,6 +146,7 @@ function print_sales_quotations()
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
+		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$doctype = ST_SALESQUOTE;
 
 		$rep->TextCol(3, 6, _("Sub-total"), -2);
@@ -157,7 +176,7 @@ function print_sales_quotations()
 
 			if ($myrow['tax_included'])
 			{
-				if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+				if ($SysPrefs->alternative_tax_include_on_docs() == 1)
 				{
 					if ($first)
 					{
@@ -196,7 +215,7 @@ function print_sales_quotations()
 		$rep->Font();
 		if ($email == 1)
 		{
-			if ($print_invoice_no == 1)
+			if ($SysPrefs->print_invoice_no() == 1)
 				$myrow['reference'] = $i;
 			$rep->End($email);
 		}
@@ -205,4 +224,3 @@ function print_sales_quotations()
 		$rep->End();
 }
 
-?>
\ No newline at end of file