fix: correctly calculate diff amount for included taxes #39655
Merged
Conversation
This file contains 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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #39655 +/- ##
========================================
Coverage 60.12% 60.13%
========================================
Files 758 758
Lines 70951 70952 +1
========================================
+ Hits 42662 42666 +4
+ Misses 28289 28286 -3
|
GursheenK
requested review from
deepeshgarg007 and
ruthra-kumar
as code owners
mergify bot
pushed a commit
that referenced
this pull request
Feb 1, 2024
(cherry picked from commit 772f540)
mergify bot
pushed a commit
that referenced
this pull request
Feb 1, 2024
(cherry picked from commit 772f540)
ruthra-kumar
added a commit
that referenced
this pull request
Feb 1, 2024
…-39655 fix: correctly calculate diff amount for included taxes (backport #39655)
ruthra-kumar
added a commit
that referenced
this pull request
Feb 1, 2024
…-39655 fix: correctly calculate diff amount for included taxes (backport #39655)
GursheenK
added
backport
deepeshgarg007
pushed a commit
that referenced
this pull request
Feb 5, 2024
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 5, 2024
## [14.61.4](v14.61.3...v14.61.4) (2024-02-05) ### Bug Fixes * correctly calculate diff amount for included taxes ([#39655](#39655)) ([33ae0fa](33ae0fa))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 6, 2024
# [14.62.0](v14.61.4...v14.62.0) (2024-02-06) ### Bug Fixes * Blanket Order Ordered Quantity (backport [#39725](#39725)) ([#39738](#39738)) ([44c09de](44c09de)) * correctly calculate diff amount for included taxes ([#39655](#39655)) ([350b2cd](350b2cd)) * don't overwrite existing terms in transaction ([#39519](#39519)) ([e49f8d5](e49f8d5)) * Exchange rate on MR to PO creation for muticurrency POs ([#39646](#39646)) ([4dc5d9a](4dc5d9a)) * incorrect landed cost voucher amount ([4a609d8](4a609d8)) * remove applied pricing rule on qty change (backport [#39688](#39688)) ([#39736](#39736)) ([46ac4f4](46ac4f4)) * show warehouse title field in sales docs (backport [#39746](#39746)) ([#39754](#39754)) ([a6067c6](a6067c6)) ### Features * copy emails from lead to customer ([#38647](#38647)) ([7952bf4](7952bf4)) * New financial views - Growth and margin views for P&L and balance sheet (backport [#39588](#39588)) ([#39601](#39601)) ([3808ddb](3808ddb)) ### Performance Improvements * memory consumption for the stock balance report ([#39626](#39626)) ([b32848d](b32848d)) * Move dimension validation out of GL Entry doctype ([#39730](#39730)) ([7691256](7691256)) * timeout for auto material request through reorder level ([85e6b39](85e6b39)) * timeout while submitting the purchase receipt entry ([a1a70bb](a1a70bb)) ### Reverts * Revert "feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)" ([f01308b](f01308b)), closes [#39588](#39588)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 6, 2024
# [15.12.0](v15.11.1...v15.12.0) (2024-02-06) ### Bug Fixes * Blanket Order Ordered Quantity (backport [#39725](#39725)) ([#39739](#39739)) ([b126720](b126720)) * conditionally display show btn setting ([e931432](e931432)) * correctly calculate diff amount for included taxes ([#39655](#39655)) ([7f4cd3c](7f4cd3c)) * do not throw validation for cancelled sle ([02f56ee](02f56ee)) * don't overwrite existing terms in transaction ([dcdd3e8](dcdd3e8)) * Exchange rate on MR to PO creation for muticurrency POs ([#39646](#39646)) ([29eb090](29eb090)) * fetch/change tax template on basis of base_net_rate instead of net_rate ([#39448](#39448)) ([d7c7748](d7c7748)) * incorrect landed cost voucher amount ([a40864d](a40864d)) * out of range for valuation_rate column in SE (backport [#39687](#39687)) ([#39691](#39691)) ([41e4632](41e4632)) * Percentage handling in queries ([#39692](#39692)) ([e76f598](e76f598)) * **portal:** show PO pay button if payments installed ([cea4ed6](cea4ed6)) * Pricing rule application/removal on qty change ([#39084](#39084)) ([f310707](f310707)) * production plan date filters for orders (backport [#39702](#39702)) ([#39720](#39720)) ([3eac436](3eac436)) * remove applied pricing rule on qty change (backport [#39688](#39688)) ([#39737](#39737)) ([f246684](f246684)) * remove file from the disk after the completion of reposting ([b582e9c](b582e9c)) * show warehouse title field in sales docs (backport [#39746](#39746)) ([#39755](#39755)) ([53992de](53992de)) * update company in serial no doc (backport [#39733](#39733)) ([#39747](#39747)) ([00e86bf](00e86bf)) * use old serial / batch fields to make serial batch bundle ([282c19e](282c19e)) * **work order:** resolve type error during job card creation (backport [#39713](#39713)) ([#39714](#39714)) ([5fe40ac](5fe40ac)) ### Features * copy emails from lead to customer ([#38647](#38647)) ([986273b](986273b)) * make material request for job card from workstation dashboard ([3bef12c](3bef12c)) * Period-wise closing entries for TB ([#39712](#39712)) ([1822325](1822325)) * reference for POS SI payments ([#39523](#39523)) ([4ee8cf3](4ee8cf3)) * visual plant floor ([75bd1e6](75bd1e6)) ### Performance Improvements * memory consumption for the stock balance report ([#39626](#39626)) ([5e29aab](5e29aab)) * Move dimension validation out of GL Entry doctype ([#39730](#39730)) ([451c288](451c288)) * timeout for auto material request through reorder level ([1b2831b](1b2831b)) * timeout while submitting the purchase receipt entry ([55a8326](55a8326))
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.
The difference amount for payments get overwritten when saved and included taxes are reduced instead of getting added to the difference amount for payment type Receive.