Repository navigation
[pull] develop from frappe:develop - #448
Merged
Merged
Conversation
…nt period Holiday list resolution ignored the period a document covers and, in Payroll Entry, bypassed Holiday List Assignment entirely by reading the legacy Employee and Company fields. - add range helpers that split a date range wherever the assigned holiday list changes, with a bulk variant that fills employee gaps with the company assignment - resolve holidays over the document period in Salary Slip, Leave Application, Overtime Slip, Shift Type auto attendance, boarding tasks, the PWA calendar and the Employees Working on a Holiday report - use Holiday List Assignment in Payroll Entry unmarked attendance validation - fall back to the earliest assignment for dates before any assignment exists so backdated documents keep working after migration Closes #4676 Closes #4693 Closes #4879 Closes #4153
Resolve all assignments for the employees and their companies in a single query and pick the effective one in memory, both for a single date and for date ranges. Fetch holidays for any number of employees in one query restricted to each employee's ranges, and use it in Salary Slip, Payroll Entry unmarked attendance validation, get_holidays_for_employee and the Employees Working on a Holiday and Monthly Attendance Sheet reports. Bulk and scalar resolution now share the same fallback for dates before the first assignment or after the assigned list expires.
…esolution Bulk range resolution clipped an assignment at its holiday list's to_date and let the company assignment take over, while single-date resolution kept the employee's latest assignment in force until the next one. Payroll Entry and the attendance reports could therefore use a different list than Salary Slip for the same period. Ranges now follow the single-date rule so all consumers agree.
…ent-resolution fix: resolve holiday lists via Holiday List Assignment for the document period
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.
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 : )