Fixed a bug so calling the popup items (f4) works when making PO, Direct GRN, Direct...

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 7e5bb7aeea6b2dd8c5de058f34b9d5afefca7350..f4d3b988e4623e86114ad837783ebe77c6341799 100644 (file)
--- 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 1a5e098bb1a688b15f28a4fd31e1619754f49a89..ec2c600fd5514bff07584c643cd017bef1fd6f86 100644 (file)
--- 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');