X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep109.php;h=dac0e0563f873d459e78f08d4d17e2c57dbb8825;hb=0eadb0e7549a8e90af92dac51b560f57918084ac;hp=087c9f5835ffc12651ad6694c2b9d27ec7e28c46;hpb=c92b3045e74e92fde41664f43aa67964e839b0e0;p=fa-stable.git

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 087c9f58..dac0e056 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, 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;
+	global $path_to_root, $print_as_quote;
 	
 	include_once($path_to_root . "reporting/includes/pdf_report.inc");
 	
@@ -44,7 +32,8 @@ 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;
@@ -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,19 +65,27 @@ 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);