Skip to content

fix: Cannot create recurring Additional salary for new recurring period #2579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: version-15-hotfix
Choose a base branch
from
+13 −8
Open

fix: Cannot create recurring Additional salary for new recurring period #2579

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebd2ad8
fix: handle case for is recurring additional salary
ahmadpak Jan 4, 2025
38842b5
refactor: covert spaces to tabs
ahmadpak Jan 4, 2025
eb8ea80
Merge branch 'frappe:version-15-hotfix' into version-15-hotfix
ahmadpak Feb 19, 2025
341364c
version-revert
ahmadpak Feb 19, 2025
de6257e
Merge branch 'version-15-hotfix' into version-15-hotfix
ahmadpak Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hrms/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import frappe

__version__ = "15.33.2"
__version__ = "15.33.4"


def refetch_resource(cache_key: str | list, user=None):
Expand Down
21 changes: 13 additions & 8 deletions hrms/payroll/doctype/additional_salary/additional_salary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should actually also check for the other case. If my current additional salary is not recurring but there is a recurring additional salary already existing.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruchamahabal I believe it is already covered in the method before this call. Are you referring to a different case?

hrms/hrms/payroll/doctype/additional_salary/additional_salary.py

Line 26 in 341364c

self.validate_recurring_additional_salary_overlap()

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ruchamahabal kind reminder 🙂


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:
Expand Down
Loading