From ebd2ad81b805023bab060df7105c25dd55702e85 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Sat, 4 Jan 2025 17:20:08 +0500 Subject: [PATCH 1/2] fix: handle case for is recurring additional salary - validate_duplicate_additional_salary --- hrms/__init__.py | 2 +- .../additional_salary/additional_salary.py | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hrms/__init__.py b/hrms/__init__.py index edb371c494..f703a30c96 100644 --- a/hrms/__init__.py +++ b/hrms/__init__.py @@ -1,6 +1,6 @@ import frappe -__version__ = "15.33.2" +__version__ = "15.33.3" def refetch_resource(cache_key: str | list, user=None): diff --git a/hrms/payroll/doctype/additional_salary/additional_salary.py b/hrms/payroll/doctype/additional_salary/additional_salary.py index c7ca270b75..4b0fe319c4 100644 --- a/hrms/payroll/doctype/additional_salary/additional_salary.py +++ b/hrms/payroll/doctype/additional_salary/additional_salary.py @@ -117,16 +117,21 @@ def validate_duplicate_additional_salary(self): if not self.overwrite_salary_structure_amount: return + filters = { + "name": ["!=", self.name], + "salary_component": self.salary_component, + "payroll_date": self.payroll_date, + "overwrite_salary_structure_amount": 1, + "employee": self.employee, + "docstatus": 1, + } + + if self.is_recurring: + filters["payroll_date"] = ["between", [self.from_date, self.to_date]] + existing_additional_salary = frappe.db.exists( "Additional Salary", - { - "name": ["!=", self.name], - "salary_component": self.salary_component, - "payroll_date": self.payroll_date, - "overwrite_salary_structure_amount": 1, - "employee": self.employee, - "docstatus": 1, - }, + filters, ) if existing_additional_salary: From 38842b590b57dc808c6e2203d1549df5f5e91939 Mon Sep 17 00:00:00 2001 From: Ahmad Date: Sat, 4 Jan 2025 17:21:56 +0500 Subject: [PATCH 2/2] refactor: covert spaces to tabs --- hrms/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hrms/__init__.py b/hrms/__init__.py index f703a30c96..620b1be5d0 100644 --- a/hrms/__init__.py +++ b/hrms/__init__.py @@ -1,6 +1,6 @@ import frappe -__version__ = "15.33.3" +__version__ = "15.33.4" def refetch_resource(cache_key: str | list, user=None):