X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=df2b2dbe7378606d0a823d95850fb43eeec08e40;hb=7561718ee5113232ce917f63085d272884b0929c;hp=4287a4de03ed29136426ca17fd6493d5bd2f73ab;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 4287a4de..df2b2dbe 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, $print_item_images_on_quote, $pic_height;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -47,9 +47,9 @@ function print_sales_quotations()
 	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
-	$pictures = (isset($print_item_images_on_quote) && $print_item_images_on_quote==1);
-	// If you want a larger image, then increase $pic_height f.i.
-	// $pic_height += 25;
+	$pictures = $SysPrefs->print_item_images_on_quote();
+	// If you want a larger image, then increase pic_height f.i.
+	// $SysPrefs->pic_height += 25;
 	
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -74,19 +74,18 @@ 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";
 		}
-		$rep->SetHeaderType('Header2');
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
 
 		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
-		//$rep->headerFunc = 'Header2';
+		$rep->SetHeaderType('Header2');
 		$rep->NewPage();
 
 		$result = get_sales_order_details($i, ST_SALESQUOTE);
@@ -111,7 +110,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);
@@ -127,10 +126,10 @@ function print_sales_quotations()
 				if (file_exists($image))
 				{
 					//$rep->NewLine();
-					if ($rep->row - $pic_height < $rep->bottomMargin)
+					if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 						$rep->NewPage();
-					$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-					$rep->row -= $pic_height;
+					$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+					$rep->row -= $SysPrefs->pic_height;
 					$rep->NewLine();
 				}
 			}
@@ -176,7 +175,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)
 					{
@@ -215,7 +214,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);
 		}
@@ -224,4 +223,3 @@ function print_sales_quotations()
 		$rep->End();
 }
 
-?>
\ No newline at end of file