diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 96b689b2520f08ecf07060e1c29dec3c4e649827..413a0b96e3740dee165e6101053fda9b540c1e0c 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -251,8 +251,10 @@ frappe.ui.form.on("Journal Entry", { }); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); if (frm.doc.company) { + // @dokos erpnext.set_accounting_journal(frm); } }, diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 04e72cb81f4cfc3844394c1306e6e61993124d86..04c69c23e96c840c2d627aef8c53b16a1d403f0e 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -310,6 +310,7 @@ frappe.ui.form.on("Payment Entry", { frm.events.hide_unhide_fields(frm); frm.events.set_dynamic_labels(frm); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, contact_person: function (frm) { diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js index b49d5d0c919695a97fe6a2838ff80c8abaf91339..d8abd2629490214eabb66e5cd568d5ace864fae7 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js @@ -14,6 +14,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex } company() { + erpnext.utils.set_letter_head(this.frm); erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype); this.frm.set_value("set_warehouse", ""); this.frm.set_value("taxes_and_charges", ""); diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js index 8b7af8485ac9e72a75b6a4c23fe566ead3aa1c0e..d571394a90c2bc81634b7d6836372218069433f7 100755 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.js +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js @@ -135,6 +135,7 @@ frappe.ui.form.on("POS Profile", { company: function (frm) { frm.trigger("toggle_display_account_head"); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, toggle_display_account_head: function (frm) { diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js index 57d0c59329c2c912f26e2ce46377348ba9e00451..f52d9eea0ac10febf6819fae0db050f45c50d5ac 100644 --- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js +++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js @@ -92,6 +92,7 @@ frappe.ui.form.on("Process Statement Of Accounts", { frm.set_value("account", ""); frm.set_value("cost_center", ""); frm.set_value("project", ""); + erpnext.utils.set_letter_head(frm); }, report: function (frm) { let filters = { diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index 9f26caed5999884c70621e18f65511749639eaa4..f9ce03f1d09a9368af334d8abbf27a43bab6ea85 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -176,6 +176,7 @@ erpnext.buying = { this.frm.set_value("shipping_address", r.message.shipping_address || ""); }, }); + erpnext.utils.set_letter_head(this.frm) } supplier_address() { diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 886c1e759dadc542a2db2807815ffaf681b28205..7b134f73549589cb8fe50c0e125b92f148572d32 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -466,6 +466,16 @@ $.extend(erpnext.utils, { } return fiscal_year; }, + + set_letter_head: function (frm) { + if (frm.fields_dict.letter_head) { + frappe.db.get_value("Company", frm.doc.company, "default_letter_head").then((res) => { + if (res.message?.default_letter_head) { + frm.set_value("letter_head", res.message.default_letter_head); + } + }); + } + }, }); erpnext.utils.select_alternate_items = function (opts) { diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 56be5c2213dd83912d139c6b116c79c21462506e..7159a8ac38bbe67d4b0ae61e8d2d245dbccfd9cc 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -91,6 +91,7 @@ frappe.ui.form.on("Material Request", { company: function (frm) { erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); + erpnext.utils.set_letter_head(frm); }, onload_post_render: function (frm) { diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js index 1e984809b954166297f3e77cece628ae596d30e8..11d4dad94eeb91b361619a051e47ccd4ab78ee44 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js @@ -192,6 +192,10 @@ frappe.ui.form.on("Subcontracting Order", { }); }, + company: function (frm) { + erpnext.utils.set_letter_head(frm); + }, + get_materials_from_supplier: function (frm) { let sco_rm_details = [];