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

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-02-08 15:55:44 +05:30
committed by GitHub
parent a5f016a7cd
commit cc867d6338
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,12 +8,7 @@ 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, getdate
from six import string_types
=======
from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
>>>>>>> 25c7f850b1 (fix: earned leaves not allocated if assignment is created on month-end)
class LeavePolicyAssignment(Document): class LeavePolicyAssignment(Document):