From 030d35628dcd7bd919a9f4e62173206a115f6ea2 Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 24 Jan 2024 12:46:15 +0530 Subject: [PATCH] fix: type error on company doc --- erpnext/public/js/controllers/transaction.js | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 6406735763..f831a8876f 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -790,24 +790,25 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe if (me.frm.doc.price_list_currency == company_currency) { me.frm.set_value('plc_conversion_rate', 1.0); } - if (company_doc && company_doc.default_letter_head) { - if(me.frm.fields_dict.letter_head) { - me.frm.set_value("letter_head", company_doc.default_letter_head); + if (company_doc){ + if (company_doc.default_letter_head) { + if(me.frm.fields_dict.letter_head) { + me.frm.set_value("letter_head", company_doc.default_letter_head); + } + } + let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"]; + if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && + selling_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { + me.frm.set_value("tc_name", company_doc.default_selling_terms); + } + let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order", + "Material Request", "Purchase Receipt"]; + // Purchase Invoice is excluded as per issue #3345 + if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && + buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { + me.frm.set_value("tc_name", company_doc.default_buying_terms); } } - let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"]; - if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && - selling_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { - me.frm.set_value("tc_name", company_doc.default_selling_terms); - } - let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order", - "Material Request", "Purchase Receipt"]; - // Purchase Invoice is excluded as per issue #3345 - if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") && - buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) { - me.frm.set_value("tc_name", company_doc.default_buying_terms); - } - frappe.run_serially([ () => me.frm.script_manager.trigger("currency"), () => me.update_item_tax_map(),