nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Rushabh Mehta
2013-03-14 11:15:17 +05:30
parent e99ae3e475 7bec21cfe7
commit 4836e11d95
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -210,6 +210,5 @@ patch_list = [
"execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')", "execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')",
"patches.march_2013.p02_get_global_default", "patches.march_2013.p02_get_global_default",
"patches.march_2013.p03_rename_blog_to_blog_post", "patches.march_2013.p03_rename_blog_to_blog_post",
"execute:webnotes.bean('Style Settings', 'Style Settings').save()",
"execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')", "execute:webnotes.reload_doc('hr', 'search_criteria', 'monthly_attendance_details')",
] ]

52
public/js/feature_setup.js
View File

@@ -166,22 +166,24 @@ pscript.feature_dict = {
'Address': {'fields':['sales_partner']}, 'Address': {'fields':['sales_partner']},
'Contact': {'fields':['sales_partner']}, 'Contact': {'fields':['sales_partner']},
'Customer': {'fields':['sales_team']}, 'Customer': {'fields':['sales_team']},
'Delivery Note': {'fields':['sales_team','Packing List']}, 'Delivery Note': {'fields':['sales_team','packing_list']},
'Item': {'fields':['item_customer_details']}, 'Item': {'fields':['item_customer_details']},
'Sales Invoice': {'fields':['sales_team']}, 'Sales Invoice': {'fields':['sales_team', 'packing_list']},
'Sales Order': {'fields':['sales_team','Packing List']} 'Sales Order': {'fields':['sales_team','packing_list']}
}, },
'fs_more_info': { 'fs_more_info': {
'Delivery Note': {'fields':['More Info']}, "Customer Issue": {"fields": ["more_info"]},
'Opportunity': {'fields':['More Info']}, 'Material Request': {'fields':['more_info']},
'Material Request': {'fields':['More Info']}, 'Lead': {'fields':['more_info']},
'Lead': {'fields':['More Info']}, 'Opportunity': {'fields':['more_info']},
'Purchase Invoice': {'fields':['More Info']}, 'Purchase Invoice': {'fields':['more_info']},
'Purchase Order': {'fields':['More Info']}, 'Purchase Order': {'fields':['more_info']},
'Purchase Receipt': {'fields':['More Info']}, 'Purchase Receipt': {'fields':['more_info']},
'Quotation': {'fields':['More Info']}, 'Supplier Quotation': {'fields':['more_info']},
'Sales Invoice': {'fields':['More Info']}, 'Quotation': {'fields':['more_info']},
'Sales Order': {'fields':['More Info']}, 'Sales Invoice': {'fields':['more_info']},
'Sales Order': {'fields':['more_info']},
'Delivery Note': {'fields':['more_info']},
}, },
'fs_quality': { 'fs_quality': {
'Item': {'fields':['Item Inspection Criteria','inspection_required']}, 'Item': {'fields':['Item Inspection Criteria','inspection_required']},
@@ -199,25 +201,23 @@ pscript.feature_dict = {
} }
$(document).bind('form_refresh', function() { $(document).bind('form_refresh', function() {
for(sys_feat in sys_defaults) for(sys_feat in sys_defaults) {
{ if(sys_defaults[sys_feat]=='0'
if(sys_defaults[sys_feat]=='0' && (sys_feat in pscript.feature_dict)) //"Features to hide" exists && (sys_feat in pscript.feature_dict)) { //"Features to hide" exists
{
if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) {
{ for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) {
for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) if(fort=='fields') {
{
if(fort=='fields')
hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]); hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
else if(cur_frm.fields_dict[fort]) } else if(cur_frm.fields_dict[fort]) {
{
for(grid_field in pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]) for(grid_field in pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort])
cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort][grid_field], false); cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort][grid_field], false);
} } else {
else
msgprint('Grid "'+fort+'" does not exists'); msgprint('Grid "'+fort+'" does not exists');
}
} }
} }
} }
} }
}) })