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

fix: Insert Supplier Group via List View (#22403)

Browse Source
This commit is contained in:
Marica 2020-06-23 17:51:02 +05:30 committed by GitHub
parent 9c25101d9b
commit 7af7bb8311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/setup/doctype/customer_group/customer_group.js
View File

@ -8,7 +8,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.cscript.set_root_readonly = function(doc) { cur_frm.cscript.set_root_readonly = function(doc) {
// read-only for root customer group // read-only for root customer group
if(!doc.parent_customer_group) { if(!doc.parent_customer_group && !doc.__islocal) {
cur_frm.set_read_only(); cur_frm.set_read_only();
cur_frm.set_intro(__("This is a root customer group and cannot be edited.")); cur_frm.set_intro(__("This is a root customer group and cannot be edited."));
} else { } else {
@ -20,7 +20,8 @@ cur_frm.cscript.set_root_readonly = function(doc) {
cur_frm.fields_dict['parent_customer_group'].get_query = function(doc,cdt,cdn) { cur_frm.fields_dict['parent_customer_group'].get_query = function(doc,cdt,cdn) {
return { return {
filters: { filters: {
'is_group': 1 'is_group': 1,
'name': ['!=', cur_frm.doc.customer_group_name]
} }
} }
} }

2
erpnext/setup/doctype/item_group/item_group.js
View File

@ -66,7 +66,7 @@ frappe.ui.form.on("Item Group", {
set_root_readonly: function(frm) { set_root_readonly: function(frm) {
// read-only for root item group // read-only for root item group
frm.set_intro(""); frm.set_intro("");
if(!frm.doc.parent_item_group) { if(!frm.doc.parent_item_group && !frm.doc.__islocal) {
frm.set_read_only(); frm.set_read_only();
frm.set_intro(__("This is a root item group and cannot be edited."), true); frm.set_intro(__("This is a root item group and cannot be edited."), true);
} }

4
erpnext/setup/doctype/sales_person/sales_person.js
View File

@ -19,7 +19,7 @@ frappe.ui.form.on('Sales Person', {
} }
} }
}; };
frm.make_methods = { frm.make_methods = {
'Sales Order': () => frappe.new_doc("Sales Order") 'Sales Order': () => frappe.new_doc("Sales Order")
.then(() => frm.add_child("sales_team", {"sales_person": frm.doc.name})) .then(() => frm.add_child("sales_team", {"sales_person": frm.doc.name}))
@ -33,7 +33,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.cscript.set_root_readonly = function(doc) { cur_frm.cscript.set_root_readonly = function(doc) {
// read-only for root // read-only for root
if(!doc.parent_sales_person) { if(!doc.parent_sales_person && !doc.__islocal) {
cur_frm.set_read_only(); cur_frm.set_read_only();
cur_frm.set_intro(__("This is a root sales person and cannot be edited.")); cur_frm.set_intro(__("This is a root sales person and cannot be edited."));
} else { } else {

5
erpnext/setup/doctype/supplier_group/supplier_group.js
View File

@ -8,7 +8,7 @@ cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.set_root_readonly = function(doc) { cur_frm.cscript.set_root_readonly = function(doc) {
// read-only for root customer group // read-only for root customer group
if(!doc.parent_supplier_group) { if(!doc.parent_supplier_group && !doc.__islocal) {
cur_frm.set_read_only(); cur_frm.set_read_only();
cur_frm.set_intro(__("This is a root supplier group and cannot be edited.")); cur_frm.set_intro(__("This is a root supplier group and cannot be edited."));
} else { } else {
@ -20,7 +20,8 @@ cur_frm.cscript.set_root_readonly = function(doc) {
cur_frm.fields_dict['parent_supplier_group'].get_query = function() { cur_frm.fields_dict['parent_supplier_group'].get_query = function() {
return { return {
filters: { filters: {
'is_group': 1 'is_group': 1,
'name': ['!=', cur_frm.doc.supplier_group_name]
} }
}; };
}; };

2
erpnext/setup/doctype/territory/territory.js
View File

@ -20,7 +20,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.cscript.set_root_readonly = function(doc) { cur_frm.cscript.set_root_readonly = function(doc) {
// read-only for root territory // read-only for root territory
if(!doc.parent_territory) { if(!doc.parent_territory && !doc.__islocal) {
cur_frm.set_read_only(); cur_frm.set_read_only();
cur_frm.set_intro(__("This is a root territory and cannot be edited.")); cur_frm.set_intro(__("This is a root territory and cannot be edited."));
} else { } else {