From 42751ff1e05ac803548a07d412f4a173cd0e0450 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 3 Feb 2018 09:37:51 +0100 Subject: [PATCH] Sales Order Entry: initial item selector position points to last ordered item (seems to be more useful than always selecting first item in selector). --- sales/includes/db/sales_order_db.inc | 14 ++++++++++++++ sales/includes/ui/sales_order_ui.inc | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 584ffcd0..859fde74 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -626,3 +626,17 @@ function is_prepaid_order_open($order_no) return $result[0]; } + +function last_sales_order_detail($order, $field) +{ + $sql = "SELECT $field + FROM ".TB_PREF."sales_order_details d" + ." LEFT JOIN " .TB_PREF."sales_orders o on d.order_no=o.order_no + WHERE debtor_no=" . db_escape($order->customer_id) + . " ORDER BY d.id DESC LIMIT 1"; + + $last_query=db_query($sql, "Retreive last order detail"); + $row = db_fetch_row($last_query); + return $row[0]; +} + diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 4b697c51..febabc4d 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -502,13 +502,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) if ($order->fixed_asset) stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items); else - sales_items_list_cells(null,'stock_id', null, false, true, true); if (list_updated('stock_id')) { + sales_items_list_cells(null,'stock_id', null, false, true, true); $Ajax->activate('price'); $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('line_total'); - } + } else + sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true); $item_info = get_item_edit_info($_POST['stock_id']); $units = $item_info["units"]; -- 2.30.2