diff --git a/erpnext/accounts/doctype/dunning/dunning.js b/erpnext/accounts/doctype/dunning/dunning.js
index 03553f7..8930fcc 100644
--- a/erpnext/accounts/doctype/dunning/dunning.js
+++ b/erpnext/accounts/doctype/dunning/dunning.js
@@ -90,16 +90,12 @@
 				args: { name: frm.doc.company, existing_address: frm.doc.company_address || "" },
 				debounce: 2000,
 				callback: function (r) {
-					if (r.message) {
-						frm.set_value("company_address", r.message);
-					} else {
-						frm.set_value("company_address", "");
-					}
+					frm.set_value("company_address", r && r.message || "");
 				}
 			});
 
 			if (frm.fields_dict.currency) {
-				var company_currency = erpnext.get_currency(frm.doc.company);
+				const company_currency = erpnext.get_currency(frm.doc.company);
 
 				if (!frm.doc.currency) {
 					frm.set_value("currency", company_currency);
@@ -110,7 +106,7 @@
 				}
 			}
 
-			var company_doc = frappe.get_doc(":Company", frm.doc.company);
+			const company_doc = frappe.get_doc(":Company", frm.doc.company);
 			if (company_doc.default_letter_head) {
 				if (frm.fields_dict.letter_head) {
 					frm.set_value("letter_head", company_doc.default_letter_head);
@@ -120,7 +116,7 @@
 	},
 	currency: function (frm) {
 		// this.set_dynamic_labels();
-		var company_currency = erpnext.get_currency(frm.doc.company);
+		const company_currency = erpnext.get_currency(frm.doc.company);
 		// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
 		if (frm.doc.currency && frm.doc.currency !== company_currency) {
 			frappe.call({
diff --git a/erpnext/accounts/doctype/dunning_type/dunning_type.py b/erpnext/accounts/doctype/dunning_type/dunning_type.py
index b053eb5..226e159 100644
--- a/erpnext/accounts/doctype/dunning_type/dunning_type.py
+++ b/erpnext/accounts/doctype/dunning_type/dunning_type.py
@@ -9,4 +9,4 @@
 class DunningType(Document):
 	def autoname(self):
 		company_abbr = frappe.get_value("Company", self.company, "abbr")
-		self.name = self.dunning_type + " - " + company_abbr
+		self.name = f"{self.dunning_type} - {company_abbr}"