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: incorrect TCS amount while customer has advance payment #35397

Merged

Conversation

ruthra-kumar
Copy link
Member

Advance Payments that were reconciled to Invoices were considered for TCS calculation leading to incorrect TCS amount. Fixing in this PR.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 23, 2023
@codecov
Copy link

codecov bot commented May 23, 2023

Codecov Report

Merging #35397 (7adf029) into develop (1587ce3) will increase coverage by 0.08%.
The diff coverage is 100.00%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #35397      +/-   ##
===========================================
+ Coverage    63.82%   63.91%   +0.08%     
===========================================
  Files          813      814       +1     
  Lines        60215    60483     +268     
===========================================
+ Hits         38432    38656     +224     
- Misses       21783    21827      +44     
Impacted Files Coverage Δ
...x_withholding_category/tax_withholding_category.py 85.65% <100.00%> (+0.94%) ⬆️

... and 15 files with indirect coverage changes

@ruthra-kumar ruthra-kumar removed the needs-tests This PR needs automated unit-tests. label May 29, 2023
@deepeshgarg007 deepeshgarg007 marked this pull request as ready for review June 10, 2023 14:18
@deepeshgarg007 deepeshgarg007 self-requested a review as a code owner June 10, 2023 14:18
@deepeshgarg007 deepeshgarg007 merged commit dcbd7d5 into frappe:develop Jun 10, 2023
1 check passed
@ruthra-kumar ruthra-kumar deleted the fix_incorrect_tcs_calculation branch June 14, 2023 16:02
@deepeshgarg007 deepeshgarg007 added the backport version-14-hotfix backport to version 14 label Jul 4, 2023
mergify bot pushed a commit that referenced this pull request Jul 4, 2023
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation

(cherry picked from commit dcbd7d5)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
ruthra-kumar added a commit that referenced this pull request Jul 4, 2023
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation

(cherry picked from commit dcbd7d5)
ruthra-kumar added a commit that referenced this pull request Jul 4, 2023
* fix: incorrect TCS amount while customer has advance payment

* test: only unallocated advance should for threshold breach validation

(cherry picked from commit dcbd7d5)
ruthra-kumar added a commit that referenced this pull request Jul 10, 2023
…-35397

fix: incorrect TCS amount while customer has advance payment (backport #35397)
frappe-pr-bot pushed a commit that referenced this pull request Jul 11, 2023
# [14.30.0](v14.29.2...v14.30.0) (2023-07-11)

### Bug Fixes

* accepted warehouse and rejected warehouse can't be same ([5d77e3c](5d77e3c))
* also check on_hold ([#35910](#35910)) ([59b3277](59b3277))
* conflicts ([e55a264](e55a264))
* conflicts ([79f9785](79f9785))
* conflicts ([a178e66](a178e66))
* conflicts ([6459c28](6459c28))
* deferred accounting entries on accounts frozen ([#35978](#35978)) ([573183c](573183c))
* Delivery Note return valuation ([296f312](296f312))
* German translations ([#35990](#35990)) ([b7b864e](b7b864e))
* incorrect status in MR created from PP (backport [#36085](#36085)) ([#36086](#36086)) ([6dc7a19](6dc7a19))
* incorrect TCS amount while customer has advance payment ([#35397](#35397)) ([2a4bbf3](2a4bbf3))
* labels and translations ([#35963](#35963)) ([04b1d45](04b1d45))
* Opening balance in presentation currency in Trial Balance report ([#36036](#36036)) ([39e38bf](39e38bf))
* payment entry `voucher_type` error ([#35779](#35779)) ([f3af0b2](f3af0b2))
* **Payment Entry:** compare rounded amount ([#36011](#36011)) ([d80b0aa](d80b0aa))
* possible type error on ERR creation ([0569899](0569899))
* precision causing outstanding issue on partly paid invoices ([#36030](#36030)) ([3e711e8](3e711e8))
* Share ledger showing cancelled docs ([#35993](#35993)) ([5102d0c](5102d0c))
* Validate for missing expense account ([#36078](#36078)) ([f4f886c](f4f886c))
* Vietnamese translation of "Company" ([#35887](#35887)) ([e443e6c](e443e6c))

### Features

* Closing balance for period closing and reporting ([#34257](#34257)) ([ebf3c01](ebf3c01))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 20, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants