fix(accounts): validate payment entry references with latest data. #31166

dj12djdjs · 2022-05-27T23:37:48Z

Problem:

The system allows multiple draft payment entries to be made for a single invoice, which is fine, but when the first payment entry is submitted, the outstanding amount of the invoice in the second payment entry isn't accurate anymore. But the system still allows the user to submit the entry, resulting in negative outstanding amounts.

Solution:

During validation of allocated amount in the payment entry, update each row in references with latest information before comparing amounts. If the user tries to submit another payment entry but the corresponding invoice has already been fully paid, the system would throw an error to let the user know. If the invoice has been already partly paid, the user would be told the same and would be asked to use the 'Get Outstanding Invoice' button to get the latest outstanding amount.

Unrelated: I discovered fetching documents for advance payment via payment entry form was also broken. Fixed in 1ca20b9

dj12djdjs · 2022-05-30T12:25:04Z

I'm not sure if the tests are failing from this PR. I'll have a further look today.

dj12djdjs · 2022-06-01T01:40:15Z

I really don't know why those two tests keep failing. They don't fail on my local machine.

codecov · 2022-06-06T14:21:05Z

Codecov Report

❗ No coverage uploaded for pull request base (develop@a3ea985). Click here to learn what that means.
The diff coverage is 89.47%.

Additional details and impacted files

@@            Coverage Diff             @@
##             develop   #31166   +/-   ##
==========================================
  Coverage           ?   64.11%           
==========================================
  Files              ?      811           
  Lines              ?    61870           
  Branches           ?        0           
==========================================
  Hits               ?    39669           
  Misses             ?    22201           
  Partials           ?        0

Impacted Files	Coverage Δ
...xt/accounts/doctype/payment_entry/payment_entry.py	`84.01% <89.47%> (ø)`

erpnext/accounts/doctype/payment_entry/test_payment_entry.py

dj12djdjs · 2022-06-13T22:57:33Z

@deepeshgarg007 I've added another check incase the a reference get's partially allocated between two payment entries.
I'm using the outstanding_amount to check this.
https://github.com/dj12djdjs/erpnext/blob/1ef44c815743d6c97dd7efe270730a4782f170af/erpnext/accounts/doctype/payment_entry/payment_entry.py#L174-L175

I'm a confused why get_payment_entry makes the reference rows in this way. For example I create:

Output:

Shouldn't the outstanding be the same as the sales invoice outstanding (100) and the allocated be 50 ?

stale · 2022-06-29T01:32:46Z

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

stale · 2022-07-15T00:34:19Z

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

stale · 2022-08-03T02:11:42Z

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

rtdany10 · 2022-08-19T13:39:42Z

@dj12djdjs @deepeshgarg007

rtdany10 · 2022-10-01T09:09:47Z

@dj12djdjs @deepeshgarg007 any update on this?

dj12djdjs · 2022-10-01T11:54:48Z

@rtdany10 I think my solution to this isn't getting accepted. I'll think about it and try submitting a different solution.

…nital creation.

… by cost center

erpnext/accounts/doctype/payment_entry/payment_entry.py

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

anandbaburajan · 2023-06-13T12:40:31Z

Thanks @dj12djdjs!

…31166) * test: payment entry over allocation. * fix: validate allocated_amount against latest outstanding amount. * fix: payment entry get outstanding documents for advance payments * fix: only fetch latest outstanding_amount. * fix: throw if reference is allocated * test: throw error if a reference has been partially allocated after inital creation. * chore: test name * fix: remove unused part of test * chore: linter * chore: more user friendly error messages * fix: only validate outstanding amount if partly paid and don't filter by cost center * chore: minor refactor for doc.cost_center Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 20de27d)

…31166) * test: payment entry over allocation. * fix: validate allocated_amount against latest outstanding amount. * fix: payment entry get outstanding documents for advance payments * fix: only fetch latest outstanding_amount. * fix: throw if reference is allocated * test: throw error if a reference has been partially allocated after inital creation. * chore: test name * fix: remove unused part of test * chore: linter * chore: more user friendly error messages * fix: only validate outstanding amount if partly paid and don't filter by cost center * chore: minor refactor for doc.cost_center Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 20de27d) # Conflicts: # erpnext/accounts/doctype/payment_entry/test_payment_entry.py

…31166) fix(accounts): validate payment entry references with latest data. (#31166) * test: payment entry over allocation. * fix: validate allocated_amount against latest outstanding amount. * fix: payment entry get outstanding documents for advance payments * fix: only fetch latest outstanding_amount. * fix: throw if reference is allocated * test: throw error if a reference has been partially allocated after inital creation. * chore: test name * fix: remove unused part of test * chore: linter * chore: more user friendly error messages * fix: only validate outstanding amount if partly paid and don't filter by cost center * chore: minor refactor for doc.cost_center Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 20de27d) Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>

…ackport #31166) (#35674) * fix(accounts): validate payment entry references with latest data. (#31166) * test: payment entry over allocation. * fix: validate allocated_amount against latest outstanding amount. * fix: payment entry get outstanding documents for advance payments * fix: only fetch latest outstanding_amount. * fix: throw if reference is allocated * test: throw error if a reference has been partially allocated after inital creation. * chore: test name * fix: remove unused part of test * chore: linter * chore: more user friendly error messages * fix: only validate outstanding amount if partly paid and don't filter by cost center * chore: minor refactor for doc.cost_center Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 20de27d) # Conflicts: # erpnext/accounts/doctype/payment_entry/test_payment_entry.py * chore: resolve conflicts * chore: resolve more conflicts * chore: don't validate allocated amount in case of donation --------- Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>

## [14.27.2](v14.27.1...v14.27.2) (2023-06-14) ### Bug Fixes * `enqueue_after_commit` wherever it makes sense (backport [#35588](#35588)) ([#35590](#35590)) ([e505516](e505516)) * `TypeError` in Closing Stock Balance ([32e5bbb](32e5bbb)) * **accounts:** validate payment entry references with latest data. ([#31166](#31166)) ([4add1b4](4add1b4)) * added process loss in job card ([6a21d61](6a21d61)) * allow user to set rounding loss allowance for accounts balance ([cf14858](cf14858)) * attribute error on payment reconciliation tool ([25b3c77](25b3c77)) * based on status_update.py update opportunity status to converted… ([#35145](#35145)) ([dee8275](dee8275)) * calculate wdv depr schedule properly for existing assets [v14] ([#35613](#35613)) ([feb5d00](feb5d00)) * conflicts ([2060a00](2060a00)) * CSS not applied to product title ([#35630](#35630)) ([2cf871c](2cf871c)) * don't set default payment amount in case of invoice return ([#35645](#35645)) ([79483cc](79483cc)) * Lower deduction certificate not getting applied ([#35667](#35667)) ([6f59fa9](6f59fa9)) * Make difference entry button not working ([#35622](#35622)) ([043815e](043815e)) * make showing taxes as table in print configurable (backport [#35672](#35672)) ([#35678](#35678)) ([f39ae9d](f39ae9d)) * Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report ([#35642](#35642)) ([81ef2ba](81ef2ba)) * Project in item-wise sales register ([#35596](#35596)) ([7737b90](7737b90)) * Stock Reconciliation document update while reposting ([8b617fb](8b617fb)) * test case ([7af0380](7af0380)) * Update de.csv ([#35278](#35278)) ([2077f6e](2077f6e)) * Validation for delivery date in Sales Order ([#35597](#35597)) ([4a8ce22](4a8ce22))

## [13.51.2](v13.51.1...v13.51.2) (2023-06-14) ### Bug Fixes * **accounts:** validate payment entry references with latest data. (backport [#31166](#31166)) ([#35674](#35674)) ([4d4f218](4d4f218)) * Asset Depreciation Ledger Report - Add Total Row Checkbox Enabled ([3831c79](3831c79)) * calculate wdv depr schedule properly for existing assets [v13] ([#35615](#35615)) ([97f4af8](97f4af8)) * CSS not applied to product title (backport [#35582](#35582)) ([#35635](#35635)) ([1b69b37](1b69b37)) * don't set default payment amount in case of invoice return (backport [#35645](#35645)) ([#35648](#35648)) ([8e3636f](8e3636f)) * Lower deduction certificate not getting applied ([#35667](#35667)) ([c2bf8e3](c2bf8e3)) * make showing taxes as table in print configurable ([#35672](#35672)) ([4c2c037](4c2c037)) * Project in item-wise sales register ([#35596](#35596)) ([9d5b500](9d5b500)) * savepoint policy assignment submission, log errors & inform the user about failures ([#35507](#35507)) ([4a35ff0](4a35ff0)) ### Performance Improvements * refactor `get_all_nodes` in Org Chart ([986a90e](986a90e))

ruchamahabal · 2023-06-16T06:26:07Z

Payment Entry against Employee Advance (HR) stopped functioning after this PR:
Tests missing for Payment Entry against Employee Advance. Only Employee Advance -> Journal Entry flow gets tested in HR. Will add tests

Fixed in: #35741

dj12djdjs marked this pull request as ready for review May 28, 2022 00:59

dj12djdjs requested review from marination, rohitwaghchaure, ankush, nextchamp-saqib and deepeshgarg007 as code owners May 28, 2022 00:59

deepeshgarg007 requested changes Jun 9, 2022

View reviewed changes

erpnext/accounts/doctype/payment_entry/test_payment_entry.py Outdated Show resolved Hide resolved

deepeshgarg007 added the accounts label Jun 10, 2022

stale bot added the inactive label Jun 29, 2022

dj12djdjs removed the inactive label Jun 29, 2022

stale bot added the inactive label Jul 15, 2022

stale bot closed this Jul 18, 2022

dj12djdjs reopened this Jul 18, 2022

stale bot removed the inactive label Jul 18, 2022

dj12djdjs requested a review from ruthra-kumar as a code owner July 19, 2022 01:14

stale bot added the inactive label Aug 3, 2022

stale bot closed this Aug 6, 2022

deepeshgarg007 reopened this Jun 12, 2023

stale bot removed the inactive label Jun 12, 2023

github-actions bot removed the accounts label Jun 12, 2023

dj12djdjs added 4 commits June 12, 2023 23:24

test: throw error if a reference has been partially allocated after i…

7d350ea

…nital creation.

chore: test name

0ab6b31

fix: remove unused part of test

479945e

chore: linter

86c1a80

anandbaburajan force-pushed the fix-31138 branch from 07999f6 to 86c1a80 Compare June 12, 2023 17:59

anandbaburajan added 3 commits June 12, 2023 23:29

Merge branch 'develop' into fix-31138

f35fe6e

chore: more user friendly error messages

fb1b046

fix: only validate outstanding amount if partly paid and don't filter…

a2b557b

… by cost center

anandbaburajan added backport version-13-hotfix backport version-14-hotfix backport to version 14 labels Jun 13, 2023

Merge branch 'develop' into fix-31138

a5a8c03

deepeshgarg007 previously approved these changes Jun 13, 2023

View reviewed changes

erpnext/accounts/doctype/payment_entry/payment_entry.py Outdated Show resolved Hide resolved

chore: minor refactor for doc.cost_center

e35395e

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

anandbaburajan dismissed deepeshgarg007’s stale review via e35395e June 13, 2023 11:25

Merge branch 'develop' into fix-31138

f40cc98

deepeshgarg007 merged commit 20de27d into frappe:develop Jun 13, 2023

This was referenced Jun 13, 2023

fix(accounts): validate payment entry references with latest data. (backport #31166) #35673

Merged

fix(accounts): validate payment entry references with latest data. (backport #31166) #35674

Merged

ruchamahabal mentioned this pull request Jun 27, 2023

test: payment entry against employee advance frappe/hrms#635

Merged

barredterra mentioned this pull request Jul 5, 2023

fix(Payment Entry): compare rounded amount #36011

Merged

ankush mentioned this pull request Oct 20, 2023

Complete version 15 changelog #37601

Closed

github-actions bot locked as resolved and limited conversation to collaborators Feb 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(accounts): validate payment entry references with latest data. #31166

fix(accounts): validate payment entry references with latest data. #31166

dj12djdjs commented May 27, 2022 •

edited by anandbaburajan

Loading

dj12djdjs commented May 30, 2022

dj12djdjs commented Jun 1, 2022

codecov bot commented Jun 6, 2022 •

edited

Loading

dj12djdjs commented Jun 13, 2022

stale bot commented Jun 29, 2022

stale bot commented Jul 15, 2022

stale bot commented Aug 3, 2022

rtdany10 commented Aug 19, 2022

rtdany10 commented Oct 1, 2022

dj12djdjs commented Oct 1, 2022

anandbaburajan commented Jun 13, 2023

ruchamahabal commented Jun 16, 2023 •

edited

Loading

fix(accounts): validate payment entry references with latest data. #31166

fix(accounts): validate payment entry references with latest data. #31166

Conversation

dj12djdjs commented May 27, 2022 • edited by anandbaburajan Loading

dj12djdjs commented May 30, 2022

dj12djdjs commented Jun 1, 2022

codecov bot commented Jun 6, 2022 • edited Loading

Codecov Report

dj12djdjs commented Jun 13, 2022

stale bot commented Jun 29, 2022

stale bot commented Jul 15, 2022

stale bot commented Aug 3, 2022

rtdany10 commented Aug 19, 2022

rtdany10 commented Oct 1, 2022

dj12djdjs commented Oct 1, 2022

anandbaburajan commented Jun 13, 2023

ruchamahabal commented Jun 16, 2023 • edited Loading

dj12djdjs commented May 27, 2022 •

edited by anandbaburajan

Loading

codecov bot commented Jun 6, 2022 •

edited

Loading

ruchamahabal commented Jun 16, 2023 •

edited

Loading