X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep111.php;h=5db2f9d06dd40f8ce9281e46d4c1eea7228f35fa;hb=5f06887dedd4d14701864fb72994d7e20352086d;hp=cbf48a04f68f03f6bf4e91bf6b1ba3a481af8c9e;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/reporting/rep111.php b/reporting/rep111.php
index cbf48a04..5db2f9d0 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -37,9 +37,8 @@ function print_sales_quotations()
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$currency = $_POST['PARAM_2'];
-	$bankaccount = $_POST['PARAM_3'];
-	$email = $_POST['PARAM_4'];
-	$comments = $_POST['PARAM_5'];
+	$email = $_POST['PARAM_3'];
+	$comments = $_POST['PARAM_4'];
 
 	if ($from == null)
 		$from = 0;
@@ -52,10 +51,8 @@ function print_sales_quotations()
 	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
 
-	$params = array('comments' => $comments,
-					'bankaccount' => $bankaccount);
+	$params = array('comments' => $comments);
 
-	$baccount = get_bank_account($params['bankaccount']);
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
@@ -69,6 +66,8 @@ function print_sales_quotations()
 	for ($i = $from; $i <= $to; $i++)
 	{
 		$myrow = get_sales_order_header($i, ST_SALESQUOTE);
+		$baccount = get_default_bank_account($myrow['curr_code']);
+		$params['bankaccount'] = $baccount['id'];
 		$branch = get_branch($myrow["branch_code"]);
 		if ($email == 1)
 		{
@@ -79,7 +78,7 @@ function print_sales_quotations()
 			$rep->Info($params, $cols, null, $aligns);
 		}
 		$rep->title = _("SALES QUOTATION");
-		$rep->Header2($myrow, $branch, $myrow, $baccount, 7);
+		$rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE);
 
 		$result = get_sales_order_details($i, ST_SALESQUOTE);
 		$SubTotal = 0;
@@ -108,7 +107,7 @@ function print_sales_quotations()
 			$rep->row = $newrow;
 			//$rep->NewLine(1);
 			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-				$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+				$rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE);
 		}
 		if ($myrow['comments'] != "")
 		{
@@ -120,7 +119,7 @@ function print_sales_quotations()
 
 		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 		$linetype = true;
-		$doctype = 9;
+		$doctype = ST_SALESQUOTE;
 		if ($rep->currency != $myrow['curr_code'])
 		{
 			include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -138,8 +137,17 @@ function print_sales_quotations()
 		$rep->NewLine();
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
 		$rep->Font('bold');
-		$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+		if ($myrow['tax_included'] == 0)
+			$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+		else	
+			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
+		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESQUOTE);
+		if ($words != "")
+		{
+			$rep->NewLine(1);
+			$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+		}	
 		$rep->Font();
 		if ($email == 1)
 		{