nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-02-11 21:27:44 +05:30
committed by GitHub
parent 6a1c27a18f
commit 0e3788e346
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
View File

@@ -8,12 +8,8 @@ from math import ceil
import frappe import frappe
from frappe import _, bold from frappe import _, bold
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD
from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
from six import string_types
=======
from frappe.utils import date_diff, flt, formatdate, get_last_day, getdate from frappe.utils import date_diff, flt, formatdate, get_last_day, getdate
>>>>>>> c7be9ef5d2 (fix: consider leaves for past months if assignment is based on joining date too) from six import string_types
class LeavePolicyAssignment(Document): class LeavePolicyAssignment(Document):