CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

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

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

@@ -9,6 +9,7 @@ import frappe
from frappe import _, bold
from frappe.model.document import Document
from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
from six import string_types
class LeavePolicyAssignment(Document):