X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=f8309de9789b3e6de565f41b340ba6e95adf667d;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=39b26f2a8f8a271ee6c16eef607b7d614cc8fb63;hpb=925172146ca9e7b854c4994e1598cd828de21d8a;p=fa-stable.git

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 39b26f2a..f8309de9 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -24,15 +24,7 @@ set_page_security( @$_POST['order_view_mode'],
 	array(	'OutstandingOnly' => 'SA_SALESDELIVERY',
 			'InvoiceTemplates' => 'SA_SALESINVOICE')
 );
-if (!@$_GET['popup'])
-{
-	$js = "";
-	if ($use_popup_windows)
-		$js .= get_js_open_window(900, 600);
-	if ($use_date_picker)
-		$js .= get_js_date_picker();
-	page($_SESSION['page_title'], false, false, "", $js);
-}
+
 if (get_post('type'))
 	$trans_type = $_POST['type'];
 elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@ -69,6 +61,13 @@ else
 	$_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
 
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 600);
+if ($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'];
@@ -119,8 +118,10 @@ function prt_link($row)
 
 function edit_link($row) 
 {
-	if (@$_GET['popup'])
-		return '';
+	global $page_nested;
+	
+	if ($page_nested)
+		return '';
 	global $trans_type;
 	$modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
@@ -162,11 +163,12 @@ function order_link($row)
 
 function tmpl_checkbox($row)
 {
-	global $trans_type;
+	global $trans_type, $page_nested;
 	if ($trans_type == ST_SALESQUOTE)
 		return '';
-	if (@$_GET['popup'])
-		return '';
+
+	if ($page_nested)
+		return '';
 	$name = "chgtpl" .$row['order_no'];
 	$value = $row['type'] ? 1:0;
 
@@ -215,8 +217,7 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
 	$Ajax->activate('orders_tbl');
 }
 
-if (!@$_GET['popup'])
-	start_form();
+start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
@@ -224,7 +225,7 @@ ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
 ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
 if ($show_dates)
 {
-  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
+  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
   	date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
@@ -237,8 +238,8 @@ if($show_dates) {
 	start_row();
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-if (!@$_GET['popup'])
-	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
+if (!@$_GET['popup'])
+	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
 if ($trans_type == ST_SALESQUOTE)
 	check_cells(_("Show All:"), 'show_all');
 
@@ -253,7 +254,7 @@ 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']);
+	@$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);
 
 if ($trans_type == ST_SALESORDER)
 	$cols = array(
@@ -283,11 +284,11 @@ else
 		'Type' => 'skip',
 		_("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')));
+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"));
@@ -320,9 +321,6 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-if (!@$_GET['popup'])
-{
-	end_form();
-	end_page();
-}
+end_form();
+end_page();
 ?>
\ No newline at end of file