X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fsales_orders_view.php;h=f5977aa791bb0bb9444ad87ffcb92c50cd67c760;hb=c8145b03ed9754bd9552ccdac38b41b73550a69f;hp=b96b99dd1e7f3692ec00babeb090e65ab3bd7cc8;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index b96b99dd..f5977aa7 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -73,32 +73,9 @@ else
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 600);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 page($_SESSION['page_title'], false, false, "", $js);
-
-if (isset($_GET['selected_customer']))
-{
-	$selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-	$selected_customer = $_POST['selected_customer'];
-}
-else
-	$selected_customer = -1;
-
-//---------------------------------------------------------------------------------------------
-
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
 //---------------------------------------------------------------------------------------------
 //	Query format functions
 //
@@ -129,12 +106,7 @@ function edit_link($row)
 {
 	global $page_nested;
 
-	if ($page_nested)
-		return '';
-	global $trans_type;
-	$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
-  return pager_link( _("Edit"),
-    "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
+	return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
 }
 
 function dispatch_link($row)
@@ -201,27 +173,17 @@ function invoice_prep_link($row)
 		"/sales/customer_invoice.php?InvoicePrepayments=" .$row['order_no'], ICON_DOC) : '';
 }
 
-//---------------------------------------------------------------------------------------------
-// Update db record if respective checkbox value has changed.
-//
-function change_tpl_flag($id)
+$id = find_submit('_chgtpl');
+if ($id != -1)
 {
-	global	$Ajax;
-	
-  	$sql = "UPDATE ".TB_PREF."sales_orders SET type = !type WHERE order_no=$id";
-
-  	db_query($sql, "Can't change sales order type");
+	sales_order_set_template($id, check_value('chgtpl'.$id));
 	$Ajax->activate('orders_tbl');
 }
 
-$id = find_submit('_chgtpl');
-if ($id != -1)
-	change_tpl_flag($id);
-
 if (isset($_POST['Update']) && isset($_POST['last'])) {
 	foreach($_POST['last'] as $id => $value)
 		if ($value != check_value('chgtpl'.$id))
-			change_tpl_flag($id);
+			sales_order_set_template($id, !check_value('chgtpl'.$id));
 }
 
 $show_dates = !in_array($_POST['order_view_mode'], array('OutstandingOnly', 'InvoiceTemplates', 'DeliveryTemplates'));
@@ -262,7 +224,7 @@ if($show_dates) {
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
 
-if (!@$_GET['popup'])
+if (!$page_nested)
 	customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)
 	check_cells(_("Show All:"), 'show_all');
@@ -277,8 +239,9 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
-	@$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);
+$sql = get_sql_for_sales_orders_view($trans_type, get_post('OrderNumber'), get_post('order_view_mode'),
+	get_post('SelectStockFromList'), get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('OrderReference'), get_post('StockLocation'),
+	get_post('customer_id'));
 
 if ($trans_type == ST_SALESORDER)
 	$cols = array(