Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40145 from frappe/mergify/bp/version-15-hotfix/pr-40143

Browse Source 
fix(minor): type error for missing form object in hide_company util (backport #40143)
This commit is contained in:
Gursheen Kaur Anand 2024-02-27 13:33:13 +05:30 committed by GitHub
commit df7afc3154
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@ -149,7 +149,7 @@ frappe.ui.form.on('Payment Entry', {
}, },
refresh: function(frm) { refresh: function(frm) {
erpnext.hide_company(); erpnext.hide_company(frm);
frm.events.hide_unhide_fields(frm); frm.events.hide_unhide_fields(frm);
frm.events.set_dynamic_labels(frm); frm.events.set_dynamic_labels(frm);
frm.events.show_general_ledger(frm); frm.events.show_general_ledger(frm);

2
erpnext/manufacturing/doctype/blanket_order/blanket_order.js
View File

@ -18,7 +18,7 @@ frappe.ui.form.on('Blanket Order', {
}, },
refresh: function(frm) { refresh: function(frm) {
erpnext.hide_company(); erpnext.hide_company(frm);
if (frm.doc.customer && frm.doc.docstatus === 1 && frm.doc.to_date > frappe.datetime.get_today()) { if (frm.doc.customer && frm.doc.docstatus === 1 && frm.doc.to_date > frappe.datetime.get_today()) {
frm.add_custom_button(__("Sales Order"), function() { frm.add_custom_button(__("Sales Order"), function() {
frappe.model.open_mapped_doc({ frappe.model.open_mapped_doc({

2
erpnext/public/js/controllers/transaction.js
View File

@ -397,7 +397,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
refresh() { refresh() {
erpnext.toggle_naming_series(); erpnext.toggle_naming_series();
erpnext.hide_company(); erpnext.hide_company(this.frm);
this.set_dynamic_labels(); this.set_dynamic_labels();
this.setup_sms(); this.setup_sms();
this.setup_quality_inspection(); this.setup_quality_inspection();

10
erpnext/public/js/utils.js
View File

@ -26,14 +26,14 @@ $.extend(erpnext, {
} }
}, },
hide_company: function() { hide_company: function(frm) {
if(cur_frm.fields_dict.company) { if(frm?.fields_dict.company) {
var companies = Object.keys(locals[":Company"] || {}); var companies = Object.keys(locals[":Company"] || {});
if(companies.length === 1) { if(companies.length === 1) {
if(!cur_frm.doc.company) cur_frm.set_value("company", companies[0]); if(!frm.doc.company) frm.set_value("company", companies[0]);
cur_frm.toggle_display("company", false); frm.toggle_display("company", false);
} else if(erpnext.last_selected_company) { } else if(erpnext.last_selected_company) {
if(!cur_frm.doc.company) cur_frm.set_value("company", erpnext.last_selected_company); if(!frm.doc.company) frm.set_value("company", erpnext.last_selected_company);
} }
} }
}, },

2
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -943,7 +943,7 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
if (this.frm.doc.docstatus===1 && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) { if (this.frm.doc.docstatus===1 && erpnext.is_perpetual_inventory_enabled(this.frm.doc.company)) {
this.show_general_ledger(); this.show_general_ledger();
} }
erpnext.hide_company(); erpnext.hide_company(this.frm);
erpnext.utils.add_item(this.frm); erpnext.utils.add_item(this.frm);
} }