Partial (inventory related) include files cleanup.

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

diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 750d059e6c5fd4c7b6ba905e03633893c44e35ef..ab4831f0914dba831479355b4c4a5375cefc638c 100644 (file)
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -9,18 +9,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 11;
-$path_to_root="../..";
+$page_security = 'SA_SALESKIT';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Sales Kits & Alias Codes"));
+page(_($help_context = "Sales Kits & Alias Codes"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
-include_once($path_to_root . "/includes/manufacturing.inc");
-
 check_db_has_stock_items(_("There are no items defined in the system."));
 
 simple_page_mode(true);
@@ -34,11 +32,9 @@ if (isset($_GET['item_code']))
 //--------------------------------------------------------------------------------------------------
 function display_kit_items($selected_kit)
 {
-       global $table_style;
-
        $result = get_item_kit($selected_kit);
-div_start('bom');
-       start_table("$table_style width=60%");
+       div_start('bom');
+       start_table(TABLESTYLE, "width='60%'");
        $th = array(_("Stock Item"), _("Description"), _("Quantity"), _("Units"),
                '','');
        table_header($th);
@@ -75,7 +71,7 @@ function update_component($kit_code, $selected_item)
                set_focus('quantity');
                return;
        }
-       elseif ($_POST['description'] == '')
+       elseif (get_post('description') == '')
        {
        display_error( _("Item code description cannot be empty."));
                set_focus('description');
@@ -84,14 +80,14 @@ function update_component($kit_code, $selected_item)
        elseif ($selected_item == -1)   // adding new item or new alias/kit
        {
                if (get_post('item_code') == '') { // New kit/alias definition
-                       $kit = get_item_kit($_POST['kit_code']);
+                       $kit = get_item_kit($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;
                        }
-                       if (get_post('kit_code') == '') {
+                       if ($kit_code == '') {
                        display_error( _("Kit/alias code cannot be empty."));
                                set_focus('kit_code');
                                return;
@@ -99,21 +95,20 @@ function update_component($kit_code, $selected_item)
                }
        }
 
-       if (check_item_in_kit($selected_item, $kit_code, $_POST['component'], true)) {
+       if (check_item_in_kit($selected_item, $kit_code, 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;
        }
 
                /*Now check to see that the component is not already in the kit */
-       if (check_item_in_kit($selected_item, $kit_code, $_POST['component'])) {
+       if (check_item_in_kit($selected_item, $kit_code, 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;
        }
        if ($selected_item == -1) { // new item alias/kit
-               if ($_POST['item_code']=='') {
-                       $kit_code = $_POST['kit_code'];
+               if (get_post('item_code') == '') {
                        $selected_kit = $_POST['item_code'] = $kit_code;
                        $msg = _("New alias code has been created.");
                } 
@@ -125,7 +120,7 @@ function update_component($kit_code, $selected_item)
                display_notification($msg);
 
        } else {
-               $props = get_kit_props($_POST['item_code']);
+               $props = get_kit_props(get_post('item_code'));
                update_item_code($selected_item, $kit_code, get_post('component'),
                        $props['description'], $props['category_id'], input_num('quantity'), 0);
                display_notification(_("Component of selected kit has been updated."));
@@ -183,7 +178,7 @@ if ($Mode == 'RESET')
 start_form();
 
 echo "<center>" . _("Select a sale kit:") . "&nbsp;";
-sales_kits_list('item_code', null, _('New kit'), true);
+echo sales_kits_list('item_code', null, _('New kit'), true);
 echo "</center><br>";
 $props = get_kit_props($_POST['item_code']);
 
@@ -197,13 +192,14 @@ $selected_kit = $_POST['item_code'];
 //----------------------------------------------------------------------------------
 if (get_post('item_code') == '') {
 // New sales kit entry
-       start_table($table_style2);
+       start_table(TABLESTYLE2);
        text_row(_("Alias/kit code:"), 'kit_code', null, 20, 21);
 } else
-{ // Kit selected so display bom or edit component
+{
+        // Kit selected so display bom or edit component
        $_POST['description'] = $props['description'];
        $_POST['category'] = $props['category_id'];
-       start_table($table_style2);
+       start_table(TABLESTYLE2);
        text_row(_("Description:"), 'description', null, 50, 200);
        stock_categories_list_row(_("Category:"), 'category', null);
        submit_row('update_name', _("Update"), false, 'align=center colspan=2', _('Update kit/alias name'), true);
@@ -211,7 +207,7 @@ if (get_post('item_code') == '') {
        end_table(1);
        display_kit_items($selected_kit);
        echo '<br>';
-       start_table($table_style2);
+       start_table(TABLESTYLE2);
 }
 
        if ($Mode == 'Edit') {
@@ -226,8 +222,10 @@ if (get_post('item_code') == '') {
 //     if (get_post('description') == '')
 //             $_POST['description'] = get_kit_name($_POST['component']);
        if (get_post('item_code') == '') { // new kit/alias
-               $_POST['description'] = $props['description'];
-               $_POST['category'] = $props['category_id'];
+               if ($Mode!='ADD_ITEM' && $Mode!='UPDATE_ITEM') {
+                       $_POST['description'] = $props['description'];
+                       $_POST['category'] = $props['category_id'];
+               }
                text_row(_("Description:"), 'description', null, 50, 200);
                stock_categories_list_row(_("Category:"), 'category', null);
        }
@@ -250,4 +248,3 @@ if (get_post('item_code') == '') {
 
 end_page();
 
-?>