diff --git a/inventory.xml b/inventory.xml
index 0790b01aae..041cb4fc23 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -7,7 +7,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Complete Inventory</field>
             <field name="wiz_name">stock.inventory.complete</field>
             <field name="model">stock.inventory</field>
-            <field name="groups" eval="[('add', ref('group_stock'))]"/>
+        </record>
+        <record model="ir.action-res.group"
+            id="wizard_complete_inventory_group_stock">
+            <field name="action" ref="wizard_complete_inventory"/>
+            <field name="group" ref="group_stock"/>
         </record>
 
         <record model="ir.ui.view" id="inventory_view_form">
diff --git a/shipment.xml b/shipment.xml
index 42b974afcc..8ef8e7a569 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -1363,9 +1363,18 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.sequence.type" id="sequence_type_shipment_out">
             <field name="name">Customer Shipment</field>
             <field name="code">stock.shipment.out</field>
-            <field name="groups"
-                eval="[('add', ref('res.group_admin')), ('add', ref('group_stock_admin'))]"/>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_out_group_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_out"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_out_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_out"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
         <record model="ir.sequence" id="sequence_shipment_out">
                 <field name="name">Customer Shipment</field>
                 <field name="code">stock.shipment.out</field>
@@ -1375,9 +1384,18 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.sequence.type" id="sequence_type_shipment_in">
             <field name="name">Supplier Shipment</field>
             <field name="code">stock.shipment.in</field>
-            <field name="groups"
-                eval="[('add', ref('res.group_admin')), ('add', ref('group_stock_admin'))]"/>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_in_group_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_in"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_in_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_in"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
         <record model="ir.sequence" id="sequence_shipment_in">
                 <field name="name">Supplier Shipment</field>
                 <field name="code">stock.shipment.in</field>
@@ -1387,9 +1405,18 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.sequence.type" id="sequence_type_shipment_internal">
             <field name="name">Internal Shipment</field>
             <field name="code">stock.shipment.internal</field>
-            <field name="groups"
-                eval="[('add', ref('res.group_admin')), ('add', ref('group_stock_admin'))]"/>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_internal_group_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_internal"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_internal_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_internal"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
         <record model="ir.sequence" id="sequence_shipment_internal">
                 <field name="name">Internal Shipment</field>
                 <field name="code">stock.shipment.internal</field>
@@ -1399,9 +1426,18 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.sequence.type" id="sequence_type_shipment_out_return">
             <field name="name">Customer Return Shipment</field>
             <field name="code">stock.shipment.out.return</field>
-            <field name="groups"
-                eval="[('add', ref('res.group_admin')), ('add', ref('group_stock_admin'))]"/>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_out_return_group_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_out_return"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_out_return_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_out_return"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
         <record model="ir.sequence" id="sequence_shipment_out_return">
                 <field name="name">Customer Return Shipment</field>
                 <field name="code">stock.shipment.out.return</field>
@@ -1411,9 +1447,18 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.sequence.type" id="sequence_type_shipment_in_return">
                 <field name="name">Supplier Return Shipment</field>
                 <field name="code">stock.shipment.in.return</field>
-            <field name="groups"
-                eval="[('add', ref('res.group_admin')), ('add', ref('group_stock_admin'))]"/>
         </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_in_return_group_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_in_return"/>
+            <field name="group" ref="res.group_admin"/>
+        </record>
+        <record model="ir.sequence.type-res.group"
+            id="sequence_type_shipment_in_return_group_stock_admin">
+            <field name="sequence_type" ref="sequence_type_shipment_in_return"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+
         <record model="ir.sequence" id="sequence_shipment_in_return">
                 <field name="name">Supplier Return Shipment</field>
                 <field name="code">stock.shipment.in.return</field>
diff --git a/stock.xml b/stock.xml
index 6bc146b8fe..8048fc2936 100644
--- a/stock.xml
+++ b/stock.xml
@@ -12,11 +12,36 @@ this repository contains the full copyright notices and license terms. -->
         <record model="res.group" id="group_stock_force_assignment">
             <field name="name">Stock Force Assignment</field>
         </record>
-        <record model="res.user" id="res.user_admin">
-            <field name="groups" eval="[('add', ref('group_stock_admin')), ('add', ref('group_stock')), ('add', ref('group_stock_force_assignment'))]"/>
+        <record model="res.user-res.group"
+            id="user_admin_group_stock_admin">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_stock_admin"/>
         </record>
-        <record model="res.user" id="res.user_trigger">
-            <field name="groups" eval="[('add', ref('group_stock_admin')), ('add', ref('group_stock')), ('add', ref('group_stock_force_assignment'))]"/>
+        <record model="res.user-res.group"
+            id="user_admin_group_stock">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_stock"/>
+        </record>
+        <record model="res.user-res.group"
+            id="user_admin_group_stock_force_assignment">
+            <field name="user" ref="res.user_admin"/>
+            <field name="group" ref="group_stock_force_assignment"/>
+        </record>
+
+        <record model="res.user-res.group"
+            id="user_trigger_group_stock_admin">
+            <field name="user" ref="res.user_trigger"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
+        <record model="res.user-res.group"
+            id="user_trigger_group_stock">
+            <field name="user" ref="res.user_trigger"/>
+            <field name="group" ref="group_stock"/>
+        </record>
+        <record model="res.user-res.group"
+            id="user_trigger_group_stock_force_assignment">
+            <field name="user" ref="res.user_trigger"/>
+            <field name="group" ref="group_stock_force_assignment"/>
         </record>
 
         <record model="ir.ui.icon" id="inventory_icon">
@@ -26,8 +51,12 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem name="Inventory Management" sequence="3" id="menu_stock"
             icon="tryton-inventory"/>
         <menuitem name="Configuration" parent="menu_stock"
-            id="menu_configuration" groups="group_stock_admin"
-            sequence="0" icon="tryton-preferences"/>
+            id="menu_configuration" sequence="0" icon="tryton-preferences"/>
+        <record model="ir.ui.menu-res.group"
+            id="menu_configuration_group_stock_admin">
+            <field name="menu" ref="menu_configuration"/>
+            <field name="group" ref="group_stock_admin"/>
+        </record>
 
         <menuitem name="Reporting" parent="menu_stock"
             id="menu_reporting" sequence="100" active="0"/>