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

Merge pull request #20103 from deepeshgarg007/travis-fix-v12

Browse Source 
fix: Travis(v12)
This commit is contained in:
rohitwaghchaure
2019-12-26 22:51:13 +05:30
committed by GitHub
parent 6fefdb5b18 5869757860
commit a169292f6e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@@ -235,8 +235,8 @@ class TestLeaveApplication(unittest.TestCase):
frappe.get_doc(dict(
doctype = 'Holiday List',
holiday_list_name = holiday_list,
from_date = date(date.today().year, 1, 1),
to_date = date(date.today().year, 12, 31),
from_date = add_months(today, -6),
to_date = add_months(today, 6),
holidays = [
dict(holiday_date = today, description = 'Test')
]
@@ -597,8 +597,8 @@ def get_leave_period():
return frappe.get_doc(dict(
name = 'Test Leave Period',
doctype = 'Leave Period',
from_date = "{0}-12-01".format(now_datetime().year - 1),
to_date = "{0}-12-31".format(now_datetime().year),
from_date = add_months(nowdate(), -6),
to_date = add_months(nowdate(), 6),
company = "_Test Company",
is_active = 1
)).insert()