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

Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix

Browse Source 
fix: Update item tax only if item code available
This commit is contained in:
Deepesh Garg 2020-07-03 21:25:28 +05:30 committed by GitHub
commit 62181707ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/regional/united_arab_emirates/utils.py
View File

@ -11,14 +11,17 @@ def update_itemised_tax_data(doc):
for row in doc.items: for row in doc.items:
tax_rate = 0.0 tax_rate = 0.0
item_tax_rate = frappe.parse_json(row.item_tax_rate) item_tax_rate = 0.0
if row.item_tax_rate:
item_tax_rate = frappe.parse_json(row.item_tax_rate)
# First check if tax rate is present # First check if tax rate is present
# If not then look up in item_wise_tax_detail # If not then look up in item_wise_tax_detail
if item_tax_rate: if item_tax_rate:
for account, rate in iteritems(item_tax_rate): for account, rate in iteritems(item_tax_rate):
tax_rate += rate tax_rate += rate
elif itemised_tax.get(row.item_code): elif row.item_code and itemised_tax.get(row.item_code):
tax_rate = sum([tax.get('tax_rate', 0) for d, tax in itemised_tax.get(row.item_code).items()]) tax_rate = sum([tax.get('tax_rate', 0) for d, tax in itemised_tax.get(row.item_code).items()])
row.tax_rate = flt(tax_rate, row.precision("tax_rate")) row.tax_rate = flt(tax_rate, row.precision("tax_rate"))