diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b704d42..e657e3b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -10,6 +10,7 @@
 erpnext.patches.v5_7.update_item_description_based_on_item_master
 erpnext.patches.v4_2.repost_reserved_qty #2021-03-31
 execute:frappe.reload_doc("Payroll", "doctype", "salary_slip")
+erpnext.patches.v8_1.removed_roles_from_gst_report_non_indian_account #16-08-2018
 erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
 erpnext.patches.v10_0.rename_price_to_rate_in_pricing_rule
 erpnext.patches.v10_0.set_currency_in_pricing_rule
@@ -271,6 +272,7 @@
 execute:frappe.reload_doc("erpnext_integrations", "doctype", "Product Tax Category")
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration          #08-11-2021
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
+erpnext.patches.v13_0.create_gst_payment_entry_fields #27-11-2021
 erpnext.patches.v13_0.fix_invoice_statuses
 erpnext.patches.v13_0.create_website_items #30-09-2021
 erpnext.patches.v13_0.populate_e_commerce_settings
@@ -331,4 +333,4 @@
 erpnext.patches.v13_0.update_accounts_in_loan_docs
 erpnext.patches.v14_0.update_batch_valuation_flag
 erpnext.patches.v14_0.delete_non_profit_doctypes
-erpnext.patches.v14_0.update_employee_advance_status
\ No newline at end of file
+erpnext.patches.v14_0.update_employee_advance_status
diff --git a/erpnext/patches/v13_0/create_gst_payment_entry_fields.py b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py
new file mode 100644
index 0000000..ee8fc5f
--- /dev/null
+++ b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2021, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+import frappe
+
+
+# Patch kept for users outside India
+def execute():
+	if frappe.db.exists("Company", {"country": "India"}):
+		return
+
+	for field in (
+		"gst_section",
+		"company_address",
+		"company_gstin",
+		"place_of_supply",
+		"customer_address",
+		"customer_gstin",
+	):
+		frappe.delete_doc_if_exists("Custom Field", f"Payment Entry-{field}")
diff --git a/erpnext/patches/v8_1/removed_roles_from_gst_report_non_indian_account.py b/erpnext/patches/v8_1/removed_roles_from_gst_report_non_indian_account.py
new file mode 100644
index 0000000..5b1885d
--- /dev/null
+++ b/erpnext/patches/v8_1/removed_roles_from_gst_report_non_indian_account.py
@@ -0,0 +1,22 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+
+import frappe
+
+
+def execute():
+	if frappe.db.exists("Company", {"country": "India"}):
+		return
+
+	frappe.reload_doc("core", "doctype", "has_role")
+	frappe.db.sql(
+		"""
+		delete from
+			`tabHas Role`
+		where
+			parenttype = 'Report' and parent in('GST Sales Register',
+				'GST Purchase Register', 'GST Itemised Sales Register',
+				'GST Itemised Purchase Register', 'Eway Bill')
+		"""
+	)