From d790710ae73f3ff9c52141c02f645646daf07f6e Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Nov 2021 12:11:30 +0100 Subject: [PATCH] refactor: apply suggestions from code review Co-authored-by: Himanshu --- erpnext/accounts/doctype/dunning/dunning.js | 12 ++++-------- .../accounts/doctype/dunning_type/dunning_type.py | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/dunning/dunning.js b/erpnext/accounts/doctype/dunning/dunning.js index 03553f775c..8930fcc6cb 100644 --- a/erpnext/accounts/doctype/dunning/dunning.js +++ b/erpnext/accounts/doctype/dunning/dunning.js @@ -90,16 +90,12 @@ frappe.ui.form.on("Dunning", { 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 @@ frappe.ui.form.on("Dunning", { } } - 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 @@ frappe.ui.form.on("Dunning", { }, 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 b053eb51d6..226e159a3b 100644 --- a/erpnext/accounts/doctype/dunning_type/dunning_type.py +++ b/erpnext/accounts/doctype/dunning_type/dunning_type.py @@ -9,4 +9,4 @@ from frappe.model.document import Document 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}"