From b1167086b19280eb898396e3af6470975ff74571 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 16 Nov 2008 19:40:08 +0000 Subject: [PATCH] Code cleanup. --- dimensions/inquiry/search_dimensions.php | 7 ------- manufacturing/inquiry/where_used_inquiry.php | 6 ------ manufacturing/search_work_orders.php | 9 ++------ purchasing/inquiry/po_search.php | 13 ++++-------- purchasing/inquiry/po_search_completed.php | 14 +++++-------- .../inquiry/supplier_allocation_inquiry.php | 13 ++++-------- purchasing/inquiry/supplier_inquiry.php | 16 +++++++------- sales/inquiry/customer_allocation_inquiry.php | 14 +++---------- sales/inquiry/customer_inquiry.php | 21 ++++++++----------- sales/inquiry/sales_deliveries_view.php | 18 +++------------- sales/inquiry/sales_orders_view.php | 14 ++++--------- 11 files changed, 41 insertions(+), 104 deletions(-) diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index 9d8f64a0..54749330 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -176,13 +176,6 @@ if ($outstanding_only) { $table =& new_db_pager('dim_tbl', $sql, $cols); $table->set_marker('is_overdue', _("Marked dimensions are overdue.")); - -if (get_post('SearchOrders')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('dim_tbl'); -} start_form(); display_db_pager($table); diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php index 0de4de7e..2c3f876a 100644 --- a/manufacturing/inquiry/where_used_inquiry.php +++ b/manufacturing/inquiry/where_used_inquiry.php @@ -52,12 +52,6 @@ $sql = "SELECT $table =& new_db_pager('usage_table', $sql, $cols); -if (list_updated('stock_id')) { - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('usage_table'); -} - display_db_pager($table); end_form(); diff --git a/manufacturing/search_work_orders.php b/manufacturing/search_work_orders.php index 8c5ce816..70f29788 100644 --- a/manufacturing/search_work_orders.php +++ b/manufacturing/search_work_orders.php @@ -201,15 +201,10 @@ $cols = array( $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked orders are overdue.")); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('orders_tbl'); -} - start_form(); + display_db_pager($table); + end_form(); end_page(); - ?> diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php index 41a7c4c4..3427e101 100644 --- a/purchasing/inquiry/po_search.php +++ b/purchasing/inquiry/po_search.php @@ -182,15 +182,10 @@ if (get_post('StockLocation') != $all_items) { $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked orders have overdue items.")); +start_form(); -if (get_post('SearchOrders')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('orders_tbl'); -} - start_form(); - display_db_pager($table); - end_form(); +display_db_pager($table); + +end_form(); end_page(); ?> diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 3100db29..0fddf251 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -155,14 +155,10 @@ if (get_post('StockLocation') != $all_items) { $table =& new_db_pager('orders_tbl', $sql, $cols); -if (get_post('SearchOrders')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('orders_tbl'); -} - start_form(); - display_db_pager($table); - end_form(); +start_form(); + +display_db_pager($table); + +end_form(); end_page(); ?> diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 3b3de544..b9f7a841 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -185,15 +185,10 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) { $table =& new_db_pager('doc_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if(get_post('RefreshInquiry')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('doc_tbl'); -} +start_form(); - start_form(); - display_db_pager($table); - end_form(); +display_db_pager($table); + +end_form(); end_page(); ?> diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 3f41b03e..d65e3b81 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -89,6 +89,11 @@ if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != reserved_words::g } div_end(); +if(get_post('RefreshInquiry')) +{ + $Ajax->activate('totals_tbl'); +} + //------------------------------------------------------------------------------------------------ function systype_name($dummy, $type) { @@ -210,18 +215,11 @@ if ($_POST['supplier_id'] != reserved_words::get_all()) $table =& new_db_pager('trans_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if(get_post('RefreshInquiry')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('trans_tbl'); - $Ajax->activate('totals_tbl'); -} - start_form(); + display_db_pager($table); -end_form(); +end_form(); end_page(); ?> diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index c6324d98..41067832 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -214,18 +214,10 @@ if ($_POST['customer_id'] != reserved_words::get_all()) { $table =& new_db_pager('doc_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); +start_form(); -if(get_post('RefreshInquiry')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('doc_tbl'); -} +display_db_pager($table); - start_form(); - display_db_pager($table); - end_form(); +end_form(); end_page(); - - ?> diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 59b0c1ab..87ea76ec 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -95,8 +95,12 @@ if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_ } div_end(); - +if(get_post('RefreshInquiry')) +{ + $Ajax->activate('totals_tbl'); +} //------------------------------------------------------------------------------------------------ + function systype_name($dummy, $type) { return systypes::name($type); @@ -277,18 +281,11 @@ $table =& new_db_pager('trans_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if(get_post('RefreshInquiry')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('trans_tbl'); - $Ajax->activate('totals_tbl'); -} +start_form(); - start_form(); - display_db_pager($table); - end_form(); -end_page(); +display_db_pager($table); +end_form(); +end_page(); ?> diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php index 60a80bb9..794378b5 100644 --- a/sales/inquiry/sales_deliveries_view.php +++ b/sales/inquiry/sales_deliveries_view.php @@ -243,26 +243,14 @@ if (isset($_SESSION['Batch'])) unset($_SESSION['Batch']); } -/* -dla ka¿dego rz±dku - $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"], - 'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] ); -*/ - $table =& new_db_pager('deliveries_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); +start_form(); -if(get_post('SearchOrders')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('doc_tbl'); -} +display_db_pager($table); - start_form(); - display_db_pager($table); - end_form(); +end_form(); end_page(); ?> diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index c68d63d7..5dde39a8 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -289,17 +289,11 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') { $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); +start_form(); -if (get_post('SearchOrders')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('orders_tbl'); -} - start_form(); - display_db_pager($table); +display_db_pager($table); +submit_center('Update', _("Update"), true, '', null); - submit_center('Update', _("Update"), true, '', null); - end_form(); +end_form(); end_page(); ?> \ No newline at end of file -- 2.30.2