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

[fix] UR rules resource

parent 63517e62
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<record id="scop_resource_rule_ur" model="ir.rule"> <record id="scop_resource_rule_ur" model="ir.rule">
<field name="name">resource rule per ur</field> <field name="name">resource rule per ur</field>
<field name="model_id" ref="cgscop_resource.model_scop_resource" /> <field name="model_id" ref="cgscop_resource.model_scop_resource" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field name="global" eval="True" /> <field name="global" eval="True" />
</record> </record>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<record id="scop_resource_rule_admin" model="ir.rule"> <record id="scop_resource_rule_admin" model="ir.rule">
<field name="name">Calendar Event Admin</field> <field name="name">Calendar Event Admin</field>
<field name="model_id" ref="calendar.model_calendar_event" /> <field name="model_id" ref="calendar.model_calendar_event" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field>
<field <field
name="groups" name="groups"
eval="[(6, 0, [ref('cgscop_resource.group_admin_resource')])]" eval="[(6, 0, [ref('cgscop_resource.group_admin_resource')])]"
......
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
</field> </field>
</record> </record>
<!-- resource Event Form --> <!-- resource Event Form -->
<record id="view_scop_resource_event_form" model="ir.ui.view"> <record id="view_scop_resource_event_form" model="ir.ui.view">
<field name="name">scop.resource.event.view.form</field> <field name="name">scop.resource.event.view.form</field>
...@@ -259,6 +258,7 @@ ...@@ -259,6 +258,7 @@
/> />
<field <field
name="scop_resource_id" name="scop_resource_id"
filters="1"
options="{'no_open': True, 'no_create': True}" options="{'no_open': True, 'no_create': True}"
/> />
<field name="description" /> <field name="description" />
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
event_open_popup="true" event_open_popup="true"
color="scop_resource_id" color="scop_resource_id"
quick_add="False" quick_add="False"
resource_field='scop_resource_id' resource_field="scop_resource_id"
> >
<field name="name" invisible="1" /> <field name="name" invisible="1" />
<field <field
...@@ -293,6 +293,7 @@ ...@@ -293,6 +293,7 @@
/> />
<field <field
name="scop_resource_id" name="scop_resource_id"
filters="1"
options="{'no_open': True, 'no_create': True}" options="{'no_open': True, 'no_create': True}"
/> />
<field name="description" /> <field name="description" />
......
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