X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=e9be5d7669f1d94dbe449de250b67a8ead918352;hb=cf015790b7363cfcf29b98c82d20787c8d703fc1;hp=db251ae50ca4e46a7eff0c4abdd785ff09c194a6;hpb=d6ccc05f1d97979ee67c33451fdfd9cf5f124bb9;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index db251ae5..e9be5d76 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -19,58 +19,44 @@ include_once($path_to_root . "sales/includes/sales_db.inc");
 // trial_inquiry_controls();
 print_sales_orders();
 
-//----------------------------------------------------------------------------------------------------
-
-function get_sales_order_details($order_no)
-{
-	$sql = "SELECT stk_code, unit_price, ".TB_PREF."sales_order_details.description,
-		".TB_PREF."sales_order_details.quantity, discount_percent, 
-		qty_sent, units,
-		".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost AS standard_cost
-		FROM ".TB_PREF."sales_order_details, ".TB_PREF."stock_master 
-			WHERE ".TB_PREF."sales_order_details.stk_code = ".TB_PREF."stock_master.stock_id 
-				AND order_no =" . $order_no;
-	return db_query($sql, "Retreive order Line Items");
-}
-
 $print_as_quote = 0;
 
 function print_sales_orders()
 {
 	global $path_to_root, $print_as_quote;
-	
+
 	include_once($path_to_root . "reporting/includes/pdf_report.inc");
-	
+
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$currency = $_POST['PARAM_2'];
 	$bankaccount = $_POST['PARAM_3'];
-	$email = $_POST['PARAM_4'];	
-	$print_as_quote = $_POST['PARAM_5'];	
+	$email = $_POST['PARAM_4'];
+	$print_as_quote = $_POST['PARAM_5'];
 	$comments = $_POST['PARAM_6'];
 
 	if ($from == null)
 		$from = 0;
 	if ($to == null)
 		$to = 0;
-	$dec =user_price_dec();
-	
+	$dec = user_price_dec();
+
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
-	// $headers in doctext.inc	
+	// $headers in doctext.inc
 	$aligns = array('left',	'left',	'right', 'left', 'right', 'right', 'right');
-	
+
 	$params = array('comments' => $comments,
 					'bankaccount' => $bankaccount);
-	
+
 	$baccount = get_bank_account($params['bankaccount']);
 	$cur = get_company_Pref('curr_default');
-	
+
 	if ($email == 0)
 	{
 		if ($print_as_quote == 1)
 			$rep = new FrontReport(_("QUOTE"), "QuoteBulk.pdf", user_pagesize());
-		else	
+		else
 			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk.pdf", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
@@ -79,7 +65,7 @@ function print_sales_orders()
 
 	for ($i = $from; $i <= $to; $i++)
 	{
-		$myrow = get_sales_order($i);
+		$myrow = get_sales_order_header($i);
 		$branch = get_branch($myrow["branch_code"]);
 		if ($email == 1)
 		{
@@ -95,7 +81,7 @@ function print_sales_orders()
 			{
 				$rep->title = _("SALES ORDER");
 				$rep->filename = "SalesOrder" . $i . ".pdf";
-			}	
+			}
 			$rep->Info($params, $cols, null, $aligns);
 		}
 		else
@@ -106,14 +92,15 @@ function print_sales_orders()
 		$SubTotal = 0;
 		while ($myrow2=db_fetch($result))
 		{
-			$Net = ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]);
+			$Net = round(((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
+			   user_price_dec());
 			$SubTotal += $Net;
 			$DisplayPrice = number_format2($myrow2["unit_price"],$dec);
-			$DisplayQty = number_format2($myrow2["quantity"],user_qty_dec());
+			$DisplayQty = number_format2($myrow2["quantity"],get_qty_dec($myrow2['stk_code']));
 			$DisplayNet = number_format2($Net,$dec);
 			if ($myrow2["discount_percent"]==0)
 				$DisplayDiscount ="";
-			else 
+			else
 				$DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
 			$rep->TextCol(0, 1,	$myrow2['stk_code'], -2);
 			$rep->TextCol(1, 2,	$myrow2['description'], -2);
@@ -123,14 +110,14 @@ function print_sales_orders()
 			$rep->TextCol(5, 6,	$DisplayDiscount, -2);
 			$rep->TextCol(6, 7,	$DisplayNet, -2);
 			$rep->NewLine(1);
-			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight)) 
+			if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
 				$rep->Header2($myrow, $branch, $sales_order, $baccount);
 		}
 		if ($myrow['comments'] != "")
 		{
 			$rep->NewLine();
 			$rep->TextColLines(1, 5, $myrow['comments'], -2);
-		}	
+		}
 		$DisplaySubTot = number_format2($SubTotal,$dec);
 		$DisplayFreight = number_format2($myrow["freight_cost"],$dec);
 
@@ -139,12 +126,12 @@ function print_sales_orders()
 		$doctype = 9;
 		if ($rep->currency != $myrow['curr_code'])
 		{
-			include($path_to_root . "reporting/includes/doctext2.inc");			
-		}	
+			include($path_to_root . "reporting/includes/doctext2.inc");
+		}
 		else
 		{
-			include($path_to_root . "reporting/includes/doctext.inc");			
-		}	
+			include($path_to_root . "reporting/includes/doctext.inc");
+		}
 
 		$rep->TextCol(3, 6, $doc_Sub_total, -2);
 		$rep->TextCol(6, 7,	$DisplaySubTot, -2);
@@ -153,10 +140,10 @@ function print_sales_orders()
 		$rep->TextCol(6, 7,	$DisplayFreight, -2);
 		$rep->NewLine();
 		$DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
-		$rep->Font('bold');	
+		$rep->Font('bold');
 		$rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$rep->Font();	
+		$rep->Font();
 		if ($email == 1)
 		{
 			if ($myrow['contact_email'] == '')
@@ -165,7 +152,7 @@ function print_sales_orders()
 				$myrow['DebtorName'] = $branch['br_name'];
 			}
 			$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow);
-		}	
+		}
 	}
 	if ($email == 0)
 		$rep->End();