X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=1db74b7c8869b2f9b92fdf05de06a89376284179;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=80b6b712515792cf04e80283bcbfa6f33bc79553;hpb=91a637fe74ce0d78b9b4ce099b42449da87c6e71;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 80b6b712..1db74b7c 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;
+	global $path_to_root, $SysPrefs;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -40,13 +40,17 @@ function print_sales_quotations()
 	$currency = $_POST['PARAM_2'];
 	$email = $_POST['PARAM_3'];
 	$comments = $_POST['PARAM_4'];
+	$orientation = $_POST['PARAM_5'];
 
-	if ($from == null)
-		$from = 0;
-	if ($to == null)
-		$to = 0;
+	if (!$from || !$to) return;
+
+	$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.
+	// $SysPrefs->pic_height += 25;
+	
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
 	// $headers in doctext.inc
@@ -57,36 +61,34 @@ function print_sales_quotations()
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_("SALES QUOTATION"), "SalesQuotationBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
+		$rep = new FrontReport(_("SALES QUOTATION"), "SalesQuotationBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
 		$myrow = get_sales_order_header($i, ST_SALESQUOTE);
+		if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+			continue;
+		}
 		$baccount = get_default_bank_account($myrow['curr_code']);
 		$params['bankaccount'] = $baccount['id'];
 		$branch = get_branch($myrow["branch_code"]);
 		if ($email == 1)
 		{
-			$rep = new FrontReport("", "", user_pagesize());
-			$rep->SetHeaderType('Header2');
-			$rep->currency = $cur;
-			$rep->Font();
-			if ($print_invoice_no == 1)
+			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+			if ($SysPrefs->print_invoice_no() == 1)
 				$rep->filename = "SalesQuotation" . $i . ".pdf";
 			else	
 				$rep->filename = "SalesQuotation" . $myrow['reference'] . ".pdf";
-			$rep->Info($params, $cols, null, $aligns);
 		}
-		$rep->title = _("SALES QUOTATION");
-		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+		$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,23 +113,37 @@ function print_sales_quotations()
 			$rep->TextColLines(1, 2, $myrow2['description'], -2);
 			$newrow = $rep->row;
 			$rep->row = $oldrow;
-			$rep->TextCol(2, 3,	$DisplayQty, -2);
-			$rep->TextCol(3, 4,	$myrow2['units'], -2);
-			$rep->TextCol(4, 5,	$DisplayPrice, -2);
-			$rep->TextCol(5, 6,	$DisplayDiscount, -2);
-			$rep->TextCol(6, 7,	$DisplayNet, -2);
+			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);
+				$rep->TextCol(4, 5,	$DisplayPrice, -2);
+				$rep->TextCol(5, 6,	$DisplayDiscount, -2);
+				$rep->TextCol(6, 7,	$DisplayNet, -2);
+			}
 			$rep->row = $newrow;
-			//$rep->NewLine(1);
+			
+			if ($pictures)
+			{
+				$image = company_path(). "/images/" . item_img_name($myrow2['stk_code']) . ".jpg";
+				if (file_exists($image))
+				{
+					if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
+						$rep->NewPage();
+					$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+					$rep->row -= $SysPrefs->pic_height;
+					$rep->NewLine();
+				}
+			}
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->NewPage();
 		}
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
-			$rep->TextColLines(1, 5, $myrow['comments'], -2);
+			$rep->TextColLines(1, 3, $myrow['comments'], -2);
 		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
-		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$doctype = ST_SALESQUOTE;
@@ -135,10 +151,13 @@ function print_sales_quotations()
 		$rep->TextCol(3, 6, _("Sub-total"), -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$rep->NewLine();
-		$rep->TextCol(3, 6, _("Shipping"), -2);
-		$rep->TextCol(6, 7,	$DisplayFreight, -2);
-		$rep->NewLine();
-
+		if ($myrow['freight_cost'] != 0.0)
+		{
+			$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
+			$rep->TextCol(3, 6, _("Shipping"), -2);
+			$rep->TextCol(6, 7,	$DisplayFreight, -2);
+			$rep->NewLine();
+		}	
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		if ($myrow['tax_included'] == 0) {
 			$rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
@@ -159,12 +178,12 @@ 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)
 					{
 						$rep->TextCol(3, 6, _("Total Tax Excluded"), -2);
-						$rep->TextCol(6, 7,	number_format2($sign*$tax_item['net_amount'], $dec), -2);
+						$rep->TextCol(6, 7,	number_format2($tax_item['net_amount'], $dec), -2);
 						$rep->NewLine();
 					}
 					$rep->TextCol(3, 6, $tax_type_name, -2);
@@ -198,7 +217,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);
 		}
@@ -207,4 +226,3 @@ function print_sales_quotations()
 		$rep->End();
 }
 
-?>
\ No newline at end of file