fix: Indentation and removed f-strings

- Sider: fixed indentation in js - Dont use f-strings in queries
frappe · Aug 30, 2021 · 7b78473 · 7b78473
1 parent 2a3ef03
commit 7b78473
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 61 deletions.
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
@@ -104,15 +104,15 @@ def create_primary_address(self):
 
 	def on_trash(self):
 		if self.supplier_primary_contact:
-			frappe.db.sql(f"""
+			frappe.db.sql("""
 				UPDATE `tabSupplier`
 				SET
 					supplier_primary_contact=null,
 					supplier_primary_address=null,
 					mobile_no=null,
 					email_id=null,
 					primary_address=null
-				WHERE name='{self.name}'""")
+				WHERE name=%(name)s""", {"name": self.name})
 
 		delete_contact_and_address('Supplier', self.name)
 

diff --git a/erpnext/public/js/utils/supplier_quick_entry.js b/erpnext/public/js/utils/supplier_quick_entry.js
@@ -13,63 +13,64 @@ frappe.ui.form.SupplierQuickEntryForm = class SupplierQuickEntryForm extends fra
 
 	get_variant_fields() {
 		var variant_fields = [
-		{
-			fieldtype: "Section Break",
-			label: __("Primary Contact Details"),
-			collapsible: 1
-		},
-		{
-			label: __("Email Id"),
-			fieldname: "email_id",
-			fieldtype: "Data"
-		},
-		{
-			fieldtype: "Column Break"
-		},
-		{
-			label: __("Mobile Number"),
-			fieldname: "mobile_no",
-			fieldtype: "Data"
-		},
-		{
-			fieldtype: "Section Break",
-			label: __("Primary Address Details"),
-			collapsible: 1
-		},
-		{
-			label: __("Address Line 1"),
-			fieldname: "address_line1",
-			fieldtype: "Data"
-		},
-		{
-			label: __("Address Line 2"),
-			fieldname: "address_line2",
-			fieldtype: "Data"
-		},
-		{
-			label: __("ZIP Code"),
-			fieldname: "pincode",
-			fieldtype: "Data"
-		},
-		{
-			fieldtype: "Column Break"
-		},
-		{
-			label: __("City"),
-			fieldname: "city",
-			fieldtype: "Data"
-		},
-		{
-			label: __("State"),
-			fieldname: "state",
-			fieldtype: "Data"
-		},
-		{
-			label: __("Country"),
-			fieldname: "country",
-			fieldtype: "Link",
-			options: "Country"
-		}];
+			{
+				fieldtype: "Section Break",
+				label: __("Primary Contact Details"),
+				collapsible: 1
+			},
+			{
+				label: __("Email Id"),
+				fieldname: "email_id",
+				fieldtype: "Data"
+			},
+			{
+				fieldtype: "Column Break"
+			},
+			{
+				label: __("Mobile Number"),
+				fieldname: "mobile_no",
+				fieldtype: "Data"
+			},
+			{
+				fieldtype: "Section Break",
+				label: __("Primary Address Details"),
+				collapsible: 1
+			},
+			{
+				label: __("Address Line 1"),
+				fieldname: "address_line1",
+				fieldtype: "Data"
+			},
+			{
+				label: __("Address Line 2"),
+				fieldname: "address_line2",
+				fieldtype: "Data"
+			},
+			{
+				label: __("ZIP Code"),
+				fieldname: "pincode",
+				fieldtype: "Data"
+			},
+			{
+				fieldtype: "Column Break"
+			},
+			{
+				label: __("City"),
+				fieldname: "city",
+				fieldtype: "Data"
+			},
+			{
+				label: __("State"),
+				fieldname: "state",
+				fieldtype: "Data"
+			},
+			{
+				label: __("Country"),
+				fieldname: "country",
+				fieldtype: "Link",
+				options: "Country"
+			}
+		];
 
 		return variant_fields;
 	}

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
@@ -252,15 +252,15 @@ def validate_credit_limit_on_change(self):
 
 	def on_trash(self):
 		if self.customer_primary_contact:
-			frappe.db.sql(f"""
+			frappe.db.sql("""
 				UPDATE `tabCustomer`
 				SET
 					customer_primary_contact=null,
 					customer_primary_address=null,
 					mobile_no=null,
 					email_id=null,
 					primary_address=null
-				WHERE name='{self.name}'""")
+				WHERE name=%(name)s""", {"name": self.name})
 
 		delete_contact_and_address('Customer', self.name)
 		if self.lead_name: