X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=36d5e491596530557f253a434056cea99e3cf529;hb=c39e64b5267f4f213b960a86a0fa15ad44a6c144;hp=9d5113859126473ba312168b6ee950e711d6cf5e;hpb=37f4a02e0f4bea58e5b2097d583bf9395ffc515f;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 9d511385..36d5e491 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -5,7 +5,7 @@ $page_security = 2;
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
-// Title:	Print Invoices
+// Title:	Print Sales Orders
 // ----------------------------------------------------------------
 $path_to_root="../";
 
@@ -19,20 +19,6 @@ 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_invoiced, 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()
@@ -53,7 +39,7 @@ function print_sales_orders()
 		$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);
 
@@ -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)
 		{
@@ -106,7 +92,8 @@ 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());