nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 02:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] [tests] fix, tests will fail on the 5th of a month!

Browse Source
This commit is contained in:
Rushabh Mehta
2017-01-06 17:20:44 +05:30
parent 7b4bdffea2
commit 8b133ac087
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/salary_slip/test_salary_slip.py
View File

@@ -76,7 +76,7 @@ class TestSalarySlip(unittest.TestCase):
if getdate(nowdate()).day >= 15: if getdate(nowdate()).day >= 15:
date_of_joining = getdate(add_days(nowdate(),-10)) date_of_joining = getdate(add_days(nowdate(),-10))
relieving_date = getdate(add_days(nowdate(),-10)) relieving_date = getdate(add_days(nowdate(),-10))
elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5: elif getdate(nowdate()).day < 15 and getdate(nowdate()).day >= 5:
date_of_joining = getdate(add_days(nowdate(),-3)) date_of_joining = getdate(add_days(nowdate(),-3))
relieving_date = getdate(add_days(nowdate(),-3)) relieving_date = getdate(add_days(nowdate(),-3))
elif getdate(nowdate()).day < 5 and not getdate(nowdate()).day == 1: elif getdate(nowdate()).day < 5 and not getdate(nowdate()).day == 1:

2
erpnext/stock/doctype/warehouse/warehouse.py
View File

@@ -74,7 +74,7 @@ class Warehouse(NestedSet):
ac_doc.flags.ignore_mandatory = True ac_doc.flags.ignore_mandatory = True
try: try:
ac_doc.insert() ac_doc.insert()
msgprint(_("Account head {0} created").format(ac_doc.name)) msgprint(_("Account head {0} created").format(ac_doc.name), indicator='green', alert=True)
except frappe.DuplicateEntryError, e: except frappe.DuplicateEntryError, e:
if not (e.args and e.args[0]=='Account'): if not (e.args and e.args[0]=='Account'):