diff --git a/erpnext/accounts/doctype/payment_entry/regional/india.js b/erpnext/accounts/doctype/payment_entry/regional/india.js
index fa35ec9426..abb344581c 100644
--- a/erpnext/accounts/doctype/payment_entry/regional/india.js
+++ b/erpnext/accounts/doctype/payment_entry/regional/india.js
@@ -7,7 +7,7 @@ frappe.ui.form.on("Payment Entry", {
 				'name': frm.doc.company
 			},
 			'callback': function(r) {
-				me.frm.set_value('company_address', r.message);
+				frm.set_value('company_address', r.message);
 			}
 		});
 	},
@@ -21,7 +21,7 @@ frappe.ui.form.on("Payment Entry", {
 					'name': frm.doc.party
 				},
 				'callback': function(r) {
-					me.frm.set_value('customer_address', r.message);
+					frm.set_value('customer_address', r.message);
 				}
 			});
 		}
diff --git a/erpnext/patches/v13_0/create_gst_payment_entry_fields.py b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py
index aee5ce6d11..1ae06bed3b 100644
--- a/erpnext/patches/v13_0/create_gst_payment_entry_fields.py
+++ b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py
@@ -1,8 +1,6 @@
 # Copyright (c) 2021, Frappe and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from __future__ import unicode_literals
-import frappe
 from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 
 def execute():
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 3d839100eb..61443f1dc6 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -62,7 +62,7 @@ class Gstr1Report(object):
 	def get_data(self):
 		if self.filters.get("type_of_business") in  ("B2C Small", "B2C Large"):
 			self.get_b2c_data()
-		elif self.filters.get("type_of_business") in  ("Advances"):
+		elif self.filters.get("type_of_business") == "Advances":
 			self.get_advance_data()
 		elif self.invoices:
 			for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
@@ -78,7 +78,7 @@ class Gstr1Report(object):
 						self.data.append(row)
 
 	def get_advance_data(self):
-		advances_data = {}
+		Advances_data = {}
 		advances = self.get_advance_entries()
 		for entry in advances:
 			# only consider IGST and SGST so as to avoid duplication of taxable amount
@@ -695,7 +695,7 @@ class Gstr1Report(object):
 					"width": 120
 				}
 			]
-		elif self.filters.get("type_of_business") ==  "Advances":
+		elif self.filters.get("type_of_business") == "Advances":
 			self.invoice_columns = [
 				{
 					"fieldname": "place_of_supply",