diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 8a84ad47fc6..5c4c9a0a525 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -4,12 +4,13 @@ Accounting / Invoicing & Payments - Accounting / Accountant + Accounting / Manager + diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 872d9d02a92..4bae0c30ce6 100644 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -5,6 +5,9 @@ Accounting / Payments + + + Payment Mode company rule diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml index 1fc69bb314f..3caf93a2430 100644 --- a/addons/auction/security/auction_security.xml +++ b/addons/auction/security/auction_security.xml @@ -2,12 +2,13 @@ - - Auction / Manager - Auction / User + + Auction / Manager + + - \ No newline at end of file + diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 78018a4031b..45b7ccb017e 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -2,16 +2,18 @@ - - Sales / Manager - - - Sales / User + Sales / User - Own Leads Only - Sales / User - See All Leads + Sales / User - All Leads + + + + + Sales / Manager + diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index 648662911d2..c3c70c94d93 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -2,14 +2,15 @@ - - Marketing / Manager - - Marketing / User + + Marketing / Manager + + + Sales / Manager diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index aba7d4b45e1..aadadd224e9 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -2,12 +2,13 @@ - - Human Resources / Manager - - Human Resources / Officer + + Human Resources / Manager + + + diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml index 4b060c51e6c..344cbc64292 100644 --- a/addons/idea/security/idea_security.xml +++ b/addons/idea/security/idea_security.xml @@ -1,14 +1,15 @@ - + - - Tools / Manager - - - Tools / User - + + Tools / User + + + Tools / Manager + + - + diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index e042ac0c594..e84cdb41c0d 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -2,12 +2,13 @@ - - Tools / Manager - - - Tools / User - - + + Tools / User + + + Tools / Manager + + + diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml index 06cf40772f4..344e562eb67 100644 --- a/addons/marketing/security/marketing_security.xml +++ b/addons/marketing/security/marketing_security.xml @@ -4,10 +4,11 @@ Marketing / User - + Marketing / Manager + - + diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index 1cc4c5cea9b..94f79769268 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -2,12 +2,13 @@ - - Manufacturing / Manager - Manufacturing / User + + Manufacturing / Manager + + diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml index 9a90b4d4b6f..14c9e96df9e 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -2,11 +2,13 @@ - - Point of Sale / Manager - Point of Sale / User + + Point of Sale / Manager + + + diff --git a/addons/portal/portal.py b/addons/portal/portal.py index 78483d6a1f1..1c7f84c363a 100644 --- a/addons/portal/portal.py +++ b/addons/portal/portal.py @@ -37,10 +37,6 @@ class portal(osv.osv): 'group_id': fields.many2one('res.groups', required=True, ondelete='cascade', string='Group', help='The group extended by this portal'), - 'other_group_ids': fields.many2many('res.groups', - 'portal_group_rel', 'portal_id', 'group_id', - string='Other User Groups', - help="Those groups are assigned to the portal's users"), 'url': fields.char('URL', size=64, help="The url where portal users can connect to the server"), 'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True, @@ -70,8 +66,8 @@ class portal(osv.osv): portal_id = super(portal, self).create(cr, uid, values, context) # assign menu action and widgets to users - if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'): - self._assign_menu_and_groups(cr, uid, [portal_id], context) + if values.get('users') or values.get('menu_action_id'): + self._assign_menu(cr, uid, [portal_id], context) if values.get('users') or values.get('widget_ids'): self._assign_widgets(cr, uid, [portal_id], context) @@ -83,8 +79,8 @@ class portal(osv.osv): super(portal, self).write(cr, uid, ids, values, context) # assign menu action and widgets to users - if values.get('users') or values.get('other_group_ids') or values.get('menu_action_id'): - self._assign_menu_and_groups(cr, uid, ids, context) + if values.get('users') or values.get('menu_action_id'): + self._assign_menu(cr, uid, ids, context) if values.get('users') or values.get('widget_ids'): self._assign_widgets(cr, uid, ids, context) @@ -117,18 +113,15 @@ class portal(osv.osv): return True - def _assign_menu_and_groups(self, cr, uid, ids, context=None): - """ assign portal menu and other groups to users of portals (ids) """ + def _assign_menu(self, cr, uid, ids, context=None): + """ assign portal menu to users of portals (ids) """ user_obj = self.pool.get('res.users') for p in self.browse(cr, uid, ids, context): - # user groups = portal group + other groups - group_ids = [p.group_id.id] + [g.id for g in p.other_group_ids] - user_values = {'groups_id': [(6, 0, group_ids)]} # user menu action = portal menu action if set in portal if p.menu_action_id: - user_values['menu_id'] = p.menu_action_id.id - user_ids = [u.id for u in p.users if u.id != 1] - user_obj.write(cr, uid, user_ids, user_values, context) + user_ids = [u.id for u in p.users if u.id != 1] + user_values = {'menu_id': p.menu_action_id.id} + user_obj.write(cr, uid, user_ids, user_values, context) def _assign_widgets(self, cr, uid, ids, context=None): """ assign portal widgets to users of portals (ids) """ diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index d43c6115ad6..a6a780fdf16 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -43,10 +43,19 @@ the portal's users. - + + + + + + + + + + @@ -56,18 +65,6 @@ the portal's users.