From 2e2993444afc175bccc8ea352b53d1cea47cbcad Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 13 Mar 2013 22:18:20 +0530 Subject: [PATCH 1/3] removed style settings save patch --- patches/patch_list.py | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/patch_list.py b/patches/patch_list.py index 3f51209768..bc68ea15c2 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -210,6 +210,5 @@ patch_list = [ "execute:webnotes.delete_doc('DocType', 'Attendance Control Panel')", "patches.march_2013.p02_get_global_default", "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')", ] \ No newline at end of file From b8bf40f7893fb45c0deeca74a3c579e3b6ff2f63 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 10:07:59 +0530 Subject: [PATCH 2/3] feature setup: fix for more info --- public/js/feature_setup.js | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 0304034cf6..72bc7f285d 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -172,16 +172,18 @@ pscript.feature_dict = { 'Sales Order': {'fields':['sales_team','Packing List']} }, 'fs_more_info': { - 'Delivery Note': {'fields':['More Info']}, - 'Opportunity': {'fields':['More Info']}, - 'Material Request': {'fields':['More Info']}, - 'Lead': {'fields':['More Info']}, - 'Purchase Invoice': {'fields':['More Info']}, - 'Purchase Order': {'fields':['More Info']}, - 'Purchase Receipt': {'fields':['More Info']}, - 'Quotation': {'fields':['More Info']}, - 'Sales Invoice': {'fields':['More Info']}, - 'Sales Order': {'fields':['More Info']}, + "Customer Issue": {"fields": ["more_info"]}, + 'Material Request': {'fields':['more_info']}, + 'Lead': {'fields':['more_info']}, + 'Opportunity': {'fields':['more_info']}, + 'Purchase Invoice': {'fields':['more_info']}, + 'Purchase Order': {'fields':['more_info']}, + 'Purchase Receipt': {'fields':['more_info']}, + 'Supplier Quotation': {'fields':['more_info']}, + 'Quotation': {'fields':['more_info']}, + 'Sales Invoice': {'fields':['more_info']}, + 'Sales Order': {'fields':['more_info']}, + 'Delivery Note': {'fields':['more_info']}, }, 'fs_quality': { 'Item': {'fields':['Item Inspection Criteria','inspection_required']}, @@ -199,25 +201,23 @@ pscript.feature_dict = { } $(document).bind('form_refresh', function() { - for(sys_feat in sys_defaults) - { - if(sys_defaults[sys_feat]=='0' && (sys_feat in pscript.feature_dict)) //"Features to hide" exists - { - if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) - { - for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) - { - if(fort=='fields') + for(sys_feat in sys_defaults) { + if(sys_defaults[sys_feat]=='0' + && (sys_feat in pscript.feature_dict)) { //"Features to hide" exists + + if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat]) { + for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype]) { + if(fort=='fields') { 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]) 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'); + } } } + } } }) From 7bec21cfe75bbd88adc422a22ac28d46bf391ee7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 14 Mar 2013 10:09:13 +0530 Subject: [PATCH 3/3] feature setup: fix for more info --- public/js/feature_setup.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/feature_setup.js b/public/js/feature_setup.js index 72bc7f285d..85c848df03 100644 --- a/public/js/feature_setup.js +++ b/public/js/feature_setup.js @@ -166,10 +166,10 @@ pscript.feature_dict = { 'Address': {'fields':['sales_partner']}, 'Contact': {'fields':['sales_partner']}, 'Customer': {'fields':['sales_team']}, - 'Delivery Note': {'fields':['sales_team','Packing List']}, + 'Delivery Note': {'fields':['sales_team','packing_list']}, 'Item': {'fields':['item_customer_details']}, - 'Sales Invoice': {'fields':['sales_team']}, - 'Sales Order': {'fields':['sales_team','Packing List']} + 'Sales Invoice': {'fields':['sales_team', 'packing_list']}, + 'Sales Order': {'fields':['sales_team','packing_list']} }, 'fs_more_info': { "Customer Issue": {"fields": ["more_info"]},