From e0e34d81bfad1529246aa9ce1d03182160875c2f Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 26 Mar 2011 15:30:40 +0100 Subject: [PATCH] Added customer filter in sales order inquiries. --- sales/includes/db/sales_order_db.inc | 6 +++++- sales/inquiry/sales_orders_view.php | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 34da078b..f8afbc76 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -489,7 +489,7 @@ function get_branch_to_order($customer_id, $branch_id) { } function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter, - $stock_item=null, $from='', $to='', $ref='', $location='') + $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT) { $sql = "SELECT @@ -561,6 +561,10 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n elseif ($filter=='InvoiceTemplates' || $filter=='DeliveryTemplates') $sql .= " AND sorder.type=1"; + + //Chaiatanya : New Filter + if ($customer_id != ALL_TEXT) + $sql .= " AND sorder.debtor_no = ".db_escape($customer_id); $sql .= " GROUP BY sorder.order_no, sorder.debtor_no, diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index 5f23e891..2fa4fd1a 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -231,7 +231,7 @@ if($show_dates) { start_row(); } stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); - +customer_list_cells(_("Select a customer: "), 'customer_id', null, true); if ($trans_type == ST_SALESQUOTE) check_cells(_("Show All:"), 'show_all'); @@ -246,7 +246,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']); + @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']); if ($trans_type == ST_SALESORDER) $cols = array( -- 2.30.2