Links from Items to Inventory Item Movement and Inventory Item Status.

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 775a2bf67f1740bd4596924d4bb5a8f28c4bb0a1..aaee30cdf57dc9361368365a7934ae917ed0761b 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -24,7 +24,7 @@ if ($use_popup_windows)
 if ($use_date_picker)
        $js .= get_js_date_picker();
 
-page(_($help_context = "Inventory Item Movement"), false, false, "", $js);
+page(_($help_context = "Inventory Item Movement"), @$_REQUEST['popup'], false, "", $js);
 //------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -185,6 +185,6 @@ end_row();
 
 end_table(1);
 div_end();
-end_page();
+end_page(@$_REQUEST['popup'], false, false);
 
 ?>

diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php
index 459d75cd48d23592c00307ec35da885af54e056e..0e5f82a7db58b1d41eb1929a2879c398a6eb1c26 100644 (file)
--- a/inventory/inquiry/stock_status.php
+++ b/inventory/inquiry/stock_status.php
@@ -116,6 +116,6 @@ while ($myrow = db_fetch($loc_details))
 end_table();
 div_end();
 end_form();
-end_page();
+end_page(@$_REQUEST['popup'], false, false);
 
 ?>

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 8d65397e5fbe609921a1a3b638acc74cdc752a90..c07c198b063bc2b508b1a0ec5e8368911111f55b 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -12,8 +12,11 @@
 $page_security = 'SA_ITEM';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
-
-page(_($help_context = "Items"), @$_REQUEST['popup']);
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+       
+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");
@@ -348,6 +351,23 @@ check_row(_("Editable description:"), 'editable');
 
 check_row(_("Exclude from sales:"), 'no_sale');
 
+if (!$new_item)
+{
+       if (!@$_REQUEST['popup'])
+       {
+               start_row();
+               echo '<td class="label"> </td><td>';
+               echo viewer_link('<b>'. _('Inventory Item Movement').'</b>', "inventory/inquiry/stock_movements.php?stock_id=$stock_id&popup=1"); 
+               echo "</td>\n"; 
+               end_row();
+               start_row();
+               echo '<td class="label"> </td><td>';
+               echo viewer_link('<b>'. _('Inventory Item Status').'</b>', "inventory/inquiry/stock_status.php?stock_id=$stock_id&popup=1"); 
+               echo "</td>\n"; 
+               end_row();
+       }       
+}
+
 table_section(2);
 
 $dim = get_company_pref('use_dimension');