commit 7da387100d3c481e2306afd313a95a1e29a405cc
author Nabin Hait <nabinhait@gmail.com> Thu Apr 04 15:31:49 2013 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Apr 04 15:31:49 2013 +0530
tree d41edfe409afdc1d401ea4e3751d22325db3f58b
parent a8d8abc670ef0c367f7f3fc38c8c56bf4676cbff
parent e60f4560d16856d184304eb4f1aa11129cb989cc

Merge branch 'master' of github.com:webnotes/erpnext

stock/doctype/item/item.py

diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index 43bae2c..2a2fa58 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -40,7 +40,7 @@
 		self.update_website()
 			
 		bin = sql("select stock_uom from `tabBin` where item_code = '%s' " % self.doc.item_code)
-		if bin and cstr(bin[0][0]) != cstr(self.doc.stock_uom):
+		if bin and cstr(bin[0][0]) and cstr(bin[0][0]) != cstr(self.doc.stock_uom):
 			msgprint("Please Update Stock UOM with the help of Stock UOM Replace Utility.")
 			raise Exception
 		check_list = []