From 029cbb368afc037bc9116b022744ee05ac5086e6 Mon Sep 17 00:00:00 2001 From: Joe Date: Sun, 4 Jan 2015 16:30:30 +0100 Subject: [PATCH] Problems with merge in tabbed dialogs, customer, supplier, and some cleanup. --- purchasing/inquiry/po_search_completed.php | 22 +++++++++++++++++++--- sales/includes/db/sales_order_db.inc | 6 +++--- sales/inquiry/sales_orders_view.php | 11 ++++++----- sales/manage/customers.php | 3 ++- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 8ff321b8..3d3acbe2 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -16,6 +16,7 @@ include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 500); @@ -25,7 +26,7 @@ page(_($help_context = "Search Purchase Orders"), false, false, "", $js); if (isset($_GET['order_number'])) { - $_POST['order_number'] = $_GET['order_number']; + $order_number = $_GET['order_number']; } //----------------------------------------------------------------------------------- @@ -71,13 +72,28 @@ start_row(); stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true); -if (!@$_GET['popup']) +if (!$page_nested) supplier_list_cells(_("Select a supplier: "), 'supplier_id', null, true, true); submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(1); //--------------------------------------------------------------------------------------------- +if (isset($_POST['order_number'])) +{ + $order_number = $_POST['order_number']; +} + +if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && + ($_POST['SelectStockFromList'] != ALL_TEXT)) +{ + $selected_stock_item = $_POST['SelectStockFromList']; +} +else +{ + unset($selected_stock_item); +} +//--------------------------------------------------------------------------------------------- function trans_view($trans) { @@ -103,7 +119,7 @@ function prt_link($row) //--------------------------------------------------------------------------------------------- $sql = get_sql_for_po_search_completed(get_post('OrdersAfterDate'), get_post('OrdersToDate'), - @$_GET['popup'] ? ALL_TEXT : get_post('supplier_id'), + get_post('supplier_id') !== '' ? get_post('supplier_id') : ALL_TEXT, get_post('StockLocation'), get_post('order_number'), get_post('SelectStockFromList')); $cols = array( diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 6ac1e9dd..33447380 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -464,7 +464,7 @@ function get_branch_to_order($customer_id, $branch_id) { OutstandingOnly PrepaidOrders */ -function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter, +function get_sql_for_sales_orders_view($trans_type, $trans_no, $filter, $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT) { @@ -533,8 +533,8 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n if ($trans_type == ST_SALESQUOTE && !check_value('show_all')) $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."' AND line.qty_sent=0"; // show only outstanding, not realized quotes - if ($selected_customer != -1) - $sql .= " AND sorder.debtor_no=".db_escape($selected_customer); + //if ($selected_customer != -1) + // $sql .= " AND sorder.debtor_no=".db_escape($selected_customer); if (isset($stock_item)) $sql .= " AND line.stk_code=".db_escape($stock_item); diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index 7955d6c4..18b95256 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -76,7 +76,7 @@ if ($use_popup_windows) 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']; @@ -87,7 +87,7 @@ elseif (isset($_POST['selected_customer'])) } else $selected_customer = -1; - +*/ //--------------------------------------------------------------------------------------------- if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && @@ -252,7 +252,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'); @@ -267,8 +267,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, $_POST['OrderNumber'], $_POST['order_view_mode'], + @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], + get_post('customer_id') !== '' ? get_post('customer_id') : ALL_TEXT); if ($trans_type == ST_SALESORDER) $cols = array( diff --git a/sales/manage/customers.php b/sales/manage/customers.php index b9f1b67c..84bdfe68 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -342,7 +342,8 @@ else hidden('customer_id'); } -if (!$selected_id || list_updated('customer_id')) +//if (!$selected_id || list_updated('customer_id')) +if (!$selected_id) unset($_POST['_tabs_sel']); // force settings tab for new customer tabbed_content_start('tabs', array( -- 2.30.2