X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fsales_kits.php;h=f7199e8c0a6483a69cd2a08d5159ad30f51de816;hb=85cdc977a80b32727c13aae517f58437e908a033;hp=8fdf6bea294655f49bc14c7b054fdb53ed1c86a4;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php index 8fdf6bea..f7199e8c 100644 --- a/inventory/manage/sales_kits.php +++ b/inventory/manage/sales_kits.php @@ -13,7 +13,11 @@ $page_security = 'SA_SALESKIT'; $path_to_root = "../.."; include_once($path_to_root . "/includes/session.inc"); -page(_($help_context = "Sales Kits & Alias Codes")); +$js = ""; +if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search) + $js .= get_js_open_window(900, 500); + +page(_($help_context = "Sales Kits & Alias Codes"), false, false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); @@ -22,13 +26,7 @@ include_once($path_to_root . "/includes/data_checks.inc"); check_db_has_stock_items(_("There are no items defined in the system.")); simple_page_mode(true); -/* -if (isset($_GET['item_code'])) -{ - $_POST['item_code'] = $_GET['item_code']; - $selected_kit = $_GET['item_code']; -} -*/ + //-------------------------------------------------------------------------------------------------- function display_kit_items($selected_kit) { @@ -56,7 +54,7 @@ function display_kit_items($selected_kit) } //END WHILE LIST LOOP end_table(); -div_end(); + div_end(); } //-------------------------------------------------------------------------------------------------- @@ -69,13 +67,13 @@ function update_kit($selected_kit, $component_id) { display_error(_("The quantity entered must be numeric and greater than zero.")); set_focus('quantity'); - return; + return 0; } elseif (get_post('description') == '') { display_error( _("Item code description cannot be empty.")); set_focus('description'); - return; + return 0; } elseif ($component_id == -1) // adding new component to alias/kit with optional kit creation { @@ -83,14 +81,14 @@ function update_kit($selected_kit, $component_id) if (get_post('kit_code') == '') { display_error( _("Kit/alias code cannot be empty.")); set_focus('kit_code'); - return; + return 0; } $kit = get_item_kit(get_post('kit_code')); if (db_num_rows($kit)) { $input_error = 1; display_error( _("This item code is already assigned to stock item or sale kit.")); set_focus('kit_code'); - return; + return 0; } } } @@ -98,14 +96,14 @@ function update_kit($selected_kit, $component_id) if (check_item_in_kit($component_id, $selected_kit, get_post('component'), true)) { display_error(_("The selected component contains directly or on any lower level the kit under edition. Recursive kits are not allowed.")); set_focus('component'); - return; + return 0; } /*Now check to see that the component is not already in the kit */ if (check_item_in_kit($component_id, $selected_kit, get_post('component'))) { display_error(_("The selected component is already in this kit. You can modify it's quantity but it cannot appear more than once in the same kit.")); set_focus('component'); - return; + return 0; } if ($component_id == -1) { // new component in alias/kit if ($selected_kit == '') { @@ -224,8 +222,6 @@ if (get_post('item_code') == '') { sales_local_items_list_row(_("Component:"),'component', null, false, true); -// if (get_post('description') == '') -// $_POST['description'] = get_kit_name($_POST['component']); if (get_post('item_code') == '') { // new kit/alias if ($Mode!='ADD_ITEM' && $Mode!='UPDATE_ITEM') { $_POST['description'] = $props['description'];