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

This commit is contained in:
Anand Doshi
2013-04-12 15:41:31 +05:30
8 changed files with 37 additions and 22 deletions

View File

@@ -239,8 +239,8 @@ class DocType(DocListController):
vals = webnotes.conn.get_value("Item", self.doc.name,
["has_serial_no", "is_stock_item", "valuation_method"], as_dict=True)
if vals and (vals.has_serial_no != self.doc.has_serial_no or
vals.is_stock_item != self.doc.is_stock_item or
if vals and ((self.doc.is_stock_item == "No" and vals.is_stock_item == "Yes") or
vals.has_serial_no != self.doc.has_serial_no or
vals.valuation_method != self.doc.valuation_method):
if self.check_if_sle_exists():
webnotes.msgprint(_("As there are existing stock transactions for this \