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: allow setting opening tax balance in salary assignment for old employees too (backport #2618) #2636

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

Allow configuring opening balances for existing employees during salary structure assignment. Previously, this was only possible for new employees or those without existing salary slips.

Screenshot 2025-01-10 at 3 27 46 PM
This is an automatic backport of pull request #2618 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from ruchamahabal as a code owner January 14, 2025 07:04
@ruchamahabal ruchamahabal merged commit d99f5e3 into version-15-hotfix Jan 14, 2025
8 checks passed
frappe-pr-bot pushed a commit that referenced this pull request Jan 14, 2025
# [15.38.0](v15.37.2...v15.38.0) (2025-01-14)

### Bug Fixes

* add leaves to the correct allocation for compensatory leave request ([19304f4](19304f4))
* allow setting opening tax balance in salary assignment for old employees too (backport [#2618](#2618)) ([#2636](#2636)) ([d99f5e3](d99f5e3))
* Breadcrumb Label for Non-Logged-In Users in Job Portal (backport [#2439](#2439)) ([#2598](#2598)) ([72875c6](72875c6))
* create single leave ledger encashment entry for carry forwarding leave type (backport [#2614](#2614)) ([#2627](#2627)) ([44acce7](44acce7))
* disable 'User Cannot Search' for bulk tools (backport [#2630](#2630)) ([#2632](#2632)) ([5098f4f](5098f4f))
* effect of fnf statement cancellation on gratuity record ([c4f4999](c4f4999))
* filter out cancelled documents in FnF reference document selection ([870bbaa](870bbaa))
* make checkin button click once to prevent submitting multiple logs (backport [#2604](#2604)) ([#2605](#2605)) ([eb7c313](eb7c313))
* rectify and add more info to Leave Ledger validation message ([2cd858f](2cd858f))
* refactor code, consider fnf payment status update via journal entry ([e92caf4](e92caf4))
* refactor code, consider fnf payment status update via journal entry ([dad727a](dad727a))
* resolve html rendering issue for holidays in roster view (backport [#2595](#2595)) ([#2596](#2596)) ([4a2ca25](4a2ca25))
* set gratuity paid_amont field ([d64c255](d64c255))
* set gratuity to unpaid on FFN cancellation, edit test ([f53b861](f53b861))
* set party type & party for gratuity payable row in journal entry ([a9fa9fb](a9fa9fb))
* skip updating gratuity status on FnF cancellation ([b5e3a4d](b5e3a4d))
* update status of reference documents ([746d628](746d628))
* validate department based on company ([bc2fdbd](bc2fdbd))
* validate if company is set in department ([99065c5](99065c5))

### Features

* add company filter for department ([09d21d2](09d21d2))

### Reverts

* Revert "fix: refactor code, consider fnf payment status update via journal entry" ([0ad0848](0ad0848))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.38.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants