Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3-fixes

Browse Source
This commit is contained in:
Achilles Rasquinha 2018-02-14 16:13:37 +05:30
parent 908af53fcd
commit b723033213
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/payroll_entry/test_payroll_entry.py
View File

@ -167,9 +167,9 @@ def make_holiday(holiday_list_name):
current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True) current_fiscal_year = get_fiscal_year(nowdate(), as_dict=True)
dt = getdate(nowdate()) dt = getdate(nowdate())
new_year = dt + relativedelta(month=01, day=01, year=dt.year) new_year = dt + relativedelta(month=1, day=1, year=dt.year)
republic_day = dt + relativedelta(month=01, day=26, year=dt.year) republic_day = dt + relativedelta(month=1, day=26, year=dt.year)
test_holiday = dt + relativedelta(month=02, day=02, year=dt.year) test_holiday = dt + relativedelta(month=2, day=2, year=dt.year)
frappe.get_doc({ frappe.get_doc({
'doctype': 'Holiday List', 'doctype': 'Holiday List',

2
erpnext/patches/v4_0/validate_v3_patch.py
View File

@ -8,4 +8,4 @@ def execute():
from frappe.modules.patch_handler import executed from frappe.modules.patch_handler import executed
last_v3_patch = 'patches.1401.fix_pos_outstanding' last_v3_patch = 'patches.1401.fix_pos_outstanding'
if not executed(last_v3_patch): if not executed(last_v3_patch):
raise Exception, "site not ready to migrate to version 4" raise Exception("site not ready to migrate to version 4")