Additional fixes to foreign/kit code editors

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3e6e910d9543365f5443443216fe72505c742313..a3a656abf9bbc527ee08057dfccecb1ed3c3d9b2 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -43,6 +43,9 @@ $ /js/inserts.js
 $ /includes/ui/ui_lists.inc
 # Fixed broken syntax in delete_item_code()
 $ /inventory/includes/db/items_codes_db.inc
+# Additional fixes to foreign/kit codes
+$ /inventory/manage/item_codes.php
+  /inventory/manage/sales_kits.php
 ! Merged changes from main trunk up to version 2.0.6 (see below)
 $ /config.php
   /update.html

diff --git a/inventory/manage/item_codes.php b/inventory/manage/item_codes.php
index 2e4b7272d1d2562f56ffb19980b8d6468cc00288..3c2bee1a51addfc5442bef3e1b14a14860048591 100644 (file)
--- a/inventory/manage/item_codes.php
+++ b/inventory/manage/item_codes.php
@@ -72,7 +72,7 @@ if ($Mode == 'Delete')
 {
        delete_item_code($selected_id);
        
-       display_notification(_("The purchasing data item has been sucessfully deleted."));
+       display_notification(_("Item code has been sucessfully deleted."));
        $Mode = 'RESET';
 }
 

diff --git a/inventory/manage/sales_kits.php b/inventory/manage/sales_kits.php
index 245656ce938f61400d2d8e7cff37e96c76b19c4f..2e73d219cdf9b4691f5de8093541b6f9ea1af2d3 100644 (file)
--- a/inventory/manage/sales_kits.php
+++ b/inventory/manage/sales_kits.php
@@ -143,7 +143,10 @@ if ($Mode == 'Delete')
        // 
        $other_kits = get_where_used($_POST['item_code']);
        $num_kits = db_num_rows($other_kits);
-       if ($num_kits) {
+
+       $kit = get_item_kit($_POST['item_code']);
+       if ((db_num_rows($kit) == 1) && $num_kits) {
+
                $msg = _("This item cannot be deleted because it is the last item in the kit used by following kits")
                        .':<br>';
 
@@ -229,7 +232,8 @@ if (get_post('item_code') == '') {
                $Ajax->activate('quantity');
                $Ajax->activate('category');
        }
-       qty_row(_("Quantity:"), 'quantity', null, '', $units, $dec);
+       
+       qty_row(_("Quantity:"), 'quantity', number_format2(1, $dec), '', $units, $dec);
 
        end_table(1);
        submit_add_or_update_center($selected_id == -1, '', true);