nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2020-10-14 09:59:55 +05:30
parent 3e0f488083 bd4896b1b2
commit f145a4ce58
75 changed files with 1342 additions and 1448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/holiday_list/holiday_list.py
View File

@@ -1,3 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
@@ -31,7 +32,7 @@ class HolidayList(Document):
def validate_days(self):
if self.from_date > self.to_date:
if getdate(self.from_date) > getdate(self.to_date):
throw(_("To Date cannot be before From Date"))
for day in self.get("holidays"):

3
erpnext/hr/doctype/leave_application/leave_application.json
View File

@@ -244,9 +244,10 @@
],
"icon": "fa fa-calendar",
"idx": 1,
"index_web_pages_for_search": 1,
"is_submittable": 1,
"max_attachments": 3,
"modified": "2020-09-23 18:53:11.608446",
"modified": "2020-09-23 19:11:58.806837",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",