X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=2241e1f9dc05a7fe9c157f64d8e738280ec16a9c;hb=443214a800fa66cd1473b48f6fadd1b09144a5d4;hp=78b4a40f6f28d0a62d11f192be9e412e9d7e8abd;hpb=0c760ea65c8c6f0a45ea8328abab53be649f2105;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 78b4a40f..2241e1f9 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -71,34 +71,11 @@ else
 }
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->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
 //
@@ -109,7 +86,7 @@ function check_overdue($row)
 		return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
 	else
 		return ($row['type'] == 0
-			&& date1_greater_date2(Today(), sql2date($row['ord_date']))
+			&& date1_greater_date2(Today(), sql2date($row['delivery_date']))
 			&& ($row['TotDelivered'] < $row['TotQuantity']));
 }
 
@@ -128,13 +105,11 @@ function prt_link($row)
 function edit_link($row) 
 {
 	global $page_nested;
-	
-	if ($page_nested)
+
+	if (is_prepaid_order_open($row['order_no']))
 		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)
@@ -177,7 +152,8 @@ function order_link($row)
 function tmpl_checkbox($row)
 {
 	global $trans_type, $page_nested;
-	if ($trans_type == ST_SALESQUOTE)
+
+	if ($trans_type == ST_SALESQUOTE || !check_sales_order_type($row['order_no']))
 		return '';
 
 	if ($page_nested)
@@ -201,27 +177,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'));
@@ -233,8 +199,8 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
 	$disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
 
   	if ($show_dates) {
-			$Ajax->addDisable(true, 'OrdersAfterDate', $disable);
-			$Ajax->addDisable(true, 'OrdersToDate', $disable);
+		$Ajax->addDisable(true, 'OrdersAfterDate', $disable);
+		$Ajax->addDisable(true, 'OrdersToDate', $disable);
 	}
 
 	$Ajax->activate('orders_tbl');
@@ -248,10 +214,10 @@ ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
 ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
 if ($show_dates)
 {
-  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days());
   	date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
-locations_list_cells(_("Location:"), 'StockLocation', null, true);
+locations_list_cells(_("Location:"), 'StockLocation', null, true, true);
 
 if($show_dates) {
 	end_row();
@@ -260,9 +226,10 @@ if($show_dates) {
 	start_table(TABLESTYLE_NOBORDER);
 	start_row();
 }
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-if (!@$_GET['popup'])
-	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
+
+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');
 
@@ -276,17 +243,18 @@ 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(
-		_("Order #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
+		_("Order #") => array('fun'=>'view_link', 'align'=>'right'),
+		_("Ref") => array('type' => 'sorder.reference', 'ord' => '') ,
+		_("Customer") => array('type' => 'debtor.name' , 'ord' => '') ,
 		_("Branch"), 
 		_("Cust Order Ref"),
-		_("Order Date") => 'date',
+		_("Order Date") => array('type' =>  'date', 'ord' => ''),
 		_("Required By") =>array('type'=>'date', 'ord'=>''),
 		_("Delivery To"), 
 		_("Order Total") => array('type'=>'amount', 'ord'=>''),
@@ -295,7 +263,7 @@ if ($trans_type == ST_SALESORDER)
 	);
 else
 	$cols = array(
-		_("Quote #") => array('fun'=>'view_link'),
+		_("Quote #") => array('fun'=>'view_link', 'align'=>'right'),
 		_("Ref"),
 		_("Customer"),
 		_("Branch"), 
@@ -308,17 +276,16 @@ else
 		_("Currency") => array('align'=>'center')
 	);
 if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-	//array_substitute($cols, 3, 1, _("Cust Order Ref"));
 	array_append($cols, array(
 		array('insert'=>true, 'fun'=>'dispatch_link'),
 		array('insert'=>true, 'fun'=>'edit_link')));
 
 } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
-	array_substitute($cols, 3, 1, _("Description"));
+	array_substitute($cols, 4, 1, _("Description"));
 	array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link')));
 
 } else if ($_POST['order_view_mode'] == 'DeliveryTemplates') {
-	array_substitute($cols, 3, 1, _("Description"));
+	array_substitute($cols, 4, 1, _("Description"));
 	array_append($cols, array(
 			array('insert'=>true, 'fun'=>'delivery_link'))
 	);
@@ -350,4 +317,3 @@ submit_center('Update', _("Update"), true, '', null);
 
 end_form();
 end_page();
-?>
\ No newline at end of file