mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-12 19:35:09 +00:00
fix: set letter head from company if exists
(cherry picked from commit d163da171f)
This commit is contained in:
@@ -163,6 +163,7 @@ frappe.ui.form.on("Journal Entry", {
|
|||||||
});
|
});
|
||||||
|
|
||||||
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
||||||
|
erpnext.utils.set_letter_head(frm);
|
||||||
},
|
},
|
||||||
|
|
||||||
voucher_type: function (frm) {
|
voucher_type: function (frm) {
|
||||||
|
|||||||
@@ -273,6 +273,7 @@ frappe.ui.form.on("Payment Entry", {
|
|||||||
frm.events.hide_unhide_fields(frm);
|
frm.events.hide_unhide_fields(frm);
|
||||||
frm.events.set_dynamic_labels(frm);
|
frm.events.set_dynamic_labels(frm);
|
||||||
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
||||||
|
erpnext.utils.set_letter_head(frm);
|
||||||
},
|
},
|
||||||
|
|
||||||
contact_person: function (frm) {
|
contact_person: function (frm) {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
|
|||||||
}
|
}
|
||||||
|
|
||||||
company() {
|
company() {
|
||||||
|
erpnext.utils.set_letter_head(this.frm);
|
||||||
erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
|
erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
|
||||||
this.frm.set_value("set_warehouse", "");
|
this.frm.set_value("set_warehouse", "");
|
||||||
this.frm.set_value("taxes_and_charges", "");
|
this.frm.set_value("taxes_and_charges", "");
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ frappe.ui.form.on("POS Profile", {
|
|||||||
company: function (frm) {
|
company: function (frm) {
|
||||||
frm.trigger("toggle_display_account_head");
|
frm.trigger("toggle_display_account_head");
|
||||||
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
||||||
|
erpnext.utils.set_letter_head(frm);
|
||||||
},
|
},
|
||||||
|
|
||||||
toggle_display_account_head: function (frm) {
|
toggle_display_account_head: function (frm) {
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ frappe.ui.form.on("Process Statement Of Accounts", {
|
|||||||
frm.set_value("account", "");
|
frm.set_value("account", "");
|
||||||
frm.set_value("cost_center", "");
|
frm.set_value("cost_center", "");
|
||||||
frm.set_value("project", "");
|
frm.set_value("project", "");
|
||||||
|
erpnext.utils.set_letter_head(frm);
|
||||||
},
|
},
|
||||||
report: function (frm) {
|
report: function (frm) {
|
||||||
let filters = {
|
let filters = {
|
||||||
|
|||||||
@@ -176,6 +176,7 @@ erpnext.buying = {
|
|||||||
this.frm.set_value("shipping_address", r.message.shipping_address || "");
|
this.frm.set_value("shipping_address", r.message.shipping_address || "");
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
erpnext.utils.set_letter_head(this.frm)
|
||||||
}
|
}
|
||||||
|
|
||||||
supplier_address() {
|
supplier_address() {
|
||||||
|
|||||||
@@ -449,6 +449,16 @@ $.extend(erpnext.utils, {
|
|||||||
});
|
});
|
||||||
return fiscal_year;
|
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) {
|
erpnext.utils.select_alternate_items = function (opts) {
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ frappe.ui.form.on("Material Request", {
|
|||||||
|
|
||||||
company: function (frm) {
|
company: function (frm) {
|
||||||
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
|
||||||
|
erpnext.utils.set_letter_head(frm);
|
||||||
},
|
},
|
||||||
|
|
||||||
onload_post_render: function (frm) {
|
onload_post_render: function (frm) {
|
||||||
|
|||||||
@@ -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) {
|
get_materials_from_supplier: function (frm) {
|
||||||
let sco_rm_details = [];
|
let sco_rm_details = [];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user