Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:Add shipping charges to taxes only if applicable

Browse Source 
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
This commit is contained in:
Deepesh Garg 2022-01-24 15:59:38 +05:30 committed by mergify-bot
parent 452a809ef4
commit 2bf405d44c
1 changed files with 2 additions and 1 deletions
Show Stats 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"):