diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index b082df0c89e..9c4cf8e95b2 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -220,7 +220,7 @@ class crm_meeting(osv.Model): invitation['attendee'].append({'name':attendee.cn,'status': attendee.state}) return invitation - def get_day(self, cr, uid, ids, date, interval, context=None): + def get_interval(self, cr, uid, ids, date, interval, context=None): date = datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT) if interval == 'day': res = str(date.day) diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml index ca9a42f6b71..d34ddd7020d 100644 --- a/addons/base_calendar/crm_meeting_data.xml +++ b/addons/base_calendar/crm_meeting_data.xml @@ -54,12 +54,12 @@
-
${object.get_day(object.date, 'dayname')}
+
${object.get_interval(object.date, 'dayname')}
- ${object.get_day(object.date,'day')} + ${object.get_interval(object.date,'day')}
-
${object.get_day(object.date, 'month')}
-
${object.get_day(object.date, 'time')}
+
${object.get_interval(object.date, 'month')}
+
${object.get_interval(object.date, 'time')}
 diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index 196e740a6e1..0de1c91aa7d 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -10,6 +10,6 @@ access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1, access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,1,0,0 access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1 access_crm_meeting_type_sale_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0 -access_crm_meeting_type_sale_user,crm.meeting.type.user,model_crm_meeting_type,base.group_user,1,0,0,0 +access_crm_meeting_type_sale_user,crm.meeting.type.user,model_crm_meeting_type,base.group_user,1,1,0,0 access_crm_meeting_type_sale_user,crm.meeting.type.salesman,model_crm_meeting_type,base.group_sale_salesman,1,0,0,0 access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1 diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv index 450043e8118..e365b39abca 100644 --- a/addons/portal/security/ir.model.access.csv +++ b/addons/portal/security/ir.model.access.csv @@ -7,5 +7,3 @@ access_res_partner_portal,res.partner.portal,base.model_res_partner,portal.group access_acquirer,portal.payment.acquirer,portal.model_portal_payment_acquirer,,1,0,0,0 access_acquirer_all,portal.payment.acquirer,portal.model_portal_payment_acquirer,base.group_system,1,1,1,1 access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,portal.group_portal,1,0,1,0 -access_crm_meeting_portal,crm.meeting.portal,base_calendar.model_crm_meeting,portal.group_portal,1,1,0,0 -access_crm_meeting_type_portal,crm.meeting.type.portal,base_calendar.model_crm_meeting_type,portal.group_portal,1,0,0,0 diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py index 2eaa829e88a..f5e1ef6cab2 100644 --- a/addons/portal_crm/__openerp__.py +++ b/addons/portal_crm/__openerp__.py @@ -33,6 +33,7 @@ This module adds a contact page (with a contact form creating a lead when submit 'depends': ['crm','portal'], 'data': [ 'contact_view.xml', + 'security/ir.model.access.csv', ], 'test': [ 'test/contact_form.yml', diff --git a/addons/portal_crm/security/ir.model.access.csv b/addons/portal_crm/security/ir.model.access.csv new file mode 100644 index 00000000000..0e306fa532b --- /dev/null +++ b/addons/portal_crm/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_crm_meeting_portal,crm.meeting.portal,base_calendar.model_crm_meeting,portal.group_portal,1,1,0,0 +access_crm_meeting_type_portal,crm.meeting.type.portal,base_calendar.model_crm_meeting_type,portal.group_portal,1,0,0,0