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

fix: Item Tax Template check on company field

Browse Source
This commit is contained in:
mohammadahmad1990 2020-06-18 23:16:16 +05:00
parent 015910b4c4
commit ad3d44d622
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/item_tax/item_tax.json
View File

@ -41,12 +41,13 @@
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"options": "Company" "options": "Company",
"read_only": 1
} }
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2020-06-18 02:30:44.610171", "modified": "2020-06-18 22:53:44.546967",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item Tax", "name": "Item Tax",

2
erpnext/stock/get_item_details.py
View File

@ -413,7 +413,7 @@ def get_item_tax_info(company, tax_category, item_codes):
continue continue
out[item_code] = {} out[item_code] = {}
item = frappe.get_cached_doc("Item", item_code) item = frappe.get_cached_doc("Item", item_code)
get_item_tax_template({"tax_category": tax_category}, item, out[item_code]) get_item_tax_template({"company": company, "tax_category": tax_category}, item, out[item_code])
out[item_code]["item_tax_rate"] = get_item_tax_map(company, out[item_code].get("item_tax_template"), as_json=True) out[item_code]["item_tax_rate"] = get_item_tax_map(company, out[item_code].get("item_tax_template"), as_json=True)
return out return out