Skip to content
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.

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

fix(Salary Structure Assignment): Preview Salary Slip date #1869

Merged
merged 1 commit into from
Jun 11, 2024

Conversation

krantheman
Copy link
Member

Problem

Clicking on Salary Slip Preview for any Salary Structure Assignment generates it based on the employee's latest (excluding future dates) Salary Structure Assignment.

Example

Salary Structure Assignment 1:-
From Date = 01/05/2024

Salary Structure Assignment 2:-
From Date = 01/06/2024

Salary Structure Assignment 3:-
From Date = 01/07/2024 (future date)

Previewing Salary Slip based on SSA1 or SSA3 will show that based on SSA2.

Solution

In this PR, I've edited the preview_salary_slip function to pass the posting_date param while calling the make_salary_slip method to ensure that the correct Salary Structure Assignment is considered.

@krantheman krantheman requested a review from ruchamahabal as a code owner June 10, 2024 08:55
@ruchamahabal ruchamahabal merged commit 71cff7c into frappe:develop Jun 11, 2024
5 checks passed
mergify bot pushed a commit that referenced this pull request Jun 11, 2024
mergify bot pushed a commit that referenced this pull request Jun 11, 2024
@krantheman krantheman deleted the fix-preview-salary-slip branch June 11, 2024 11:22
ruchamahabal pushed a commit that referenced this pull request Jun 11, 2024
ruchamahabal pushed a commit that referenced this pull request Jun 11, 2024
@sjain17
Copy link

sjain17 commented Jun 11, 2024

The same issue is on Salary Structure as well. When try to preview salary slip.

frappe-pr-bot pushed a commit that referenced this pull request Jun 12, 2024
## [14.28.5](v14.28.4...v14.28.5) (2024-06-12)

### Bug Fixes

* calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1884](#1884)) ([4b2312d](4b2312d))
* **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1876](#1876)) ([e9dc0b1](e9dc0b1))
* **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1878](#1878)) ([f735482](f735482))
* **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1882](#1882)) ([37578e6](37578e6))
frappe-pr-bot pushed a commit that referenced this pull request Jun 12, 2024
## [15.22.2](v15.22.1...v15.22.2) (2024-06-12)

### Bug Fixes

* calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1885](#1885)) ([6e22a2a](6e22a2a))
* disabled Link field ([77f27e1](77f27e1))
* frappe-ui version ([c4e5808](c4e5808))
* make link field value non-mandatory ([3964609](3964609))
* render normal Autocomplete for link fields with predefined options ([00228f2](00228f2))
* **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1877](#1877)) ([afef6e3](afef6e3))
* **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1879](#1879)) ([9437b85](9437b85))
* **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1883](#1883)) ([1fb427c](1fb427c))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants