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

fix: AR/AP report based on payment terms #36574

Merged
merged 2 commits into from
Aug 14, 2023

Conversation

deepeshgarg007
Copy link
Member

In a specific scenario when the Accounts Receivable/Payable report is viewed based on payment terms the outstanding amount shows up as negative

Exact steps to follow to replicate the issue

  • Create an advance payment against a customer (ex: 15000)
  • Make a sales invoice for 30000 and allocate the 15000 advance (outstanding will remain as 15000)
  • Add payment terms, split into two terms of 50-50 percent (7500 each)
  • Make a payment against the invoice of 8500 to knock off the first term and partially the second term

Check the AR report now based on payment terms, it should not show the outstanding as negative

Note to reviewer: Check for multi-currency scenarios as well

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 10, 2023
@ruthra-kumar ruthra-kumar self-assigned this Aug 10, 2023
@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Merging #36574 (4214f2c) into develop (9db8769) will increase coverage by 0.01%.
Report is 7 commits behind head on develop.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #36574      +/-   ##
===========================================
+ Coverage    64.70%   64.71%   +0.01%     
===========================================
  Files          791      791              
  Lines        61572    61622      +50     
===========================================
+ Hits         39838    39881      +43     
- Misses       21734    21741       +7     
Files Changed Coverage Δ
.../report/accounts_receivable/accounts_receivable.py 71.11% <100.00%> (+0.05%) ⬆️

... and 5 files with indirect coverage changes

@ruthra-kumar
Copy link
Member

LGTM

@deepeshgarg007 deepeshgarg007 merged commit fbb5058 into frappe:develop Aug 14, 2023
13 of 14 checks passed
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Aug 14, 2023
mergify bot pushed a commit that referenced this pull request Aug 14, 2023
* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms

(cherry picked from commit fbb5058)
deepeshgarg007 added a commit that referenced this pull request Aug 14, 2023
fix: AR/AP report based on payment terms (#36574)

* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms

(cherry picked from commit fbb5058)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Aug 16, 2023
# [14.35.0](v14.34.3...v14.35.0) (2023-08-16)

### Bug Fixes

* Allow backdated repayment cancels for term loans ([1377cf4](1377cf4))
* allow negative stock condition for batch item ([#36586](#36586)) ([ee04c6d](ee04c6d))
* AR/AP report based on payment terms ([#36574](#36574)) ([ac0fff7](ac0fff7))
* better remarks on Cr note created by Reconciliation ([5443592](5443592))
* Button Alignment center in hero slider ([#36607](#36607)) ([b131f70](b131f70)), closes [#36561](#36561)
* cr/dr note should be posted for exc gain/loss ([349601b](349601b))
* disallow mulitple SO with same PO No ([b901cfd](b901cfd))
* don't show disabled items in `Item Shortage Report` (backport [#36550](#36550)) ([#36571](#36571)) ([19cfcea](19cfcea))
* fetch `Stock UOM` from Item if not set (backport [#36606](#36606)) ([#36617](#36617)) ([8b13185](8b13185))
* Group Account total not showing in Financial Statements ([2912648](2912648))
* incorrect available qty for backdated stock reco with batch ([#36581](#36581)) ([2800ad3](2800ad3))
* incorrect gain/loss on allocation change on reconciliation tool ([39c439d](39c439d))
* Make default sales update frequency as monthly instead of each transaction ([4ca1f3b](4ca1f3b))
* move company rename to long queue ([8083c0b](8083c0b))
* precision issue while submitting the stock entry ([#36575](#36575)) ([a864e07](a864e07))
* re-add permission that was unintentionally removed ([#36663](#36663)) ([99777d3](99777d3))
* **RFQ:** link to supplier portal ([eb2f68e](eb2f68e))
* standard formula to calculate the "difference" ([#36612](#36612)) ([716d5c0](716d5c0))
* Tax withholding post LDC limit consumed ([#36611](#36611)) ([1deebe8](1deebe8))
* **test:** replace hardcoded reference to adv with dynamic one ([2e6bfa3](2e6bfa3))
* **test:** test case breakage in Github Actions ([3542df7](3542df7))
* unhide `uom` and `stock_uom` fields in print view ([b49309c](b49309c))
* validation blocks partial payment for SO and PO ([ce08f03](ce08f03))
* wrap none type rate under flt (backport [#36602](#36602)) ([#36604](#36604)) ([63c061e](63c061e))
* wrong currency on financial-statement based reports ([#36524](#36524)) ([3044f46](3044f46))

### Features

* add voucher totals in tds payable report ([#36568](#36568)) ([90b390c](90b390c))
* daily asset depreciation method ([#36587](#36587)) ([2918127](2918127))
* Reallow customizing company abbreviation on setup. ([#36646](#36646)) ([ca34b63](ca34b63))

### Performance Improvements

* **invoice:** Faster return amount query (backport [#36556](#36556)) ([#36557](#36557)) ([fe41be9](fe41be9))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants