X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=36d5e491596530557f253a434056cea99e3cf529;hb=f474e197d8af7acfea554f560a5c45f7d0bef1f7;hp=5ce04c3d6fe282df9f772cfcd8ca2a156fe0c9af;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 5ce04c3d..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,23 +19,11 @@ 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, 
-		".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;
+	global $path_to_root, $print_as_quote;
 	
 	include_once($path_to_root . "reporting/includes/pdf_report.inc");
 	
@@ -44,13 +32,14 @@ function print_sales_orders()
 	$currency = $_POST['PARAM_2'];
 	$bankaccount = $_POST['PARAM_3'];
 	$email = $_POST['PARAM_4'];	
-	$comments = $_POST['PARAM_5'];
+	$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);
 
@@ -65,7 +54,10 @@ function print_sales_orders()
 	
 	if ($email == 0)
 	{
-		$rep = new FrontReport(_('SALES ORDER'), "SalesOrderBulk.pdf", user_pagesize());
+		if ($print_as_quote == 1)
+			$rep = new FrontReport(_("QUOTE"), "QuoteBulk.pdf", user_pagesize());
+		else	
+			$rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk.pdf", user_pagesize());
 		$rep->currency = $cur;
 		$rep->Font();
 		$rep->Info($params, $cols, null, $aligns);
@@ -73,26 +65,35 @@ 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)
 		{
 			$rep = new FrontReport("", "", user_pagesize());
 			$rep->currency = $cur;
 			$rep->Font();
-			$rep->title = _('SALES_ORDER');
-			$rep->filename = "SalesOrder" . $i . ".pdf";
+			if ($print_as_quote == 1)
+			{
+				$rep->title = _('QUOTE');
+				$rep->filename = "Quote" . $i . ".pdf";
+			}
+			else
+			{
+				$rep->title = _("SALES ORDER");
+				$rep->filename = "SalesOrder" . $i . ".pdf";
+			}	
 			$rep->Info($params, $cols, null, $aligns);
 		}
 		else
-			$rep->title = _('SALES ORDER');
+			$rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
 		$rep->Header2($myrow, $branch, $myrow, $baccount, 9);
 
 		$result = get_sales_order_details($i);
 		$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());