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.

Sign up for GitHub

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

Jump to bottom

fix: Add shipping charges to taxes only if applicable #29428

Merged
merged 2 commits into from
Jan 29, 2022
Merged

fix: Add shipping charges to taxes only if applicable #29428

merged 2 commits into from
Jan 29, 2022

Conversation

deepeshgarg007
Copy link
Member

@deepeshgarg007 deepeshgarg007 commented Jan 24, 2022 •
edited
Loading

Recently server-side implementation for shipping rule was added. For old invoices generated before this change following error was seen when making a subsequent document (Sales Invoice, Delivery Note, etc) from it.

 File "apps/erpnext/erpnext/controllers/taxes_and_totals.py", line 368, in get_current_tax_amount
  self.set_item_wise_tax(item, tax, tax_rate, current_tax_amount)
 File "apps/erpnext/erpnext/controllers/taxes_and_totals.py", line 376, in set_item_wise_tax
  if tax.item_wise_tax_detail.get(key):
AttributeError: 'NoneType' object has no attribute 'get'

@deepeshgarg007 deepeshgarg007 added the Skip Manual Testing The changes in this PR does not require manual testing label Jan 29, 2022
@deepeshgarg007
Copy link
Member Author

@Mergifyio backport develop

@deepeshgarg007 deepeshgarg007 merged commit ebe9599 into frappe:version-13-hotfix Jan 29, 2022
@mergify mergify bot mentioned this pull request Jan 29, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jan 29, 2022

backport develop

✅ Backports have been created

deepeshgarg007 added a commit that referenced this pull request Jan 29, 2022
@deepeshgarg007
Merge pull request #29501 from frappe/mergify/bp/develop/pr-29428
36bff95 
fix: Add shipping charges to taxes only if applicable (backport #29428)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nextchamp-saqib nextchamp-saqib Awaiting requested review from nextchamp-saqib

Assignees
No one assigned
Labels
Skip Manual Testing The changes in this PR does not require manual testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@deepeshgarg007