CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29428 from deepeshgarg007/shipping_rule_apply

Browse Source 
fix: Add shipping charges to taxes only if applicable
This commit is contained in:
Deepesh Garg
2022-01-29 12:56:49 +05:30
committed by GitHub
parent 5dd443eeb0 5f9fdba49e
commit ebe9599dda
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/shipping_rule/shipping_rule.py
View File

@@ -71,7 +71,8 @@ class ShippingRule(Document):
if doc.currency != doc.company_currency:
shipping_amount = flt(shipping_amount / doc.conversion_rate, 2)
self.add_shipping_rule_to_tax_table(doc, shipping_amount)
if shipping_amount:
self.add_shipping_rule_to_tax_table(doc, shipping_amount)
def get_shipping_amount_from_rules(self, value):
for condition in self.get("conditions"):