Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: payment reconciliation tool (backport #27128) #46109

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 24, 2025

Issue:
The problem with existing tool is that a user has to manually select invoices to reconcile against payments and, only one invoice can be reconciled against particular payment at a time which makes it tedious for the cases where multiple invoices are to be reconciled against single payment or vice versa

E.g. A single payment against multiple invoices
Suppose there are 50 invoices, a user will have to select an invoice against the payment 50 times and, GL Entry of this payment also gets cancelled & submitted 50 times

Fix:
Using this refactored tool, a user will be able to select any invoice or payment to reconcile.
Once the unreconciled entries are fetched, a user can either select any particular entries or just click on Allocate button without selecting anything, Allocation table will be populated based on FIFO and/or selection, and then click on Reconcile button to reconcile all the allocated entries.

payment_recon

  • Added filter for payment transactions
  • Created separate tables for payments & invoices
  • Added new table 'Allocation'
  • Minor UI clean-up
  • Update docs

This is an automatic backport of pull request #27128 done by [Mergify](https://mergify.com).

(cherry picked from commit 3e404f1)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
#	erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.py
#	erpnext/accounts/utils.py
#	erpnext/controllers/accounts_controller.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner February 24, 2025 00:16
@mergify mergify bot added the conflicts label Feb 24, 2025
Copy link
Contributor Author

mergify bot commented Feb 24, 2025

Cherry-pick of 3e404f1 has failed:

On branch mergify/bp/version-13-hotfix/pr-27128
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 3e404f15ff.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
	both modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
	both modified:   erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
	both added:      erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
	both added:      erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
	both added:      erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.py
	both modified:   erpnext/accounts/utils.py
	both modified:   erpnext/controllers/accounts_controller.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants