From 18d27a90a5211ab890a86db49318b96b5991f438 Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Thu, 24 Jul 2025 14:51:28 +0530 Subject: [PATCH 1/2] fix: set letter head from company if exists --- .../accounts/doctype/journal_entry/journal_entry.js | 5 +---- .../accounts/doctype/payment_entry/payment_entry.js | 1 + erpnext/accounts/doctype/pos_invoice/pos_invoice.js | 1 + erpnext/accounts/doctype/pos_profile/pos_profile.js | 1 + .../process_statement_of_accounts.js | 1 + erpnext/public/js/controllers/buying.js | 1 + erpnext/public/js/utils.js | 10 ++++++++++ .../stock/doctype/material_request/material_request.js | 1 + .../subcontracting_order/subcontracting_order.js | 4 ++++ 9 files changed, 21 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 96b689b252..ade35c18ed 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -251,10 +251,7 @@ frappe.ui.form.on("Journal Entry", { }); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); - - if (frm.doc.company) { - erpnext.set_accounting_journal(frm); - } + erpnext.utils.set_letter_head(frm); }, voucher_type: function (frm) { diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 04e72cb81f..04c69c23e9 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 b49d5d0c91..d8abd26294 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 8b7af8485a..d571394a90 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 57d0c59329..f52d9eea0a 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 9f26caed59..f9ce03f1d0 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 886c1e759d..7b134f7354 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 56be5c2213..7159a8ac38 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 1e984809b9..11d4dad94e 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 = []; -- GitLab From 9065545ea782d3098d46916a16328dadc3e686b6 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Tue, 29 Jul 2025 17:13:22 +0200 Subject: [PATCH 2/2] fix: keep Dokos accounting journal --- erpnext/accounts/doctype/journal_entry/journal_entry.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index ade35c18ed..413a0b96e3 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -252,6 +252,11 @@ 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); + } }, voucher_type: function (frm) { -- GitLab