Merged changes from stable branch up to 2.3.23.

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

diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 005af381f9d9418587d62e0bf08dffb72d4a9c27..6b837a6cc8ee1f0ba3d542a8e42bfdb72a0ff8fc 100644 (file)
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -34,11 +34,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);
@@ -65,9 +63,9 @@ div_end();
 
 //--------------------------------------------------------------------------------------------------
 
-function update_component($kit_code, $selected_item)
+function update_component($kit_code, $selected_item, $selected_kit)
 {
-       global $Mode, $Ajax, $selected_kit;
+       global $Mode, $Ajax;
        
        if (!check_num('quantity', 0))
        {
@@ -143,7 +141,7 @@ if (get_post('update_name')) {
 }
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
-       update_component($_POST['item_code'], $selected_id);
+       update_component($_POST['item_code'], $selected_id, $selected_kit);
 
 if ($Mode == 'Delete')
 {
@@ -197,13 +195,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 +210,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 +225,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 +251,3 @@ if (get_post('item_code') == '') {
 
 end_page();
 
-?>