[pull] develop from frappe:develop#367
Merged
Merged
Conversation
The build checks out frappe_docker (main), whose layered Containerfile now reads apps.json from a BuildKit secret (id=apps_json) instead of the old APPS_JSON_BASE64 build-arg. The workflow still passed the apps list through that build-arg, so it was silently dropped: bench init ran without erpnext, payments or hrms, and the published version-15 and stable images shipped frappe only. Pass apps.json via secret-files so it reaches the Containerfile's secret mount.
…ting leaves Vue reactive watchers on leave_type and from_date/to_date were firing during initial document population in FormView.onMounted, causing setLeaveBalance() to overwrite the stored DB value with the current (post-deduction) balance. Added isFormInitialized flag that blocks setLeaveBalance() until after the first data load completes, matching the desk behaviour where get_leave_balance is only called on explicit user interactions. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…re-application fix(pwa): preserve leave balance before application when viewing existing leaves
…elop fix: pass apps.json to image build via secret mount
fix: remove parameter from whiltelisted method
…sion fix: add permission check for allocate_leaves_manually
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 : )