[minor] fixed conflict while merging perpetual branch into master

This commit is contained in:
Nabin Hait
2013-09-24 14:36:55 +05:30
107 changed files with 2671 additions and 2122 deletions

View File

@@ -68,9 +68,9 @@ class DocType(TransactionBase):
ac_bean.ignore_permissions = True
ac_bean.insert()
msgprint("Account Head: %s created" % ac_bean.doc.name)
msgprint(_("Account Head") + ": " + ac_bean.doc.name + _(" created"))
else :
msgprint("Please Select Company under which you want to create account head")
msgprint(_("Please Select Company under which you want to create account head"))
def update_credit_days_limit(self):
webnotes.conn.sql("""update tabAccount set credit_days = %s, credit_limit = %s