refactor: replace raw sql with orm
diff --git a/erpnext/hr/doctype/leave_type/leave_type.py b/erpnext/hr/doctype/leave_type/leave_type.py
index 3a19fa9..598bff2 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.py
+++ b/erpnext/hr/doctype/leave_type/leave_type.py
@@ -5,6 +5,7 @@
import calendar
import frappe
from datetime import datetime
+from frappe.utils import today
from frappe import _
from frappe.model.document import Document
@@ -12,6 +13,12 @@
class LeaveType(Document):
def validate(self):
if self.is_lwp:
- leave_allocation = frappe.db.sql_list("""select name from `tabLeave Allocation` where leave_type=%s""", (self.name))
+ leave_allocation = frappe.get_all("Leave Allocation", filters={
+ 'leave_type': self.name,
+ 'from_date': ("<=", today()),
+ 'to_date': (">=", today())
+ }, ['name'])
+ leave_allocation = [l['name'] for l in leave_allocation]
+ frappe.db("""select name from `tabLeave Allocation` where leave_type=%s""", (self.name))
if leave_allocation:
frappe.throw(_('Leave application is linked with leave allocations {0}. Leave application cannot be set as leave without pay').format(", ".join(leave_allocation))) #nosec
\ No newline at end of file
diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py
index 2183c5e..1464a77 100644
--- a/erpnext/hr/utils.py
+++ b/erpnext/hr/utils.py
@@ -323,7 +323,6 @@
allocation.db_set("total_leaves_allocated", new_allocation, update_modified=False)
create_earned_leave_ledger_entry(allocation, earned_leaves, today)
-
def create_earned_leave_ledger_entry(allocation, earned_leaves, date):
''' Create leave ledger entry based on the earned leave frequency '''
allocation.new_leaves_allocated = earned_leaves