From da453c68ad87039a7ebe90aaa47eb6c8d8cb2c91 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Mon, 28 Jun 2010 13:02:32 +0530 Subject: [PATCH] [IMP]: crm, base_calendar: Improvements for proper access rights bzr revid: rpa@tinyerp.com-20100628073232-kgt1l6imvjxgaipv --- .../security/ir.model.access.csv | 12 ++++-------- addons/crm/__openerp__.py | 6 +++--- addons/crm/crm_phonecall_menu.xml | 4 ++-- addons/crm/crm_phonecall_view.xml | 7 +++++-- addons/crm/crm_view.xml | 4 ++++ addons/crm/security/ir.model.access.csv | 19 ++++++++++++++----- addons/crm/wizard/crm_send_email.py | 2 +- addons/crm_claim/security/ir.model.access.csv | 6 ++++-- .../security/ir.model.access.csv | 6 ++++-- .../crm_helpdesk/security/ir.model.access.csv | 6 ++++-- 10 files changed, 45 insertions(+), 27 deletions(-) diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index a95b1e1a129..a334fd90081 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -1,9 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_calendar_attendee","calendar.attendee","model_calendar_attendee",base.group_user,1,1,1,1 -"access_calendar_alarm","calendar.alarm","model_calendar_alarm",base.group_user,1,1,1,1 -"access_res_alarm","res.alarm","model_res_alarm",base.group_user,1,1,1,1 -"access_calendar_event_all","calendar.event","model_calendar_event",base.group_user,1,1,1,1 -"access_calendar_todo","calendar.todo","model_calendar_todo",base.group_user,1,1,1,1 -"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",base.group_user,1,1,1,1 -"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",base.group_user,1,1,1,1 -"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",base.group_user,1,1,1,1 +"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1 +"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1 +"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1 +"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1 diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 6e7a8edb807..973bb12dc5c 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -70,6 +70,9 @@ Create dashboard for CRM that includes: 'crm_phonecall_data.xml', ], 'update_xml': [ + 'security/crm_security.xml', + 'security/ir.model.access.csv', + 'wizard/crm_lead_to_partner_view.xml', 'wizard/crm_lead_to_opportunity_view.xml', @@ -97,9 +100,6 @@ Create dashboard for CRM that includes: 'crm_opportunity_view.xml', 'crm_opportunity_menu.xml', - 'security/crm_security.xml', - 'security/ir.model.access.csv', - 'report/crm_lead_report_view.xml', 'report/crm_phonecall_report_view.xml', diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 6c5472afa99..9beb4f4c0c4 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -67,7 +67,7 @@ tree,calendar - {'set_editable':True,'default_state':'open','search_default_current':1,'search_default_today':1} + @@ -103,7 +103,7 @@ tree,calendar - {'default_state':'open','search_default_current':1} + diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index bb143964d70..479e73fe8fb 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -204,8 +204,11 @@ - - + + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index b196d9cb4ca..ab9e5aa0162 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -1,6 +1,10 @@ + + + + diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 3d9921db9ec..bd881630aff 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -4,9 +4,13 @@ "access_crm_segmentation","crm.segmentation","model_crm_segmentation","crm.group_crm_manager",1,1,1,1 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1 "access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0 +"access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0 +"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","crm.group_crm_manager",1,1,1,1 +"access_crm_lead_manager","crm.lead.manager","model_crm_lead","crm.group_crm_manager",1,1,1,1 +"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","crm.group_crm_manager",1,1,1,1 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_user",1,1,1,1 -"access_crm_meeting_all","crm.meeting"_allll,"model_crm_meeting","base.group_user",1,0,0,0 +"access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_user",1,1,1,1 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_user",1,1,1,1 @@ -19,12 +23,17 @@ "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0 "access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1 +"access_crm_lead_report_user","crm.lead.report.user","model_crm_lead_report","crm.group_crm_user",1,0,0,0 +"access_crm_phonecall_report_user","crm.phonecall.report.user","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0 "access_crm_lead_report_manager","crm.lead.report","model_crm_lead_report","crm.group_crm_manager",1,0,0,0 "access_crm_phonecall_report_manager","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_manager",1,0,0,0 -"access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1 -"access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1 -"access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1 -"access_crm_installer","crm.installer.rule","model_crm_installer","base.group_system",1,1,1,1 +"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","crm.group_crm_manager",1,0,1,0 +"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","crm.group_crm_manager",1,0,1,0 +"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","crm.group_crm_manager",1,0,0,0 +"mail_gateway_mailgate_message_manager","mail_gateway.mailgate.message.manager","mail_gateway.model_mailgate_message","crm.group_crm_manager",1,1,1,1 +"mail_gateway_mailgate_thread_manager","mail_gateway.mailgate.thread.manager","mail_gateway.model_mailgate_thread","crm.group_crm_manager",1,1,1,1 +"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","crm.group_crm_user",1,1,1,0 +"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","crm.group_crm_manager",1,1,1,1 "access_res_partner","res.partner.crm.user","base.model_res_partner","crm.group_crm_user",1,0,0,0 "access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","crm.group_crm_user",1,0,0,0 "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0 diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index d790d9b7a0a..1f03d650130 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -207,7 +207,7 @@ class crm_send_new_email(osv.osv_memory): res_id = hist.res_id case = model_pool.browse(cr, uid, res_id) if 'email_to' in fields: - res.update({'email_to': case.email_from or hist.email_from or False}) + res.update({'email_to': hist.email_from or False}) if 'email_from' in fields: res.update({'email_from': user_mail_from}) diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv index f903ab0c1d7..beb40a19dca 100644 --- a/addons/crm_claim/security/ir.model.access.csv +++ b/addons/crm_claim/security/ir.model.access.csv @@ -1,3 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_crm_claim","crm.claim","model_crm_claim","crm.group_crm_manager",1,1,1,1 -"access_crm_claim_report_user","crm.claim.report","model_crm_claim_report","crm.group_crm_user",1,0,0,0 +"access_crm_claim_manager","crm.claim.manager","model_crm_claim","crm.group_crm_manager",1,1,1,1 +"access_crm_claim_user","crm.claim.user","model_crm_claim","crm.group_crm_user",1,1,1,1 +"access_crm_claim_report_user","crm.claim.report.user","model_crm_claim_report","crm.group_crm_user",1,0,0,0 +"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","crm.group_crm_manager",1,0,0,0 diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv index 43e607538ee..44880de6332 100644 --- a/addons/crm_fundraising/security/ir.model.access.csv +++ b/addons/crm_fundraising/security/ir.model.access.csv @@ -1,3 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_crm_fundraising","crm.fundraising","model_crm_fundraising","crm.group_crm_manager",1,1,1,1 -"access_crm_fundraising_report_user","crm.fundraising.report","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0 +"access_crm_fundraising_manager","crm.fundraising.manager","model_crm_fundraising","crm.group_crm_manager",1,1,1,1 +"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","crm.group_crm_user",1,1,1,1 +"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","crm.group_crm_user",1,0,0,0 +"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","crm.group_crm_manager",1,0,0,0 diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv index c1420a5b2d6..c156428afbd 100644 --- a/addons/crm_helpdesk/security/ir.model.access.csv +++ b/addons/crm_helpdesk/security/ir.model.access.csv @@ -1,3 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_crm_helpdesk","crm.helpdesk","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1 -"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1 +"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","crm.group_crm_manager",1,1,1,1 +"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","crm.group_crm_user",1,1,1,1 +"access_report_crm_helpdesk_user","report.crm.helpdesk.user","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1 +"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","crm.group_crm_manager",1,1,1,1