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

This commit is contained in:
Nabin Hait
2012-12-17 10:50:13 +05:30
7 changed files with 50 additions and 9 deletions

View File

@@ -719,7 +719,7 @@ def get_next_date(dt, mcount, day=None):
if not day:
day = getdate(dt).day
if month > 12:
month, year = m-12, y+1
month, year = month-12, year+1
try:
next_month_date = datetime.date(year, month, day)
except:
@@ -911,4 +911,4 @@ def get_bank_cash_account(mode_of_payment):
webnotes.msgprint("Default Bank / Cash Account not set in Mode of Payment: %s. Please add a Default Account in Mode of Payment master." % mode_of_payment)
return {
"cash_bank_account": val
}
}