Skip to content

[pull] develop from frappe:develop - #448

Merged
pull[bot] merged 4 commits into
thispl:developfrom
frappe:develop
Sep 18, 2026
Merged

pull[bot] merged 4 commits into
thispl:developfrom
frappe:develop

Conversation

@pull

@pull pull Bot commented Sep 18, 2026 •

Copy link
Copy Markdown

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 : )

…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
@pull pull Bot locked and limited conversation to collaborators Sep 18, 2026
@pull pull Bot added the ⤵️ pull label Sep 18, 2026
@pull
pull Bot merged commit d222ced into thispl:develop Sep 18, 2026
7 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant