X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=49036917db934d915f88835d7a04836e87e09d0e;hb=14f56ab219f12c3e2b1dec21f356505f1f8292bd;hp=07fbd41f2b34d62b223e946e4178fabd6e6c5e54;hpb=7729c70dcdc39b2d776f27cd12bd4631c93251b7;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index 07fbd41f..49036917 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, $print_as_quote, $print_invoice_no, $no_zero_lines_amount;
 
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -40,11 +40,11 @@ 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();
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
@@ -57,13 +57,9 @@ 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++)
 	{
@@ -73,18 +69,18 @@ function print_sales_quotations()
 		$branch = get_branch($myrow["branch_code"]);
 		if ($email == 1)
 		{
-			$rep = new FrontReport("", "", user_pagesize());
-			$rep->SetHeaderType('Header2');
-			$rep->currency = $cur;
-			$rep->Font();
+			$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 			if ($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'], false);
+		$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->NewPage();
@@ -111,11 +107,14 @@ 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']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
+			{
+				$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 ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))