[pull] develop from frappe:develop#404
Merged
Merged
Conversation
fix: skip expire_allocation for already-cancelled Leave Allocations
fix: exclude cancelled Vehicle Log records from service expense report
chore: explicitly whitelist fields in create_salary_slips_for_employees
fix: Doctype settings map
default_series was set in __init__ before field values were populated, causing employee to be None and generating names like Sal Slip/None/00001. Converting it to a property fixes the issue by reading employee lazily.
…h-data-import fix: correct salary slip naming when created via data import
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )