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

Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix

Browse Source 
[fix] minor fix to accomodate custom fields in tree popup
This commit is contained in:
Nabin Hait 2016-09-20 18:06:49 +05:30 committed by GitHub
commit a36325c6e5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/account/account_tree.js
View File

@ -48,5 +48,5 @@ frappe.treeview_settings["Account"] = {
+ " " + dr_or_cr + " " + dr_or_cr
+ '</span>').insertBefore(node.$ul); + '</span>').insertBefore(node.$ul);
} }
} },
} }

2
erpnext/accounts/doctype/cost_center/cost_center_tree.js
View File

@ -22,5 +22,5 @@ frappe.treeview_settings["Cost Center"] = {
{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true}, {fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'), {fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')} description:__('Further cost centers can be made under Groups but entries can be made against non-Groups')}
] ],
} }

2
erpnext/setup/doctype/sales_person/sales_person_tree.js
View File

@ -1,6 +1,6 @@
frappe.treeview_settings["Sales Person"] = { frappe.treeview_settings["Sales Person"] = {
fields: [ fields: [
{fieldtype:'Data', fieldname: 'name_field', {fieldtype:'Data', fieldname: 'sales_person_name',
label:__('New Sales Person Name'), reqd:true}, label:__('New Sales Person Name'), reqd:true},
{fieldtype:'Link', fieldname:'employee', {fieldtype:'Link', fieldname:'employee',
label:__('Employee'), options:'Employee', label:__('Employee'), options:'Employee',

2
erpnext/stock/doctype/warehouse/warehouse.py
View File

@ -278,7 +278,7 @@ def add_node():
parent = None parent = None
doc.update({ doc.update({
name_field: frappe.form_dict['name_field'], name_field: frappe.form_dict['warehouse_name'],
parent_field: parent, parent_field: parent,
"is_group": frappe.form_dict['is_group'], "is_group": frappe.form_dict['is_group'],
"company": company "company": company

2
erpnext/stock/doctype/warehouse/warehouse_tree.js
View File

@ -11,7 +11,7 @@ frappe.treeview_settings['Warehouse'] = {
default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): "" default: frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
}], }],
fields:[ fields:[
{fieldtype:'Data', fieldname: 'name_field', {fieldtype:'Data', fieldname: 'warehouse_name',
label:__('New Warehouse Name'), reqd:true}, label:__('New Warehouse Name'), reqd:true},
{fieldtype:'Check', fieldname:'is_group', label:__('Is Group'), {fieldtype:'Check', fieldname:'is_group', label:__('Is Group'),
description: __("Child nodes can be only created under 'Group' type nodes")} description: __("Child nodes can be only created under 'Group' type nodes")}