X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=2662fca59d1221403d0a4cdff2785a063b24c8ac;hb=a01cbf378c448da44758b9b9898eb1acc970e84a;hp=c70ac618080136fc6980bfe50a9592209f7ea49a;hpb=6a3e11b77872ecdc9a6390307943ada56ca7d17c;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index c70ac618..2662fca5 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");
 
@@ -84,7 +84,7 @@ function print_sales_quotations()
 			$rep->Info($params, $cols, null, $aligns);
 		}
 		$rep->title = _("SALES QUOTATION");
-		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no']);
+		$contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
 		$rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE, $contacts);
 		//$rep->headerFunc = 'Header2';
 		$rep->NewPage();
@@ -111,11 +111,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))
@@ -130,20 +133,18 @@ function print_sales_quotations()
 		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-		$linetype = true;
 		$doctype = ST_SALESQUOTE;
-		include($path_to_root . "/reporting/includes/doctext.inc");
 
-		$rep->TextCol(3, 6, $doc_Sub_total, -2);
+		$rep->TextCol(3, 6, _("Sub-total"), -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 		$rep->NewLine();
-		$rep->TextCol(3, 6, $doc_Shipping, -2);
+		$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, $doc_TOTAL_ORDER, - 2);
+			$rep->TextCol(3, 6, _("TOTAL ORDER EX VAT"), - 2);
 			$rep->TextCol(6, 7,	$DisplayTotal, -2);
 			$rep->NewLine();
 		}
@@ -174,7 +175,7 @@ function print_sales_quotations()
 					$first = false;
 				}
 				else
-					$rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . " " . $doc_Amount . ": " . $DisplayTax, -2);
+					$rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . " " . _("Amount") . ": " . $DisplayTax, -2);
 			}
 			else
 			{
@@ -189,7 +190,7 @@ function print_sales_quotations()
 
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		$rep->Font('bold');
-		$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
+		$rep->TextCol(3, 6, _("TOTAL ORDER VAT INCL."), - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
 		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESQUOTE);
 		if ($words != "")
@@ -202,7 +203,7 @@ function print_sales_quotations()
 		{
 			if ($print_invoice_no == 1)
 				$myrow['reference'] = $i;
-			$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
+			$rep->End($email);
 		}
 	}
 	if ($email == 0)