From ee7c9add397633c86ec79c4e3f2e29ec7af956e6 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 20 Mar 2023 10:56:00 +0530 Subject: [PATCH 01/12] fix: earned leave exceeding annual allocation --- erpnext/hr/utils.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index 181e3b12b98..c71336e26a8 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -496,18 +496,28 @@ def allocate_earned_leaves(): def update_previous_leave_allocation(allocation, annual_allocation, e_leave_type): + allocation = frappe.get_doc("Leave Allocation", allocation.name) + annual_allocation = flt(annual_allocation, allocation.precision("total_leaves_allocated")) + earned_leaves = get_monthly_earned_leave( annual_allocation, e_leave_type.earned_leave_frequency, e_leave_type.rounding ) - allocation = frappe.get_doc("Leave Allocation", allocation.name) new_allocation = flt(allocation.total_leaves_allocated) + flt(earned_leaves) + new_allocation_without_cf = flt( + flt(allocation.get_existing_leave_count()) + flt(earned_leaves), + allocation.precision("total_leaves_allocated"), + ) if new_allocation > e_leave_type.max_leaves_allowed and e_leave_type.max_leaves_allowed > 0: new_allocation = e_leave_type.max_leaves_allowed - if new_allocation != allocation.total_leaves_allocated: - today_date = today() + if ( + new_allocation != allocation.total_leaves_allocated + # annual allocation as per policy should not be exceeded + and new_allocation_without_cf <= annual_allocation + ): + today_date = frappe.flags.current_date or getdate() allocation.db_set("total_leaves_allocated", new_allocation, update_modified=False) create_additional_leave_ledger_entry(allocation, earned_leaves, today_date) From fee4eae96cfe3f7ea9cf12099b26564b835e228d Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 7 Dec 2023 13:04:23 +0530 Subject: [PATCH 02/12] fix: avoid over allocation during backdated assignment creation --- .../leave_policy_assignment.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py index 79295aa1bd4..9ea0b346c09 100644 --- a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py +++ b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py @@ -100,7 +100,7 @@ class LeavePolicyAssignment(Document): return leave_allocations def create_leave_allocation( - self, leave_type, new_leaves_allocated, leave_type_details, date_of_joining + self, leave_type, annual_allocation, leave_type_details, date_of_joining ): # Creates leave allocation for the given employee in the provided leave period carry_forward = self.carry_forward @@ -108,7 +108,7 @@ class LeavePolicyAssignment(Document): carry_forward = 0 new_leaves_allocated = self.get_new_leaves( - leave_type, new_leaves_allocated, leave_type_details, date_of_joining + leave_type, annual_allocation, leave_type_details, date_of_joining ) allocation = frappe.get_doc( @@ -129,7 +129,7 @@ class LeavePolicyAssignment(Document): allocation.submit() return allocation.name, new_leaves_allocated - def get_new_leaves(self, leave_type, new_leaves_allocated, leave_type_details, date_of_joining): + def get_new_leaves(self, leave_type, annual_allocation, leave_type_details, date_of_joining): from frappe.model.meta import get_field_precision precision = get_field_precision( @@ -146,7 +146,7 @@ class LeavePolicyAssignment(Document): else: # get leaves for past months if assignment is based on Leave Period / Joining Date new_leaves_allocated = self.get_leaves_for_passed_months( - leave_type, new_leaves_allocated, leave_type_details, date_of_joining + leave_type, annual_allocation, leave_type_details, date_of_joining ) # Calculate leaves at pro-rata basis for employees joining after the beginning of the given leave period @@ -156,10 +156,14 @@ class LeavePolicyAssignment(Document): ) new_leaves_allocated = ceil(new_leaves_allocated * remaining_period) + # leave allocation should not exceed annual allocation as per policy assignment + if new_leaves_allocated > annual_allocation: + new_leaves_allocated = annual_allocation + return flt(new_leaves_allocated, precision) def get_leaves_for_passed_months( - self, leave_type, new_leaves_allocated, leave_type_details, date_of_joining + self, leave_type, annual_allocation, leave_type_details, date_of_joining ): from erpnext.hr.utils import get_monthly_earned_leave @@ -184,7 +188,7 @@ class LeavePolicyAssignment(Document): if months_passed > 0: monthly_earned_leave = get_monthly_earned_leave( - new_leaves_allocated, + annual_allocation, leave_type_details.get(leave_type).earned_leave_frequency, leave_type_details.get(leave_type).rounding, ) From 48eaa51c4ab235d16d26f62ff6536329f5836f15 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 7 Dec 2023 13:04:51 +0530 Subject: [PATCH 03/12] test: earned leave over-allocation --- .../test_leave_policy_assignment.py | 139 +++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) diff --git a/erpnext/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py b/erpnext/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py index ee61b2bfc91..fe6c156a50a 100644 --- a/erpnext/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py +++ b/erpnext/hr/doctype/leave_policy_assignment/test_leave_policy_assignment.py @@ -5,8 +5,10 @@ import unittest import frappe from frappe.tests.utils import FrappeTestCase -from frappe.utils import add_days, add_months, get_first_day, get_last_day, getdate +from frappe.utils import add_days, add_months, get_first_day, get_last_day, get_year_start, getdate +from erpnext.hr.doctype.leave_allocation.test_leave_allocation import create_leave_allocation +from erpnext.hr.doctype.leave_application.leave_application import get_leave_balance_on from erpnext.hr.doctype.leave_application.test_leave_application import ( get_employee, get_leave_period, @@ -15,6 +17,7 @@ from erpnext.hr.doctype.leave_policy.test_leave_policy import create_leave_polic from erpnext.hr.doctype.leave_policy_assignment.leave_policy_assignment import ( create_assignment_for_multiple_employees, ) +from erpnext.hr.utils import allocate_earned_leaves test_dependencies = ["Employee"] @@ -34,6 +37,8 @@ class TestLeavePolicyAssignment(FrappeTestCase): self.original_doj = employee.date_of_joining self.employee = employee + self.leave_type = "Test Earned Leave" + def test_grant_leaves(self): leave_period = get_leave_period() # allocation = 10 @@ -326,6 +331,90 @@ class TestLeavePolicyAssignment(FrappeTestCase): self.assertEqual(effective_from, self.employee.date_of_joining) self.assertEqual(leaves_allocated, 3) + def test_overallocation(self): + """Tests if earned leave allocation does not exceed annual allocation""" + frappe.flags.current_date = get_year_start(getdate()) + make_policy_assignment( + self.employee, + annual_allocation=22, + allocate_on_day="First Day", + start_date=frappe.flags.current_date, + ) + + # leaves for 12 months = 22 + # With rounding, 22 leaves would be allocated in 11 months only + frappe.db.set_value("Leave Type", self.leave_type, "rounding", 1.0) + allocate_earned_leaves_for_months(11) + self.assertEqual( + get_leave_balance_on(self.employee.name, self.leave_type, frappe.flags.current_date), 22 + ) + + # should not allocate more leaves than annual allocation + allocate_earned_leaves_for_months(1) + self.assertEqual( + get_leave_balance_on(self.employee.name, self.leave_type, frappe.flags.current_date), 22 + ) + + def test_over_allocation_during_assignment_creation(self): + """Tests backdated earned leave allocation does not exceed annual allocation""" + start_date = get_first_day(add_months(getdate(), -12)) + + # joining date set to 1Y ago + self.employee.date_of_joining = start_date + self.employee.save() + + # create backdated assignment for last year + frappe.flags.current_date = get_first_day(getdate()) + + leave_policy_assignments = make_policy_assignment( + self.employee, start_date=start_date, allocate_on_day="Date of Joining" + ) + + # 13 months have passed but annual allocation = 12 + # check annual allocation is not exceeded + leaves_allocated = get_allocated_leaves(leave_policy_assignments[0]) + self.assertEqual(leaves_allocated, 12) + + def test_overallocation_with_carry_forwarding(self): + """Tests earned leave allocation with cf leaves does not exceed annual allocation""" + year_start = get_year_start(getdate()) + + # initial leave allocation = 5 + leave_allocation = create_leave_allocation( + employee=self.employee.name, + employee_name=self.employee.employee_name, + leave_type=self.leave_type, + from_date=get_first_day(add_months(year_start, -1)), + to_date=get_last_day(add_months(year_start, -1)), + new_leaves_allocated=5, + carry_forward=0, + ) + leave_allocation.submit() + + frappe.flags.current_date = year_start + # carry forwarded leaves = 5 + make_policy_assignment( + self.employee, + annual_allocation=22, + allocate_on_day="First Day", + start_date=year_start, + carry_forward=True, + ) + + frappe.db.set_value("Leave Type", self.leave_type, "rounding", 1.0) + allocate_earned_leaves_for_months(11) + + # 5 carry forwarded leaves + 22 EL allocated = 27 leaves + self.assertEqual( + get_leave_balance_on(self.employee.name, self.leave_type, frappe.flags.current_date), 27 + ) + + # should not allocate more leaves than annual allocation (22 excluding 5 cf leaves) + allocate_earned_leaves_for_months(1) + self.assertEqual( + get_leave_balance_on(self.employee.name, self.leave_type, frappe.flags.current_date), 27 + ) + def tearDown(self): frappe.db.set_value("Employee", self.employee.name, "date_of_joining", self.original_doj) frappe.flags.current_date = None @@ -376,3 +465,51 @@ def setup_leave_period_and_policy(start_date, based_on_doj=False): ).insert() return leave_period, leave_policy + + +def make_policy_assignment( + employee, + allocate_on_day="Last Day", + earned_leave_frequency="Monthly", + start_date=None, + annual_allocation=12, + carry_forward=0, + assignment_based_on="Leave Period", +): + leave_type = create_earned_leave_type("Test Earned Leave", allocate_on_day) + leave_period = create_leave_period("Test Earned Leave Period", start_date=start_date) + leave_policy = frappe.get_doc( + { + "doctype": "Leave Policy", + "title": "Test Earned Leave Policy", + "leave_policy_details": [ + {"leave_type": leave_type.name, "annual_allocation": annual_allocation} + ], + } + ).insert() + + data = { + "assignment_based_on": assignment_based_on, + "leave_policy": leave_policy.name, + "leave_period": leave_period.name, + "carry_forward": carry_forward, + } + + leave_policy_assignments = create_assignment_for_multiple_employees( + [employee.name], frappe._dict(data) + ) + return leave_policy_assignments + + +def get_allocated_leaves(assignment): + return frappe.db.get_value( + "Leave Allocation", + {"leave_policy_assignment": assignment}, + "total_leaves_allocated", + ) + + +def allocate_earned_leaves_for_months(months): + for i in range(0, months): + frappe.flags.current_date = add_months(frappe.flags.current_date, 1) + allocate_earned_leaves() From 10f02e60ce1664e0869879d6a611a6b67155dc6c Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:32:49 +0100 Subject: [PATCH 04/12] fix: get customers for leaderboard (cherry picked from commit 137b5a610880684b1c08d868072335debceb3007) --- erpnext/startup/leaderboard.py | 47 ++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index da7edbf8144..1a508b5ced1 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -54,12 +54,13 @@ def get_leaderboards(): @frappe.whitelist() def get_all_customers(date_range, company, field, limit=None): + filters = [["docstatus", "=", "1"], ["company", "=", company]] + from_date, to_date = parse_date_range(date_range) if field == "outstanding_amount": - filters = [["docstatus", "=", "1"], ["company", "=", company]] - if date_range: - date_range = frappe.parse_json(date_range) - filters.append(["posting_date", ">=", "between", [date_range[0], date_range[1]]]) - return frappe.db.get_all( + if from_date and to_date: + filters.append(["posting_date", "between", [from_date, to_date]]) + + return frappe.get_list( "Sales Invoice", fields=["customer as name", "sum(outstanding_amount) as value"], filters=filters, @@ -69,26 +70,20 @@ def get_all_customers(date_range, company, field, limit=None): ) else: if field == "total_sales_amount": - select_field = "sum(so_item.base_net_amount)" + select_field = "base_net_total" elif field == "total_qty_sold": - select_field = "sum(so_item.stock_qty)" + select_field = "total_qty" - date_condition = get_date_condition(date_range, "so.transaction_date") + if from_date and to_date: + filters.append(["transaction_date", "between", [from_date, to_date]]) - return frappe.db.sql( - """ - select so.customer as name, {0} as value - FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item - ON so.name = so_item.parent - where so.docstatus = 1 {1} and so.company = %s - group by so.customer - order by value DESC - limit %s - """.format( - select_field, date_condition - ), - (company, cint(limit)), - as_dict=1, + return frappe.get_list( + "Sales Order", + fields=["customer as name", f"sum({select_field}) as value"], + filters=filters, + group_by="customer", + order_by="value desc", + limit=limit, ) @@ -236,3 +231,11 @@ def get_date_condition(date_range, field): field, frappe.db.escape(from_date), frappe.db.escape(to_date) ) return date_condition + + +def parse_date_range(date_range): + if date_range: + date_range = frappe.parse_json(date_range) + return date_range[0], date_range[1] + + return None, None From 3863c4e7fb5460f59ecebaa46361159183203c1f Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:34:24 +0100 Subject: [PATCH 05/12] fix: get items for leaderboard (cherry picked from commit 2721ee3a8dda2e61ddf7f59698849c2e15e0e414) --- erpnext/startup/leaderboard.py | 45 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index 1a508b5ced1..48a573116d8 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -91,45 +91,46 @@ def get_all_customers(date_range, company, field, limit=None): def get_all_items(date_range, company, field, limit=None): if field in ("available_stock_qty", "available_stock_value"): select_field = "sum(actual_qty)" if field == "available_stock_qty" else "sum(stock_value)" - return frappe.db.get_all( + results = frappe.db.get_all( "Bin", fields=["item_code as name", "{0} as value".format(select_field)], group_by="item_code", order_by="value desc", limit=limit, ) + readable_active_items = set(frappe.get_list("Item", filters={"disabled": 0}, pluck="name")) + return [item for item in results if item["name"] in readable_active_items] else: if field == "total_sales_amount": - select_field = "sum(order_item.base_net_amount)" + select_field = "base_net_amount" select_doctype = "Sales Order" elif field == "total_purchase_amount": - select_field = "sum(order_item.base_net_amount)" + select_field = "base_net_amount" select_doctype = "Purchase Order" elif field == "total_qty_sold": - select_field = "sum(order_item.stock_qty)" + select_field = "stock_qty" select_doctype = "Sales Order" elif field == "total_qty_purchased": - select_field = "sum(order_item.stock_qty)" + select_field = "stock_qty" select_doctype = "Purchase Order" - date_condition = get_date_condition(date_range, "sales_order.transaction_date") + filters = [["docstatus", "=", "1"], ["company", "=", company]] + from_date, to_date = parse_date_range(date_range) + if from_date and to_date: + filters.append(["transaction_date", "between", [from_date, to_date]]) - return frappe.db.sql( - """ - select order_item.item_code as name, {0} as value - from `tab{1}` sales_order join `tab{1} Item` as order_item - on sales_order.name = order_item.parent - where sales_order.docstatus = 1 - and sales_order.company = %s {2} - group by order_item.item_code - order by value desc - limit %s - """.format( - select_field, select_doctype, date_condition - ), - (company, cint(limit)), - as_dict=1, - ) # nosec + child_doctype = f"{select_doctype} Item" + return frappe.get_list( + select_doctype, + fields=[ + f"`tab{child_doctype}`.item_code as name", + f"sum(`tab{child_doctype}`.{select_field}) as value", + ], + filters=filters, + order_by="value desc", + group_by=f"`tab{child_doctype}`.item_code", + limit=limit, + ) @frappe.whitelist() From 7df8425756780666681f7eb534c0b66095c8254e Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:34:54 +0100 Subject: [PATCH 06/12] fix: get suppliers for leaderboard (cherry picked from commit 65df4b6aa84523b917e0b6e83555a7b86157e42e) --- erpnext/startup/leaderboard.py | 44 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index 48a573116d8..e9b234dc66e 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -135,12 +135,14 @@ def get_all_items(date_range, company, field, limit=None): @frappe.whitelist() def get_all_suppliers(date_range, company, field, limit=None): + filters = [["docstatus", "=", "1"], ["company", "=", company]] + from_date, to_date = parse_date_range(date_range) + if field == "outstanding_amount": - filters = [["docstatus", "=", "1"], ["company", "=", company]] - if date_range: - date_range = frappe.parse_json(date_range) - filters.append(["posting_date", "between", [date_range[0], date_range[1]]]) - return frappe.db.get_all( + if from_date and to_date: + filters.append(["posting_date", "between", [from_date, to_date]]) + + return frappe.get_list( "Purchase Invoice", fields=["supplier as name", "sum(outstanding_amount) as value"], filters=filters, @@ -150,29 +152,21 @@ def get_all_suppliers(date_range, company, field, limit=None): ) else: if field == "total_purchase_amount": - select_field = "sum(purchase_order_item.base_net_amount)" + select_field = "base_net_total" elif field == "total_qty_purchased": - select_field = "sum(purchase_order_item.stock_qty)" + select_field = "total_qty" - date_condition = get_date_condition(date_range, "purchase_order.modified") + if from_date and to_date: + filters.append(["transaction_date", "between", [from_date, to_date]]) - return frappe.db.sql( - """ - select purchase_order.supplier as name, {0} as value - FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item` - as purchase_order_item ON purchase_order.name = purchase_order_item.parent - where - purchase_order.docstatus = 1 - {1} - and purchase_order.company = %s - group by purchase_order.supplier - order by value DESC - limit %s""".format( - select_field, date_condition - ), - (company, cint(limit)), - as_dict=1, - ) # nosec + return frappe.get_list( + "Purchase Order", + fields=["supplier as name", f"sum({select_field}) as value"], + filters=filters, + group_by="supplier", + order_by="value desc", + limit=limit, + ) @frappe.whitelist() From 8dbb200fe39e814d0a548f1fa6cd317e8958d661 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:44:24 +0100 Subject: [PATCH 07/12] fix: get sales person for leaderboard (cherry picked from commit 7babfd4ac4e3852d983487f1290799165933c4c0) --- erpnext/startup/leaderboard.py | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index e9b234dc66e..cea174495b1 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -1,5 +1,4 @@ import frappe -from frappe.utils import cint def get_leaderboards(): @@ -196,24 +195,25 @@ def get_all_sales_partner(date_range, company, field, limit=None): @frappe.whitelist() def get_all_sales_person(date_range, company, field=None, limit=0): - date_condition = get_date_condition(date_range, "sales_order.transaction_date") + filters = [ + ["docstatus", "=", "1"], + ["company", "=", company], + ["Sales Team", "sales_person", "is", "set"], + ] + from_date, to_date = parse_date_range(date_range) + if from_date and to_date: + filters.append(["transaction_date", "between", [from_date, to_date]]) - return frappe.db.sql( - """ - select sales_team.sales_person as name, sum(sales_order.base_net_total) as value - from `tabSales Order` as sales_order join `tabSales Team` as sales_team - on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order' - where sales_order.docstatus = 1 - and sales_order.company = %s - {date_condition} - group by sales_team.sales_person - order by value DESC - limit %s - """.format( - date_condition=date_condition - ), - (company, cint(limit)), - as_dict=1, + return frappe.get_list( + "Sales Order", + fields=[ + "`tabSales Team`.sales_person as name", + "sum(`tabSales Team`.allocated_amount) as value", + ], + filters=filters, + group_by="`tabSales Team`.sales_person", + order_by="value desc", + limit=limit, ) From b0f7de1a0fd9368f4cabdac3d6884d76b54a1854 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:45:32 +0100 Subject: [PATCH 08/12] fix: get sales partner for leaderboard (cherry picked from commit 40c1acc961d29394fb47ef6108864c7690331457) --- erpnext/startup/leaderboard.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index cea174495b1..9542ed6aa17 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -171,20 +171,20 @@ def get_all_suppliers(date_range, company, field, limit=None): @frappe.whitelist() def get_all_sales_partner(date_range, company, field, limit=None): if field == "total_sales_amount": - select_field = "sum(`base_net_total`)" + select_field = "base_net_total" elif field == "total_commission": - select_field = "sum(`total_commission`)" + select_field = "total_commission" - filters = {"sales_partner": ["!=", ""], "docstatus": 1, "company": company} - if date_range: - date_range = frappe.parse_json(date_range) - filters["transaction_date"] = ["between", [date_range[0], date_range[1]]] + filters = [["docstatus", "=", "1"], ["company", "=", company], ["sales_partner", "is", "set"]] + from_date, to_date = parse_date_range(date_range) + if from_date and to_date: + filters.append(["transaction_date", "between", [from_date, to_date]]) return frappe.get_list( "Sales Order", fields=[ - "`sales_partner` as name", - "{} as value".format(select_field), + "sales_partner as name", + f"sum({select_field}) as value", ], filters=filters, group_by="sales_partner", From e291b5db3dbf6af8283e8370a43e2829e7893712 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:46:37 +0100 Subject: [PATCH 09/12] chore: deprecate unused method (cherry picked from commit 956c3c50a09036dbeb9bfdf7ecd42958bdb0ec3e) --- erpnext/startup/leaderboard.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index 9542ed6aa17..5a60d2ff967 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -1,4 +1,5 @@ import frappe +from frappe.utils.deprecations import deprecated def get_leaderboards(): @@ -217,6 +218,7 @@ def get_all_sales_person(date_range, company, field=None, limit=0): ) +@deprecated def get_date_condition(date_range, field): date_condition = "" if date_range: From e6e9f1dc2672c8ddc53efb30ca207b4dd7df4d8e Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:46:40 +0100 Subject: [PATCH 10/12] chore: remove deprecation wrapper not available in v13 --- erpnext/startup/leaderboard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py index 5a60d2ff967..9542ed6aa17 100644 --- a/erpnext/startup/leaderboard.py +++ b/erpnext/startup/leaderboard.py @@ -1,5 +1,4 @@ import frappe -from frappe.utils.deprecations import deprecated def get_leaderboards(): @@ -218,7 +217,6 @@ def get_all_sales_person(date_range, company, field=None, limit=0): ) -@deprecated def get_date_condition(date_range, field): date_condition = "" if date_range: From 14955c70d4c87c3d0282f3e30366befdd79d487f Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 19 Dec 2023 13:03:36 +0530 Subject: [PATCH 11/12] fix: earned leave allocation in policy assignment --- .../leave_policy_assignment.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py index 9ea0b346c09..8269d98a5a7 100644 --- a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py +++ b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py @@ -150,11 +150,14 @@ class LeavePolicyAssignment(Document): ) # Calculate leaves at pro-rata basis for employees joining after the beginning of the given leave period - elif getdate(date_of_joining) > getdate(self.effective_from): - remaining_period = (date_diff(self.effective_to, date_of_joining) + 1) / ( - date_diff(self.effective_to, self.effective_from) + 1 - ) - new_leaves_allocated = ceil(new_leaves_allocated * remaining_period) + else: + if getdate(date_of_joining) > getdate(self.effective_from): + remaining_period = (date_diff(self.effective_to, date_of_joining) + 1) / ( + date_diff(self.effective_to, self.effective_from) + 1 + ) + new_leaves_allocated = ceil(annual_allocation * remaining_period) + else: + new_leaves_allocated = annual_allocation # leave allocation should not exceed annual allocation as per policy assignment if new_leaves_allocated > annual_allocation: From 9900274b2744fd2efd7f7c721ff6b4acbfe0d05a Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 19 Dec 2023 13:03:57 +0530 Subject: [PATCH 12/12] test(fix): earned leave tests --- .../test_leave_application.py | 32 +++++++++++-------- erpnext/hr/utils.py | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.py b/erpnext/hr/doctype/leave_application/test_leave_application.py index 8d1adaca62b..494255f4a1e 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.py +++ b/erpnext/hr/doctype/leave_application/test_leave_application.py @@ -713,25 +713,31 @@ class TestLeaveApplication(unittest.TestCase): self.assertEqual(details.leave_balance, 30) def test_earned_leaves_creation(self): - from erpnext.hr.utils import allocate_earned_leaves + from erpnext.hr.doctype.leave_policy_assignment.test_leave_policy_assignment import ( + allocate_earned_leaves_for_months, + ) - leave_period = get_leave_period() + year_start = get_year_start(getdate()) + year_end = get_year_ending(getdate()) + frappe.flags.current_date = year_start + + leave_period = get_leave_period(year_start, year_end) employee = get_employee() leave_type = "Test Earned Leave Type" + make_policy_assignment(employee, leave_type, leave_period) - for i in range(0, 14): - allocate_earned_leaves() - - self.assertEqual(get_leave_balance_on(employee.name, leave_type, nowdate()), 6) + # leaves for 6 months = 3, but max leaves restricts allocation to 2 + frappe.db.set_value("Leave Type", leave_type, "max_leaves_allowed", 2) + allocate_earned_leaves_for_months(6) + self.assertEqual(get_leave_balance_on(employee.name, leave_type, frappe.flags.current_date), 2) # validate earned leaves creation without maximum leaves frappe.db.set_value("Leave Type", leave_type, "max_leaves_allowed", 0) + allocate_earned_leaves_for_months(5) + self.assertEqual(get_leave_balance_on(employee.name, leave_type, frappe.flags.current_date), 4.5) - for i in range(0, 6): - allocate_earned_leaves() - - self.assertEqual(get_leave_balance_on(employee.name, leave_type, nowdate()), 9) + frappe.flags.current_date = None # test to not consider current leave in leave balance while submitting def test_current_leave_on_submit(self): @@ -1254,7 +1260,7 @@ def set_leave_approver(): dept_doc.save(ignore_permissions=True) -def get_leave_period(): +def get_leave_period(from_date=None, to_date=None): leave_period_name = frappe.db.exists({"doctype": "Leave Period", "company": "_Test Company"}) if leave_period_name: return frappe.get_doc("Leave Period", leave_period_name[0][0]) @@ -1263,8 +1269,8 @@ def get_leave_period(): dict( name="Test Leave Period", doctype="Leave Period", - from_date=add_months(nowdate(), -6), - to_date=add_months(nowdate(), 6), + from_date=from_date or add_months(nowdate(), -6), + to_date=to_date or add_months(nowdate(), 6), company="_Test Company", is_active=1, ) diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index c71336e26a8..a2c45c0c0d3 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -459,7 +459,7 @@ def generate_leave_encashment(): def allocate_earned_leaves(): """Allocate earned leaves to Employees""" e_leave_types = get_earned_leaves() - today = getdate() + today = frappe.flags.current_date or getdate() for e_leave_type in e_leave_types: