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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 5ce04c3d..9d511385 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -25,7 +25,7 @@ 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, 
+		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 
@@ -33,9 +33,11 @@ function get_sales_order_details($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 +46,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 +68,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);
@@ -80,12 +86,20 @@ function print_sales_orders()
 			$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);