nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Linting issues

Browse Source
This commit is contained in:
Deepesh Garg
2021-06-05 13:21:03 +05:30
parent e8a78bd43d
commit 3646c301ed
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -294,15 +294,12 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
item.item_tax_template = r.message[item.name].item_tax_template; item.item_tax_template = r.message[item.name].item_tax_template;
item.item_tax_rate = r.message[item.name].item_tax_rate; item.item_tax_rate = r.message[item.name].item_tax_rate;
me.add_taxes_from_item_tax_template(item.item_tax_rate); me.add_taxes_from_item_tax_template(item.item_tax_rate);
} } else {
else {
item.item_tax_template = ""; item.item_tax_template = "";
item.item_tax_rate = "{}"; item.item_tax_rate = "{}";
} }
}); });
} }
this.frm.refresh_fields();
} }
}); });
} }
@@ -632,6 +629,8 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
tax.item_wise_tax_detail = JSON.stringify(tax.item_wise_tax_detail); tax.item_wise_tax_detail = JSON.stringify(tax.item_wise_tax_detail);
}); });
} }
this.frm.refresh_fields();
}, },
set_discount_amount: function() { set_discount_amount: function() {

2
erpnext/stock/get_item_details.py
View File

@@ -509,7 +509,7 @@ def _get_item_tax_template(args, taxes, out=None, for_validate=False):
# do not change if already a valid template # do not change if already a valid template
if args.get('item_tax_template') in taxes: if args.get('item_tax_template') in taxes:
return arg.get('item_tax_template') return args.get('item_tax_template')
for tax in taxes: for tax in taxes:
if cstr(tax.tax_category) == cstr(args.get("tax_category")): if cstr(tax.tax_category) == cstr(args.get("tax_category")):