diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json index 8915f79b926..77c9e95b759 100644 --- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json +++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json @@ -1,7 +1,7 @@ { + "actions": [], "allow_import": 1, "allow_rename": 1, - "autoname": "field:title", "creation": "2018-11-22 22:45:00.370913", "doctype": "DocType", "document_type": "Setup", @@ -20,8 +20,7 @@ "in_list_view": 1, "label": "Title", "no_copy": 1, - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "taxes", @@ -33,12 +32,14 @@ { "fieldname": "company", "fieldtype": "Link", + "in_list_view": 1, "label": "Company", "options": "Company", "reqd": 1 } ], - "modified": "2020-09-18 17:26:09.703215", + "links": [], + "modified": "2021-03-08 19:50:21.416513", "modified_by": "Administrator", "module": "Accounts", "name": "Item Tax Template", @@ -81,5 +82,6 @@ "show_name_in_global_search": 1, "sort_field": "modified", "sort_order": "DESC", + "title_field": "title", "track_changes": 1 } \ No newline at end of file diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py index e77481d44f5..d9155cbab4a 100644 --- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py +++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py @@ -11,6 +11,11 @@ class ItemTaxTemplate(Document): def validate(self): self.validate_tax_accounts() + def autoname(self): + if self.company and self.title: + abbr = frappe.get_cached_value('Company', self.company, 'abbr') + self.name = '{0} - {1}'.format(self.title, abbr) + def validate_tax_accounts(self): """Check whether Tax Rate is not entered twice for same Tax Type""" check_list = [] diff --git a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py index 15875afe878..eb52fd62759 100644 --- a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py +++ b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py @@ -99,10 +99,10 @@ class TestPOSInvoice(unittest.TestCase): item_row = inv.get("items")[0] add_items = [ - (54, '_Test Account Excise Duty @ 12'), - (288, '_Test Account Excise Duty @ 15'), - (144, '_Test Account Excise Duty @ 20'), - (430, '_Test Item Tax Template 1') + (54, '_Test Account Excise Duty @ 12 - _TC'), + (288, '_Test Account Excise Duty @ 15 - _TC'), + (144, '_Test Account Excise Duty @ 20 - _TC'), + (430, '_Test Item Tax Template 1 - _TC') ] for qty, item_tax_template in add_items: item_row_copy = copy.deepcopy(item_row) diff --git a/erpnext/accounts/doctype/purchase_invoice/test_records.json b/erpnext/accounts/doctype/purchase_invoice/test_records.json index 7030faf2b73..e7166c5a12d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_records.json +++ b/erpnext/accounts/doctype/purchase_invoice/test_records.json @@ -18,7 +18,7 @@ "expense_account": "_Test Account Cost for Goods Sold - _TC", "item_code": "_Test Item Home Desktop 100", "item_name": "_Test Item Home Desktop 100", - "item_tax_template": "_Test Account Excise Duty @ 10", + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC", "parentfield": "items", "qty": 10, "rate": 50, diff --git a/erpnext/accounts/doctype/sales_invoice/test_records.json b/erpnext/accounts/doctype/sales_invoice/test_records.json index ee6419db20a..e00a58f8641 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_records.json +++ b/erpnext/accounts/doctype/sales_invoice/test_records.json @@ -148,7 +148,7 @@ "expense_account": "_Test Account Cost for Goods Sold - _TC", "item_code": "_Test Item Home Desktop 100", "item_name": "_Test Item Home Desktop 100", - "item_tax_template": "_Test Account Excise Duty @ 10", + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC", "parentfield": "items", "price_list_rate": 50, "qty": 10, @@ -276,7 +276,7 @@ "expense_account": "_Test Account Cost for Goods Sold - _TC", "item_code": "_Test Item Home Desktop 100", "item_name": "_Test Item Home Desktop 100", - "item_tax_template": "_Test Account Excise Duty @ 10", + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC", "parentfield": "items", "price_list_rate": 62.5, "qty": 10, diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 7cd1828343b..1b9557839fe 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -405,10 +405,10 @@ class TestSalesInvoice(unittest.TestCase): item_row = si.get("items")[0] add_items = [ - (54, '_Test Account Excise Duty @ 12'), - (288, '_Test Account Excise Duty @ 15'), - (144, '_Test Account Excise Duty @ 20'), - (430, '_Test Item Tax Template 1') + (54, '_Test Account Excise Duty @ 12 - _TC'), + (288, '_Test Account Excise Duty @ 15 - _TC'), + (144, '_Test Account Excise Duty @ 20 - _TC'), + (430, '_Test Item Tax Template 1 - _TC') ] for qty, item_tax_template in add_items: item_row_copy = copy.deepcopy(item_row) @@ -2077,14 +2077,14 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date): item.save() item.append("taxes", { - "item_tax_template": "_Test Item Tax Template 1", + "item_tax_template": "_Test Item Tax Template 1 - _TC", "valid_from": add_days(nowdate(), 1) }) item.save() sales_invoice = create_sales_invoice(item = "_Test Item 2", do_not_save=1) - sales_invoice.items[0].item_tax_template = "_Test Item Tax Template 1" + sales_invoice.items[0].item_tax_template = "_Test Item Tax Template 1 - _TC" self.assertRaises(frappe.ValidationError, sales_invoice.save) item.taxes = [] diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index d568ef1ceda..02d48653203 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -231,12 +231,12 @@ class TestPurchaseOrder(unittest.TestCase): new_item_with_tax = frappe.get_doc("Item", "Test Item with Tax") new_item_with_tax.append("taxes", { - "item_tax_template": "Test Update Items Template", + "item_tax_template": "Test Update Items Template - _TC", "valid_from": nowdate() }) new_item_with_tax.save() - tax_template = "_Test Account Excise Duty @ 10" + tax_template = "_Test Account Excise Duty @ 10 - _TC" item = "_Test Item Home Desktop 100" if not frappe.db.exists("Item Tax", {"parent":item, "item_tax_template":tax_template}): item_doc = frappe.get_doc("Item", item) @@ -287,7 +287,7 @@ class TestPurchaseOrder(unittest.TestCase): po.cancel() po.delete() new_item_with_tax.delete() - frappe.get_doc("Item Tax Template", "Test Update Items Template").delete() + frappe.get_doc("Item Tax Template", "Test Update Items Template - _TC").delete() def test_update_child_uom_conv_factor_change(self): po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes") diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 52a0174798e..ee16f441715 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -555,12 +555,12 @@ class TestSalesOrder(unittest.TestCase): new_item_with_tax = frappe.get_doc("Item", "Test Item with Tax") new_item_with_tax.append("taxes", { - "item_tax_template": "Test Update Items Template", + "item_tax_template": "Test Update Items Template - _TC", "valid_from": nowdate() }) new_item_with_tax.save() - tax_template = "_Test Account Excise Duty @ 10" + tax_template = "_Test Account Excise Duty @ 10 - _TC" item = "_Test Item Home Desktop 100" if not frappe.db.exists("Item Tax", {"parent":item, "item_tax_template":tax_template}): item_doc = frappe.get_doc("Item", item) @@ -614,7 +614,7 @@ class TestSalesOrder(unittest.TestCase): so.cancel() so.delete() new_item_with_tax.delete() - frappe.get_doc("Item Tax Template", "Test Update Items Template").delete() + frappe.get_doc("Item Tax Template", "Test Update Items Template - _TC").delete() frappe.db.set_value("Stock Settings", None, "default_warehouse", old_stock_settings_value) def test_warehouse_user(self): diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 819ba78e666..433851cde53 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -390,8 +390,10 @@ class Company(NestedSet): frappe.db.sql("delete from tabDepartment where company=%s", self.name) frappe.db.sql("delete from `tabTax Withholding Account` where company=%s", self.name) + # delete tax templates frappe.db.sql("delete from `tabSales Taxes and Charges Template` where company=%s", self.name) frappe.db.sql("delete from `tabPurchase Taxes and Charges Template` where company=%s", self.name) + frappe.db.sql("delete from `tabItem Tax Template` where company=%s", self.name) @frappe.whitelist() def enqueue_replace_abbr(company, old, new): diff --git a/erpnext/setup/doctype/item_group/test_records.json b/erpnext/setup/doctype/item_group/test_records.json index 71159643209..146da87bddc 100644 --- a/erpnext/setup/doctype/item_group/test_records.json +++ b/erpnext/setup/doctype/item_group/test_records.json @@ -79,13 +79,13 @@ { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 10", + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC", "tax_category": "" }, { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 12", + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC", "tax_category": "_Test Tax Category 1" } ] @@ -99,7 +99,7 @@ { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 15", + "item_tax_template": "_Test Account Excise Duty @ 15 - _TC", "tax_category": "" } ] diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 109731abb53..36d0de1e5df 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -104,41 +104,41 @@ class TestItem(unittest.TestCase): def test_item_tax_template(self): expected_item_tax_template = [ {"item_code": "_Test Item With Item Tax Template", "tax_category": "", - "item_tax_template": "_Test Account Excise Duty @ 10"}, + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC"}, {"item_code": "_Test Item With Item Tax Template", "tax_category": "_Test Tax Category 1", - "item_tax_template": "_Test Account Excise Duty @ 12"}, + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC"}, {"item_code": "_Test Item With Item Tax Template", "tax_category": "_Test Tax Category 2", "item_tax_template": None}, {"item_code": "_Test Item Inherit Group Item Tax Template 1", "tax_category": "", - "item_tax_template": "_Test Account Excise Duty @ 10"}, + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC"}, {"item_code": "_Test Item Inherit Group Item Tax Template 1", "tax_category": "_Test Tax Category 1", - "item_tax_template": "_Test Account Excise Duty @ 12"}, + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC"}, {"item_code": "_Test Item Inherit Group Item Tax Template 1", "tax_category": "_Test Tax Category 2", "item_tax_template": None}, {"item_code": "_Test Item Inherit Group Item Tax Template 2", "tax_category": "", - "item_tax_template": "_Test Account Excise Duty @ 15"}, + "item_tax_template": "_Test Account Excise Duty @ 15 - _TC"}, {"item_code": "_Test Item Inherit Group Item Tax Template 2", "tax_category": "_Test Tax Category 1", - "item_tax_template": "_Test Account Excise Duty @ 12"}, + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC"}, {"item_code": "_Test Item Inherit Group Item Tax Template 2", "tax_category": "_Test Tax Category 2", "item_tax_template": None}, {"item_code": "_Test Item Override Group Item Tax Template", "tax_category": "", - "item_tax_template": "_Test Account Excise Duty @ 20"}, + "item_tax_template": "_Test Account Excise Duty @ 20 - _TC"}, {"item_code": "_Test Item Override Group Item Tax Template", "tax_category": "_Test Tax Category 1", - "item_tax_template": "_Test Item Tax Template 1"}, + "item_tax_template": "_Test Item Tax Template 1 - _TC"}, {"item_code": "_Test Item Override Group Item Tax Template", "tax_category": "_Test Tax Category 2", "item_tax_template": None}, ] expected_item_tax_map = { None: {}, - "_Test Account Excise Duty @ 10": {"_Test Account Excise Duty - _TC": 10}, - "_Test Account Excise Duty @ 12": {"_Test Account Excise Duty - _TC": 12}, - "_Test Account Excise Duty @ 15": {"_Test Account Excise Duty - _TC": 15}, - "_Test Account Excise Duty @ 20": {"_Test Account Excise Duty - _TC": 20}, - "_Test Item Tax Template 1": {"_Test Account Excise Duty - _TC": 5, "_Test Account Education Cess - _TC": 10, + "_Test Account Excise Duty @ 10 - _TC": {"_Test Account Excise Duty - _TC": 10}, + "_Test Account Excise Duty @ 12 - _TC": {"_Test Account Excise Duty - _TC": 12}, + "_Test Account Excise Duty @ 15 - _TC": {"_Test Account Excise Duty - _TC": 15}, + "_Test Account Excise Duty @ 20 - _TC": {"_Test Account Excise Duty - _TC": 20}, + "_Test Item Tax Template 1 - _TC": {"_Test Account Excise Duty - _TC": 5, "_Test Account Education Cess - _TC": 10, "_Test Account S&H Education Cess - _TC": 15} } diff --git a/erpnext/stock/doctype/item/test_records.json b/erpnext/stock/doctype/item/test_records.json index 8f437b13f0d..909c4eeb906 100644 --- a/erpnext/stock/doctype/item/test_records.json +++ b/erpnext/stock/doctype/item/test_records.json @@ -92,7 +92,7 @@ { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 10" + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC" } ], "stock_uom": "_Test UOM 1" @@ -370,12 +370,12 @@ { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 10" + "item_tax_template": "_Test Account Excise Duty @ 10 - _TC" }, { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 12", + "item_tax_template": "_Test Account Excise Duty @ 12 - _TC", "tax_category": "_Test Tax Category 1" } ] @@ -449,13 +449,13 @@ { "doctype": "Item Tax", "parentfield": "taxes", - "item_tax_template": "_Test Account Excise Duty @ 20" + "item_tax_template": "_Test Account Excise Duty @ 20 - _TC" }, { "doctype": "Item Tax", "parentfield": "taxes", "tax_category": "_Test Tax Category 1", - "item_tax_template": "_Test Item Tax Template 1" + "item_tax_template": "_Test Item Tax Template 1 - _TC" } ] },