From 6575a94814ea66506cc2637908c3419995302a3e Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 8 Dec 2008 21:21:38 +0000
Subject: [PATCH 1/1] Additional fixes to foreign/kit code editors

---
 CHANGELOG.txt                   | 3 +++
 inventory/manage/item_codes.php | 2 +-
 inventory/manage/sales_kits.php | 8 ++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3e6e910d..a3a656ab 100644
--- 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 2e4b7272..3c2bee1a 100644
--- 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 245656ce..2e73d219 100644
--- 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);
-- 
2.30.2