Rerun of Manufactored Items, Dashboard. Produced Items.

[fa-stable.git] / inventory / manage / items.php

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 5ac1f7506bf1c2e8ed6dea79fe3198ec41abe037..8ed29d2cb0bdaf7f484d86a3c7d8618f3c4fde71 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -391,7 +391,8 @@ function item_settings(&$stock_id, $new_item)
        $fresh_item = !isset($_POST['NewStockID']) || $new_item 
                || check_usage($_POST['stock_id'],false);
 
-       item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null);
+       // show inactive item tax type in selector only if already set.
+  item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null, !$new_item && item_type_inactive(get_post('tax_type_id')));
 
        if (!get_post('fixed_asset'))
                stock_item_types_list_row(_("Item Type:"), 'mb_flag', null, $fresh_item);
@@ -530,6 +531,7 @@ function item_settings(&$stock_id, $new_item)
        end_outer_table(1);
 
        div_start('controls');
+       if (@$_REQUEST['popup']) hidden('popup', 1);
        if (!isset($_POST['NewStockID']) || $new_item) 
        {
                submit_center('addupdate', _("Insert New Item"), true, '', 'default');
@@ -539,7 +541,7 @@ function item_settings(&$stock_id, $new_item)
                submit_center_first('addupdate', _("Update Item"), '', 
                        $page_nested ? true : 'default');
                submit_return('select', get_post('stock_id'), 
-                       _("Select this items and return to document entry."), 'default');
+                       _("Select this items and return to document entry."));
                submit('clone', _("Clone This Item"), true, '', true);
                submit('delete', _("Delete This Item"), true, '', true);
                submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
@@ -591,8 +593,7 @@ $tabs = (get_post('fixed_asset'))
                'reorder_level' => array(_('&Reorder Levels'), (is_inventory_item($stock_id) && 
                        user_check_access('SA_REORDER') ? $stock_id : null)),
                'movement' => array(_('&Transactions'), (user_check_access('SA_ITEMSTRANSVIEW') ? $stock_id : null)),
-               'status' => array(_('&Status'), $stock_id),
-               //'status' => array(_('&Status'), (user_check_access('SA_ITEMSSTATVIEW') ? $stock_id : null)),
+               'status' => array(_('&Status'), (user_check_access('SA_ITEMSSTATVIEW') ? $stock_id : null)),
        );
 
 tabbed_content_start('tabs', $tabs);