diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 4973c233f067a297ed01b3535877cec2e289b89f..a1ffea79a3bc8ef9c7ff9a8d548fe199c8a95069 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -202,8 +202,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 e7c2cb7f4a709c7b396b2f5787c374d776ec7523..46eb0604caa3b2ede19db673d1d9d166dafc6868 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 45cf61109f529fb3738e8bdfbc6bb9f9bab2d541..75c683630686705b3bea047a2261dcaf9f227ea7 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 866c8cb1d7ffc569918438cc9b14999fdc80c822..2ef4d24f22687b36a6c93c6ead97a450a2bea09b 100755 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.js +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js @@ -139,7 +139,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 09fdea136bb740ed4641853d55c9f114081b7e29..2128bbd5c74e90a3723130ec6e18705d326586e3 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 fcd585bc49cc6bcb7dbefd05a4d1cbe732d99bc5..0164e8da3c5068f6cf48e7a72ab7915e7dec5a9e 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 4d5002c30be2aa4a23ea17665b794ad60a90e5fc..16277d60354e7a1c0e2df7020da24d1089bfb888 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 a70bd5c1f9a3c0f41721a992d57b902cf2b6dd84..d14676ea012df9314774ae1b9c9a25bbfe008ae2 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 ee5fad6191ed04c96560c27468c99031f5d5826d..590d20056bd64da52ca6fc6f6d1f6d8d056d1832 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 = [];