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: incorrectly treating normal payment as advance #38437

Merged

Conversation

ruthra-kumar
Copy link
Member

@ruthra-kumar ruthra-kumar commented Nov 30, 2023

With book_advance_payments_in_separate_party_account enabled in company master, making full payment against an invoice, posts duplicate ledger entries that causes confusion.

This happens as the logic to handle moving amount from Liability account to a normal Debtors/Creditors account incorrectly Debit's and Credit's the same account due to this flag book_advance_payments_in_separate_party_account.
Screenshot 2023-11-30 at 11 20 55 AM

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 30, 2023
Copy link

codecov bot commented Dec 1, 2023

Codecov Report

Merging #38437 (e7d48ec) into develop (961bdf0) will decrease coverage by 0.01%.
Report is 74 commits behind head on develop.
The diff coverage is 12.49%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #38437      +/-   ##
===========================================
- Coverage    60.15%   60.15%   -0.01%     
===========================================
  Files          760      760              
  Lines        69470    69475       +5     
===========================================
+ Hits         41791    41794       +3     
- Misses       27679    27681       +2     
Files Coverage Δ
..._receivable_summary/accounts_receivable_summary.py 92.23% <100.00%> (ø)
erpnext/accounts/utils.py 73.79% <ø> (ø)
erpnext/controllers/sales_and_purchase_return.py 87.26% <100.00%> (ø)
erpnext/controllers/subcontracting_controller.py 89.55% <100.00%> (ø)
erpnext/hooks.py 100.00% <100.00%> (ø)
erpnext/__init__.py 70.00% <0.00%> (ø)
...unts/report/purchase_register/purchase_register.py 86.33% <50.00%> (ø)
...t/accounts/report/sales_register/sales_register.py 70.35% <50.00%> (ø)
...tds_computation_summary/tds_computation_summary.py 0.00% <0.00%> (ø)
...ctype/bank_account_subtype/bank_account_subtype.py 71.42% <50.00%> (ø)
... and 267 more

@deepeshgarg007 deepeshgarg007 merged commit dd39da0 into frappe:develop Dec 4, 2023
13 checks passed
mergify bot pushed a commit that referenced this pull request Dec 4, 2023
fix: treating normal payment as advance
(cherry picked from commit dd39da0)
ruthra-kumar added a commit that referenced this pull request Dec 4, 2023
…-38437

fix: incorrectly treating normal payment as advance (backport #38437)
frappe-pr-bot pushed a commit that referenced this pull request Dec 5, 2023
# [15.5.0](v15.4.0...v15.5.0) (2023-12-05)

### Bug Fixes

* `AttributeError` while saving Purchase Invoice (backport [#38482](#38482)) ([#38490](#38490)) ([f6c48e8](f6c48e8))
* `OperationalError` while selecting Serial No in `Warranty Claim` (backport [#38394](#38394)) ([#38414](#38414)) ([80afeca](80afeca))
* Add missing french translations ([#38368](#38368)) ([b5c89ec](b5c89ec))
* better overlap logic for job card (backport [#38432](#38432)) ([#38522](#38522)) ([2a9e843](2a9e843))
* consider the `Valuation Method` while picking incorrect SLE (backport [#38592](#38592)) ([#38595](#38595)) ([9d45bbd](9d45bbd))
* debit credit mismatch in multi-currecy asset purchase receipt ([#38342](#38342)) ([b9f26ae](b9f26ae))
* don't consider cancelled entries ([#38401](#38401)) ([0a29dbe](0a29dbe))
* don't show non-stock items in Stock Analytics report (backport [#38543](#38543)) ([#38545](#38545)) ([282a5b2](282a5b2))
* don't update previous doc on rate change (backport [#38493](#38493)) ([#38524](#38524)) ([0aa96f7](0aa96f7))
* exclude `invoice_doctypes` from party advance ([927538f](927538f))
* exploded items in Subcontracting Receipt (backport [#38441](#38441)) ([#38445](#38445)) ([e066698](e066698))
* german translations for Lost Quotations (backport [#38435](#38435)) ([#38516](#38516)) ([33c59a2](33c59a2))
* get dynamic link with parenttype contact ([cb9589b](cb9589b))
* incorrect customer outstanding amount ([#38475](#38475)) ([98fe89a](98fe89a))
* incorrect material request quantity in Production Plan (backport [#38566](#38566)) ([#38579](#38579)) ([145ed3a](145ed3a))
* incorrect ordered qty for Subcontracting Order ([#38415](#38415)) ([71fe2bc](71fe2bc))
* incorrect requested quantity for the subcontracting order ([abe3e41](abe3e41))
* incorrectly treating normal payment as advance ([#38437](#38437)) ([246dd74](246dd74))
* item group filter in sales person wise report ([602f6ca](602f6ca))
* make create button translatable ([#38165](#38165)) ([95f9cc9](95f9cc9))
* **regional:** use net figures for sales calc ([#38260](#38260)) ([4a243ce](4a243ce))
* remove hardcoded, implicit rounding loss allowance ([4baf796](4baf796))
* scan for serial or batch in bundle (backport [#38534](#38534)) ([#38552](#38552)) ([88d2a8d](88d2a8d))
* set cwip account before asset tests ([de7e1ab](de7e1ab))
* show item name as title instead of item group in BOM (backport [#38478](#38478)) ([#38481](#38481)) ([8e57862](8e57862))
* show party instead of party name where naming series not set ([f120dc5](f120dc5))
* sql error while filtering on finance book in GL ([3779943](3779943))
* **test:** use correct account type for testing ([8b6eb35](8b6eb35))
* unset discount amount based on coupon code ([0e50e77](0e50e77))
* use `docstatus` instead of `status` (backport [#38439](#38439)) ([#38443](#38443)) ([a50e872](a50e872))
* use predefined onload property `load_after_mapping` ([#38209](#38209)) ([4a558b7](4a558b7))
* **ux:** make valuation field read only when it can't be modified (backport [#38450](#38450)) ([#38464](#38464)) ([2d9ba88](2d9ba88))
* validation error has not throw for the batch (backport [#38494](#38494)) ([#38502](#38502)) ([c797c53](c797c53))

### Features

* `Company` filter in `Stock Ledger Variance` report (backport [#38553](#38553)) ([#38574](#38574)) ([02d7dd8](02d7dd8))
* add customer group filter in sales register ([#38365](#38365)) ([185b715](185b715))
* auto create PR on SCR submission (backport [#38290](#38290)) ([#38428](#38428)) ([7005d51](7005d51))
* enable automatic type annotations (backport [#38452](#38452)) ([#38454](#38454)) ([5e6a4d2](5e6a4d2))
* shift depreciation for assets (backport [#38327](#38327)) ([#38417](#38417)) ([12ad1ec](12ad1ec))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-15-hotfix needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants