diff --git a/models/res_users.py b/models/res_users.py
index adf46c159ff7aadc461508dfa57420da9016f888..c1e6a8e75eea5c029dd376fa6b6c4ae8f8792cd7 100644
--- a/models/res_users.py
+++ b/models/res_users.py
@@ -11,5 +11,10 @@ class ResUsers(models.Model):
def _get_ur(self):
return self.env.user.company_id.ur_id
- ur_id = fields.Many2one('union.regionale', related='company_id.ur_id',
- string='UR', inherited=True, readonly=True)
+ ur_id = fields.Many2one('union.regionale', compute='_compute_ur_id',
+ string='UR')
+
+ @api.depends('company_id.ur_id')
+ def _compute_ur_id(self):
+ for user in self:
+ user.ur_id = user.company_id.ur_id
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 62c704d3299da53b3665031f73d338fcb88d7f12..2a2910ed6c94065c6083d22ad11b1a852b220033 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -58,4 +58,3 @@ admin_scop_liasse_fiscale_source,admin_scop_liasse_fiscale_source,model_scop_lia
admin_res_partner_mandate,admin_res_partner_mandate,model_res_partner_mandate,group_cg_administrator,1,1,1,1
admin_res_partner_segment,admin_res_partner_segment,model_res_partner_segment,group_cg_administrator,1,1,1,1
admin_ur_res_partner_segment,admin_ur_res_partner_segment,model_res_partner_segment,group_ur_list_modif,1,1,1,1
-base.access_res_partner_group_partner_manager,"res_partner group_partner_manager",model_res_partner,group_partner_manager,1,1,1,0
diff --git a/security/security_rules.xml b/security/security_rules.xml
index c793d108e2e5810a94f574f829881746e73e2553..0d0c88e665f42c291db73b798395d47ad6dbd1df 100644
--- a/security/security_rules.xml
+++ b/security/security_rules.xml
@@ -3,7 +3,7 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
- <data noupdate="1">
+ <data noupdate="0">
<record id="group_ur_list_modif" model="res.groups">
<field name="name">Modifier les listes spécifiques de mon UR</field>
</record>
@@ -14,36 +14,30 @@
<record id="group_cg_administrator" model="res.groups">
<field name="name">Administrateur CG (modification listes)</field>
- <field name="implied_ids" eval="[(4, ref('group_cg_administrative')), (4, ref('group_ur_list_modif'))]"/>
+ <field name="implied_ids" eval="[(4, ref('cgscop_partner.group_cg_administrative')), (4, ref('group_ur_list_modif'))]"/>
</record>
<record id="base.res_users_rule" model="ir.rule">
<field name="name">user rule</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="domain_force">[('company_ids','child_of',[user.company_id.id])]</field>
- <field name="groups" eval="[(4, ref('base.group_erp_manager'))]"/>
- <field name="perm_read" eval="True"/>
- <field name="perm_write" eval="True"/>
- <field name="perm_create" eval="True"/>
- <field name="perm_unlink" eval="True"/>
+ <field name="groups" eval="[(6, 0, [ref('base.group_erp_manager')])]"/>
+ <field eval="True" name="global"/>
</record>
<record id="res_partner_rule_ur" model="ir.rule">
<field name="name">user rule administrator cg</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4, ref('base.group_cg_administrator'))]"/>
- <field name="perm_read" eval="True"/>
- <field name="perm_write" eval="True"/>
- <field name="perm_create" eval="True"/>
- <field name="perm_unlink" eval="True"/>
+ <field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
+ <field eval="True" name="global"/>
</record>
<record id="res_partner_rule_ur" model="ir.rule">
<field name="name">partner rule per ur</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="domain_force">['|',('ur_id','=',False),('ur_id','=',user.company_id.ur_id.id)]</field>
- <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+ <field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>
<field name="perm_read" eval="False"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
@@ -54,7 +48,7 @@
<field name="name">partner rule per ur</field>
<field name="model_id" ref="base.model_res_partner"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4, ref('cgscop_partner.group_cg_administrator'))]"/>
+ <field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
<field name="perm_read" eval="False"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="False"/>
@@ -65,22 +59,26 @@
<field name="name">segment rule per ur</field>
<field name="model_id" ref="model_res_partner_segment"/>
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field>
- <field name="groups" eval="[(4, ref('base.group_user'))]"/>
- <field name="perm_read" eval="True"/>
- <field name="perm_write" eval="True"/>
- <field name="perm_create" eval="True"/>
- <field name="perm_unlink" eval="True"/>
+ <field name="groups" eval="[(6, 0, ref('base.group_user'))]"/>
+ <field eval="True" name="global"/>
</record>
<record id="res_partner_segment_rule_admin" model="ir.rule">
<field name="name">partner rule per ur</field>
<field name="model_id" ref="model_res_partner_segment"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4, ref('cgscop_partner.group_cg_administrator'))]"/>
+ <field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
+ <field eval="True" name="global"/>
+ </record>
+
+ <record id="base.access_res_partner_group_partner_manager" model="ir.model.access">
+ <field name="name">res_partner group_partner_manager</field>
+ <field name="model_id" ref="base.model_res_partner"/>
+ <field name="group_id" ref="base.group_partner_manager"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
- <field name="perm_unlink" eval="True"/>
+ <field name="perm_unlink" eval="False"/>
</record>
</data>
</odoo>
diff --git a/views/res_users.xml b/views/res_users.xml
index de89139a017e31ac96be3cd66ac0e6b2e2dd684f..6a32a2853420dd73ef36c7928ff480b8454c07ce 100644
--- a/views/res_users.xml
+++ b/views/res_users.xml
@@ -9,9 +9,9 @@
<field name="model">res.users</field>
<field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml">
- <field name="partner_id" position="after">
+ <xpath expr="//div[hasclass('oe_title')]//field[@name='partner_id']" position="after">
<field name="ur_id"/>
- </field>
+ </xpath>
</field>
</record>
</data>