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: use base_tax_amount_after_discount_amount instead of tax_amount #2144

Merged
merged 2 commits into from
May 25, 2024

Conversation

ljain112
Copy link
Collaborator

@ljain112 ljain112 commented May 20, 2024

Closes: #2143

Tax difference was calculated on document currency but taxes were set on the basis of company currency.
image

@ljain112 ljain112 marked this pull request as draft May 20, 2024 12:58
@vorasmit vorasmit added the p1 label May 23, 2024
Copy link

codecov bot commented May 23, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 65.57%. Comparing base (9c3341c) to head (672b014).
Report is 23 commits behind head on develop.

Files Patch % Lines
...ndia_compliance/gst_india/overrides/transaction.py 33.33% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2144      +/-   ##
===========================================
+ Coverage    65.56%   65.57%   +0.01%     
===========================================
  Files          105      105              
  Lines         8822     8834      +12     
===========================================
+ Hits          5784     5793       +9     
- Misses        3038     3041       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mergify mergify bot merged commit d77848f into resilient-tech:develop May 25, 2024
11 of 12 checks passed
mergify bot pushed a commit that referenced this pull request May 25, 2024
…2144)

Closes: #2143

Tax difference was calculated on document currency but taxes were set on the basis of company currency.
![image](https://github.com/resilient-tech/india-compliance/assets/108322669/77d4c0b4-e3e0-494f-b604-73d6b944b5af)

(cherry picked from commit d77848f)
mergify bot pushed a commit that referenced this pull request May 25, 2024
…2144)

Closes: #2143

Tax difference was calculated on document currency but taxes were set on the basis of company currency.
![image](https://github.com/resilient-tech/india-compliance/assets/108322669/77d4c0b4-e3e0-494f-b604-73d6b944b5af)

(cherry picked from commit d77848f)
mergify bot added a commit that referenced this pull request May 25, 2024
…tfix/pr-2144

fix: use base_tax_amount_after_discount_amount instead of tax_amount (backport #2144)
mergify bot added a commit that referenced this pull request May 25, 2024
…tfix/pr-2144

fix: use base_tax_amount_after_discount_amount instead of tax_amount (backport #2144)
india-compliance-bot added a commit that referenced this pull request May 27, 2024
## [14.26.6](v14.26.5...v14.26.6) (2024-05-27)

### Bug Fixes

* add `match_found` in reconciliation status and patch ([#2057](#2057)) ([5d419fb](5d419fb)), closes [#2054](#2054)
* add description and remove progress ([f0e0577](f0e0577))
* change download history while change in company_gstin from ([208d690](208d690))
* change import history as per return type ([d036bca](d036bca))
* check if data found and update progress ([b684da3](b684da3))
* complete minor todo's and fixes, update links to documentation ([#2121](#2121)) ([96dd39d](96dd39d)), closes [/github.com/resilient-tech/india-compliance/blob/develop/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py#L1367](https://github.com//github.com/resilient-tech/india-compliance/blob/develop/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py/issues/L1367)
* condition for b2cl in gstr-1 data ([bae56ef](bae56ef))
* exclude place of supply for impg in purchase reco ([8188a45](8188a45))
* exclude same gstin transactions from gstr3b ([#2158](#2158)) ([7633ebf](7633ebf))
* floating point error for tax rounding ([2a55067](2a55067))
* GST inward supply should be updated every time the linked document is canceled ([#2147](#2147)) ([35dd205](35dd205))
* handle empty GSTIN value in `get_pan_level_data` method ([#2172](#2172)) ([9be09ce](9be09ce)), closes [#2115](#2115)
* handle empty place of supply in GST Sales Register Beta Report ([2e2610a](2e2610a))
* include items without HSN Code in outward hsn summary ([62ac2a1](62ac2a1))
* include Nil-Rated Exports in GSTR-1 ([#2150](#2150)) ([e466bfc](e466bfc))
* include Nil-Rated Exports in GSTR-1 (backport [#2150](#2150)) ([#2164](#2164)) ([8eb88bb](8eb88bb))
* non-group tds payable account for tax withholding category ([dd5f97e](dd5f97e))
* Purchase Reconciliation data not generated error handling ([#2145](#2145)) ([77cf3f7](77cf3f7))
* remove extra calculation ([659dfd5](659dfd5))
* support custom print format for e-Waybill ([cb7fabf](cb7fabf))
* test case ([c08e091](c08e091))
* update tax rounding difference in the last item ([b987401](b987401))
* use base_tax_amount_after_discount_amount instead of tax_amount ([#2144](#2144)) ([9d6e7b5](9d6e7b5)), closes [#2143](#2143)
india-compliance-bot added a commit that referenced this pull request May 27, 2024
## [15.7.5](v15.7.4...v15.7.5) (2024-05-27)

### Bug Fixes

* add `match_found` in reconciliation status and patch ([#2057](#2057)) ([127ae4e](127ae4e)), closes [#2054](#2054)
* add description and remove progress ([43e92a8](43e92a8))
* change download history while change in company_gstin from ([5a7f374](5a7f374))
* change import history as per return type ([fb200a8](fb200a8))
* check if data found and update progress ([a0ae06a](a0ae06a))
* complete minor todo's and fixes, update links to documentation ([#2121](#2121)) ([ea8cfd0](ea8cfd0)), closes [/github.com/resilient-tech/india-compliance/blob/develop/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py#L1367](https://github.com//github.com/resilient-tech/india-compliance/blob/develop/india_compliance/gst_india/doctype/purchase_reconciliation_tool/__init__.py/issues/L1367)
* condition for b2cl in gstr-1 data ([782eb54](782eb54))
* exclude place of supply for impg in purchase reco ([47a6c5e](47a6c5e))
* exclude same gstin transactions from gstr3b ([#2158](#2158)) ([0cd8d2b](0cd8d2b))
* floating point error for tax rounding ([87ac0fd](87ac0fd))
* GST inward supply should be updated every time the linked document is canceled ([#2147](#2147)) ([3cba75b](3cba75b))
* handle empty GSTIN value in `get_pan_level_data` method ([#2172](#2172)) ([d1537fb](d1537fb)), closes [#2115](#2115)
* handle empty place of supply in GST Sales Register Beta Report ([c20e3ac](c20e3ac))
* **ic page:** theme of ic page similar to v15 ([710911c](710911c))
* include items without HSN Code in outward hsn summary ([50796e4](50796e4))
* include Nil-Rated Exports in GSTR-1 ([#2150](#2150)) ([0d98174](0d98174))
* non-group tds payable account for tax withholding category ([0293d74](0293d74))
* Purchase Reconciliation data not generated error handling ([#2145](#2145)) ([3c18835](3c18835))
* remove extra calculation ([05f8c79](05f8c79))
* rename variable to follow Erpnext naming ([e7fe94a](e7fe94a))
* resolved discrepancy in function arguments for depreciation calcu… ([#2159](#2159)) ([81a5690](81a5690))
* support custom print format for e-Waybill ([4cd634a](4cd634a))
* test case ([2c6efed](2c6efed))
* update tax rounding difference in the last item ([5a4f44a](5a4f44a))
* use base_tax_amount_after_discount_amount instead of tax_amount ([#2144](#2144)) ([0873cfd](0873cfd)), closes [#2143](#2143)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Should we use tax_amount_after_discount_amount instead of tax amount for calculations ?
2 participants