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: fetch/change tax template on basis of base_net_rate instead of net_rate #39448

Merged
merged 2 commits into from
Feb 1, 2024

Conversation

divyam-mistry
Copy link
Contributor

@divyam-mistry divyam-mistry commented Jan 18, 2024

(required for fixing this issue: resilient-tech/india-compliance/#1595)

Before

  • Item Tax Templates

image

  • Rate provided in INR

image

  • Taxes applied as per conditions (5%)

image

  • Change currency to USD

image

  • Taxes applied WRONGLY (5% instead of 12%)

image

After

  • Item Tax Templates (as above)
  • Rate provided in INR (as above)
  • Taxes applied as per conditions (as above)
  • Change currency to USD (as above)
  • Taxes applied CORRECTLY (12%)

image

@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. stock labels Jan 18, 2024
@divyam-mistry divyam-mistry marked this pull request as ready for review January 18, 2024 08:34
Copy link

codecov bot commented Jan 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5e71d6a) 60.13% compared to head (d599b36) 60.12%.
Report is 1 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #39448      +/-   ##
===========================================
- Coverage    60.13%   60.12%   -0.01%     
===========================================
  Files          758      758              
  Lines        70952    70952              
===========================================
- Hits         42666    42663       -3     
- Misses       28286    28289       +3     
Files Coverage Δ
...xt/accounts/doctype/payment_entry/payment_entry.py 79.96% <100.00%> (ø)
erpnext/controllers/taxes_and_totals.py 95.17% <ø> (ø)
erpnext/stock/get_item_details.py 83.04% <100.00%> (ø)

... and 4 files with indirect coverage changes

@deepeshgarg007
Copy link
Member

@Mergifyio update

Copy link
Contributor

mergify bot commented Feb 1, 2024

update

❌ Mergify doesn't have permission to update

For security reasons, Mergify can't update this pull request. Try updating locally.
GitHub response: refusing to allow a GitHub App to create or update workflow .github/workflows/linters.yml without workflows permission

@deepeshgarg007
Copy link
Member

@Mergifyio Update

Copy link
Contributor

mergify bot commented Feb 1, 2024

Update

❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚.

@deepeshgarg007 deepeshgarg007 merged commit e9fe10c into frappe:develop Feb 1, 2024
19 checks passed
mergify bot pushed a commit that referenced this pull request Feb 1, 2024
…et_rate (#39448)

fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e9fe10c)
deepeshgarg007 pushed a commit that referenced this pull request Feb 3, 2024
…et_rate (#39448)

fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448)

fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e9fe10c)

Co-authored-by: Divyam Mistry <73271406+divyam-mistry@users.noreply.github.com>
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))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants