Skip to content

[pull] develop from frappe:develop - #452

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

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

Conversation

@pull

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

… advances from F&F

Payroll Entry credited the salary component's account when recovering an
Employee Advance instead of the account the advance was paid from. The
advance receivable never got cleared, and when the component's account was
not a receivable ERPNext rejected the accrual entry with a misleading
"already adjusted against some other voucher" error. The linked advances
are now fetched in one query and the recovery is posted to each advance's
own account.

Full and Final Statement now prefills outstanding Employee Advances in
receivables, references the advance on the settlement Journal Entry so its
return amount and status update on submission, and no longer fails on
placeholder Gratuity or Leave Encashment rows without a reference document.

Closes #5137
Closes #3886
Closes #3550
Closes #3504
Closes #4156
Outstanding advances were only added when the receivables table was empty,
so the bootstrapped placeholder rows or a change of employee left them out
of the settlement. Advances are now reconciled against the current employee
on every fetch: placeholder rows and other employees' advances are dropped,
advances already listed are kept, and the blank placeholder is only added
when nothing is outstanding.
…lance

An advance row kept its original amount when the statement was fetched
again, so a claim or return made after the row was created left the
settlement Journal Entry recovering a stale amount. Unsettled rows now
take the advance's current account and outstanding balance on every
fetch; rows already marked Settled are left as they are.
The child row status is optional, so a blank status skipped the refresh
while the Journal Entry still posted the stale amount. Only rows marked
Settled are now left untouched.
…overy

fix: post employee advance recovery to the advance account and settle advances from F&F
@pull pull Bot locked and limited conversation to collaborators Sep 23, 2026
@pull pull Bot added the ⤵️ pull label Sep 23, 2026
@pull
pull Bot merged commit aa1ec5a into thispl:develop Sep 23, 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.

1 participant