Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: apply suggestions from code review

Browse Source 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
This commit is contained in:
Raffael Meyer 2021-11-29 12:11:30 +01:00 committed by marination
parent 28dfbdda93
commit d790710ae7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/dunning/dunning.js
View File

@ -90,16 +90,12 @@ frappe.ui.form.on("Dunning", {
args: { name: frm.doc.company, existing_address: frm.doc.company_address || "" }, args: { name: frm.doc.company, existing_address: frm.doc.company_address || "" },
debounce: 2000, debounce: 2000,
callback: function (r) { callback: function (r) {
if (r.message) { frm.set_value("company_address", r && r.message || "");
frm.set_value("company_address", r.message);
} else {
frm.set_value("company_address", "");
}
} }
}); });
if (frm.fields_dict.currency) { 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) { if (!frm.doc.currency) {
frm.set_value("currency", company_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 (company_doc.default_letter_head) {
if (frm.fields_dict.letter_head) { if (frm.fields_dict.letter_head) {
frm.set_value("letter_head", company_doc.default_letter_head); frm.set_value("letter_head", company_doc.default_letter_head);
@ -120,7 +116,7 @@ frappe.ui.form.on("Dunning", {
}, },
currency: function (frm) { currency: function (frm) {
// this.set_dynamic_labels(); // 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 // Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
if (frm.doc.currency && frm.doc.currency !== company_currency) { if (frm.doc.currency && frm.doc.currency !== company_currency) {
frappe.call({ frappe.call({

2
erpnext/accounts/doctype/dunning_type/dunning_type.py
View File

@ -9,4 +9,4 @@ from frappe.model.document import Document
class DunningType(Document): class DunningType(Document):
def autoname(self): def autoname(self):
company_abbr = frappe.get_value("Company", self.company, "abbr") company_abbr = frappe.get_value("Company", self.company, "abbr")
self.name = self.dunning_type + " - " + company_abbr self.name = f"{self.dunning_type} - {company_abbr}"