From 67883d6cf0dee0b5e11119b37b3ec11e85ffb0e8 Mon Sep 17 00:00:00 2001 From: ravibharathi656 Date: Thu, 24 Jul 2025 14:51:28 +0530 Subject: [PATCH 1/3] 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 | 2 ++ .../process_statement_of_accounts.js | 8 +++++++- erpnext/public/js/controllers/buying.js | 1 + erpnext/public/js/utils.js | 12 +++++++++++- .../doctype/material_request/material_request.js | 1 + .../subcontracting_order/subcontracting_order.js | 4 ++++ 9 files changed, 29 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 4973c233f0..65784de64e 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -202,10 +202,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 e7c2cb7f4a..46eb0604ca 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -241,6 +241,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 45cf61109f..75c6836306 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 866c8cb1d7..d3e710a419 100755 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.js +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js @@ -139,6 +139,8 @@ 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); + }, }, 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 09fdea136b..2128bbd5c7 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 @@ -79,7 +79,13 @@ frappe.ui.form.on('Process Statement Of Accounts', { frm.set_value("to_date", frappe.datetime.get_today()); } }, - report: function(frm){ + company: function (frm) { + frm.set_value("account", ""); + frm.set_value("cost_center", ""); + frm.set_value("project", ""); + erpnext.utils.set_letter_head(frm); + }, + report: function (frm) { let filters = { 'company': frm.doc.company, } diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js index fcd585bc49..0164e8da3c 100644 --- a/erpnext/public/js/controllers/buying.js +++ b/erpnext/public/js/controllers/buying.js @@ -175,6 +175,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 4d5002c30b..16277d6035 100755 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -425,7 +425,17 @@ $.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 a70bd5c1f9..d14676ea01 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -73,6 +73,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 ee5fad6191..590d20056b 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js @@ -157,6 +157,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 43716536cc2b4f2f36badd3e8a61e9728eaef659 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Tue, 29 Jul 2025 17:13:22 +0200 Subject: [PATCH 2/3] 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 65784de64e..a1ffea79a3 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -203,6 +203,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 From 96196deaede1832f784c6b2ea745c6b2958cfad9 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Tue, 29 Jul 2025 19:15:28 +0200 Subject: [PATCH 3/3] fix: remove duplicate brace --- erpnext/accounts/doctype/pos_profile/pos_profile.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js index d3e710a419..2ef4d24f22 100755 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.js +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js @@ -142,8 +142,6 @@ frappe.ui.form.on('POS Profile', { erpnext.utils.set_letter_head(frm); }, - }, - toggle_display_account_head: function(frm) { frm.toggle_display('expense_account', erpnext.is_perpetual_inventory_enabled(frm.doc.company)); -- GitLab