From 69851193cf74ade16aec9b1dbdd9ef843c560058 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 29 Jan 2013 08:43:35 +0100 Subject: [PATCH] Fixed a bug so calling the popup items (f4) works when making PO, Direct GRN, Direct Supp Invoice --- inventory/manage/items.php | 2 +- purchasing/includes/ui/po_ui.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 7e5bb7ae..f4d3b988 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -18,7 +18,7 @@ if ($use_popup_windows) if ($use_date_picker) $js .= get_js_date_picker(); -page(_($help_context = "Items"), false, false, "", $js); +page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 1a5e098b..ec2c600f 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -398,7 +398,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1) // hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); //Chaitanya : Manufcatured item can be purchased - stock_items_list_cells(null, 'stock_id', null, false, true, false); + stock_items_list_cells(null, 'stock_id', null, false, true, false, true); //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); -- 2.30.2