Merge branch 'develop' into hr-separation

erpnext/regional/address_template/templates/india.html

@@ -1,9 +0,0 @@
-{{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}{{ city }}<br>
-{% if gst_state %}{{ gst_state }}{% endif -%}
-{% if gst_state_number %}, State Code: {{ gst_state_number }}<br>{% endif -%}
-{% if pincode %}Postal Code: {{ pincode }}<br>{% endif -%}
-{{ country }}<br>
-{% if phone %}Phone: {{ phone }}<br>{% endif -%}
-{% if fax %}Fax: {{ fax }}<br>{% endif -%}
-{% if email_id %}Email: {{ email_id }}<br>{% endif -%}
-{% if gstin %}GSTIN: {{ gstin }}<br>{% endif -%}

erpnext/regional/doctype/hsn_tax_rate/hsn_tax_rate.json

@@ -1,39 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2022-05-11 13:32:42.534779",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "minimum_taxable_value",
-  "tax_rate"
- ],
- "fields": [
-  {
-   "columns": 2,
-   "fieldname": "minimum_taxable_value",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Minimum Taxable Value"
-  },
-  {
-   "columns": 2,
-   "fieldname": "tax_rate",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Tax Rate"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2022-05-15 15:37:56.152470",
- "modified_by": "Administrator",
- "module": "Regional",
- "name": "HSN Tax Rate",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
-}

erpnext/regional/doctype/hsn_tax_rate/hsn_tax_rate.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class HSNTaxRate(Document):
-	pass