Skip to content

[pull] develop from frappe:develop#364

Merged
pull[bot] merged 5 commits into
thispl:developfrom
frappe:develop
Jun 19, 2026
Merged

[pull] develop from frappe:develop#364
pull[bot] merged 5 commits into
thispl:developfrom
frappe:develop

Conversation

@pull

@pull pull Bot commented Jun 19, 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 : )

Abishek-TridotsTech and others added 5 commits June 10, 2026 15:36
…mployee Incentive

Employee Incentive filtered Salary Components using the
Salary Component.company field, which triggered field-level
permission checks and caused a Permission Error for users
without access to that field.

Updated the filtering logic to derive company-specific
Salary Components from Salary Component Account instead of
directly accessing Salary Component.company.

This preserves the intended filtering behavior while
preventing permission errors when selecting Salary
Components in Employee Incentive.

Fixes #4690
fix: package frontend and roster assets from public dir
fix(payroll): use Salary Component Account for company filtering in Employee Incentive
@pull pull Bot locked and limited conversation to collaborators Jun 19, 2026
@pull pull Bot added the ⤵️ pull label Jun 19, 2026
@pull pull Bot merged commit 6693f04 into thispl:develop Jun 19, 2026
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.

2 participants