fix: Editable Letter Head field in Salary Structure Doctype (backport #2436) #2443
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…doctype, to make it editable, set the company defualt letter head using form script instead (cherry picked from commit 5e53324) # Conflicts: # hrms/payroll/doctype/salary_structure/salary_structure.json
… if empty" to make the field editable, intead of using form script to set the value (cherry picked from commit 18dc6fc) # Conflicts: # hrms/payroll/doctype/salary_structure/salary_structure.json
…n't figure out why, added them back (cherry picked from commit d3564c4)
|
Cherry-pick of 5e53324 has failed: Cherry-pick of 18dc6fc has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
|
@asmitahase can you fix conflicts? |
asmitahase
force-pushed
the
mergify/bp/version-15-hotfix/pr-2436
branch
from
00f3e29 to
df71cf8
Compare
frappe-pr-bot
pushed a commit
that referenced
this pull request
Nov 26, 2024
## [15.35.3](v15.35.2...v15.35.3) (2024-11-26) ### Bug Fixes * Editable Letter Head field in Salary Structure Doctype (backport [#2436](#2436)) ([#2443](#2443)) ([f948a36](f948a36)) * filters on vehicle expenses report (backport [#2440](#2440)) ([#2447](#2447)) ([4e4425c](4e4425c)) * ignore linked ledger entry record on employee advance cancellation (backport [#2432](#2432)) ([#2433](#2433)) ([e1d9514](e1d9514)) * redundant fetching of Interviewers in Interview ([#2441](#2441)) ([62cd631](62cd631)) * **Salary Structure Assignment:** validate cost center company on server-side (backport [#2445](#2445)) ([#2450](#2450)) ([7f5e969](7f5e969))
|
🎉 This PR is included in version 15.35.3 🎉 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Salary Structure doctype has "fetch from" setting to fetch company default letterhead so no other letter head can be set while creating salary structure. The same field value is mapped to salary slip, so for companies where the salary letter head is different from company letter head, the letter head field has to be changed manually while creating salary slip.
Fix
Removed "fetch from company default letter head" setting from Salary Structure and used form script to set the field value instead.
Before
After
no-tests
This is an automatic backport of pull request #2436 done by Mergify.