Merge branch '16.0-admin' of...

Merge branch '16.0-admin' of sources.le-filament.com:lefilament/oacc/oacc_repartition_keys into 16.0-admin

security/ir.model.access.csv

 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+<<<<<<< HEAD
 "access_acc_repartition_keys_group_operation_superadmin","acc_repartition_keys group_operation_superadmin","model_acc_repartition_keys","oacc.group_operation_superadmin",1,1,1,0
 "access_acc_repartition_keys_wizard_group_operation_superadmin","acc_repartition_keys_wizard group_operation_superadmin","model_acc_repartition_keys_wizard","oacc.group_operation_superadmin",1,1,1,1
+=======
+"access_acc_repartition_keys_group_operation_admin","acc_repartition_keys group_operation_admin","model_acc_repartition_keys","oacc.group_operation_admin",1,1,1,0
+"access_acc_repartition_keys_wizard_group_operation_admin","acc_repartition_keys_wizard group_operation_admin","model_acc_repartition_keys_wizard","oacc.group_operation_admin",1,1,1,1
+>>>>>>> 4dfd18c5a4bb5d0890560e5c5f26b9d44b9bea42