Skip to content
Extraits de code Groupes Projets
Valider 089f7d00 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[UPD] add current_ur_id for user and update mail.activity.type rule

parent 271150eb
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -12,17 +12,29 @@ class ResUsers(models.Model): ...@@ -12,17 +12,29 @@ class ResUsers(models.Model):
return self.env.company.ur_id return self.env.company.ur_id
ur_id = fields.Many2one( ur_id = fields.Many2one(
"union.regionale", compute="_compute_ur_id", string="UR", store=True comodel_name="union.regionale",
compute="_compute_ur_id",
string="UR",
store=True
)
current_ur_id = fields.Many2one(
comodel_name="union.regionale",
compute="_compute_current_ur_id",
string="UR courant",
) )
# ------------------------------------------------------ # ------------------------------------------------------
# Compute funcitons # Compute functions
# ------------------------------------------------------ # ------------------------------------------------------
@api.depends("company_id.ur_id") @api.depends("company_id.ur_id")
def _compute_ur_id(self): def _compute_ur_id(self):
for user in self: for user in self:
user.ur_id = user.company_id.ur_id user.ur_id = user.company_id.ur_id
def _compute_current_ur_id(self):
for user in self:
user.current_ur_id = self.env.company.ur_id
# ------------------------------------------------------ # ------------------------------------------------------
# Override parent # Override parent
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -219,36 +219,15 @@ ...@@ -219,36 +219,15 @@
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<!-- <record id="mail_activity_type_rule_ur_readall" model="ir.rule">-->
<!-- <field name="name">read all mail activity type rule per ur</field>-->
<!-- <field name="model_id" ref="mail.model_mail_activity_type"/>-->
<!-- <field name="domain_force">['|',('ur_id','=',False),('ur_id','=',user.company_id.ur_id.id)]</field>-->
<!-- <field name="groups" eval="[(6, 0, [ref('base.group_user')])]"/>-->
<!-- <field name="perm_read" eval="True"/>-->
<!-- <field name="perm_write" eval="False"/>-->
<!-- <field name="perm_create" eval="False"/>-->
<!-- <field name="perm_unlink" eval="False"/>-->
<!-- </record>-->
<record id="mail_activity_type_rule_ur" model="ir.rule">
<field name="name">mail activity type rule per ur</field>
<field name="model_id" ref="mail.model_mail_activity_type" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field>
<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" />
<field name="perm_unlink" eval="False" />
</record>
<record id="mail_activity_type_rule_admin" model="ir.rule"> <record id="mail_activity_type_rule_admin" model="ir.rule">
<field name="name">mail activity type rule administrator</field> <field name="name">mail activity type rule administrator</field>
<field name="model_id" ref="mail.model_mail_activity_type" /> <field name="model_id" ref="mail.model_mail_activity_type" />
<field name="domain_force">[(1,'=',1)]</field> <field name="domain_force">['|', ('ur_id','=',False), ('ur_id','=',user.current_ur_id.id)]</field>
<field <field name="perm_read" eval="True" />
name="groups" <field name="perm_write" eval="True" />
eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]" <field name="perm_create" eval="True" />
/> <field name="perm_unlink" eval="True" />
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter