Skip to content

[pull] develop from frappe:develop - #446

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

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

Conversation

@pull

@pull pull Bot commented Sep 16, 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 : )

Salary Component's Accounts table gets a Liability Account field for
Employer Contribution components: Account is debited as the expense
(cost center wise) and Liability Account is credited, since employer
contributions are payable to authorities and must not touch the
Payroll Payable account.

The JV is created after the salary accrual JV on payroll submission
and carries a Payroll Entry reference on credit rows so cancelling
the Payroll Entry cancels it as well.
When 'Process Payroll Accounting Entry based on Employee' is enabled in
Payroll Settings, the employer contribution JV credits the liability
account employee-wise with the employee set as party, mirroring the
payable rows of the salary accrual JV. Expense debits stay aggregated
cost center wise.
…r contribution JV

Expense rows split by cost center percentage and the liability credit
were rounded independently, so amounts like 0.01 split 50/50 produced
unbalanced Journal Entries that failed submission. The last cost center
now takes the rounding remainder so the expense splits always sum up to
the amount credited against the liability.
Account lookups ran once per contribution row inside the loop; fetch
the mappings for the distinct components upfront instead so payroll
submission does not scale queries with salary slip rows.
feat: pass separate Journal Entry for employer contributions
@pull pull Bot locked and limited conversation to collaborators Sep 16, 2026
@pull pull Bot added the ⤵️ pull label Sep 16, 2026
@pull
pull Bot merged commit 83a5734 into thispl:develop Sep 16, 2026
12 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