Repository navigation
[pull] develop from frappe:develop - #452
Merged
Merged
Conversation
… 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
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 : )