[fix] [conflict]

This commit is contained in:
Nabin Hait
2013-10-18 12:55:59 +05:30
6 changed files with 382 additions and 10 deletions

View File

@@ -358,4 +358,4 @@ def check_active_sales_items(obj):
webnotes.throw(_("Item is neither Sales nor Service Item") + ": " + d.item_code)
if d.income_account and not item.default_income_account:
webnotes.conn.set_value("Item", d.item_code, "default_income_account",
d.income_account)
d.income_account)