diff --git a/security/security_rules.xml b/security/security_rules.xml index 7c9736e63f7422043ae44dcbe4449dc60439d867..65821416d71898015777bd273cdeda4fd33138d1 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -11,7 +11,7 @@ <record id="scop_resource_rule_ur" model="ir.rule"> <field name="name">resource rule per ur</field> <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="global" eval="True" /> </record> @@ -19,7 +19,7 @@ <record id="scop_resource_rule_admin" model="ir.rule"> <field name="name">Calendar Event Admin</field> <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 name="groups" eval="[(6, 0, [ref('cgscop_resource.group_admin_resource')])]" diff --git a/views/scop_resource.xml b/views/scop_resource.xml index be5b0529f239333b3f1225a42ad1fabf61ce79ab..e06a0b94f4041fa6dec2af3df9bbc27c9866bdf4 100644 --- a/views/scop_resource.xml +++ b/views/scop_resource.xml @@ -156,7 +156,6 @@ </field> </record> - <!-- resource Event Form --> <record id="view_scop_resource_event_form" model="ir.ui.view"> <field name="name">scop.resource.event.view.form</field> @@ -259,6 +258,7 @@ /> <field name="scop_resource_id" + filters="1" options="{'no_open': True, 'no_create': True}" /> <field name="description" /> @@ -283,7 +283,7 @@ event_open_popup="true" color="scop_resource_id" quick_add="False" - resource_field='scop_resource_id' + resource_field="scop_resource_id" > <field name="name" invisible="1" /> <field @@ -293,6 +293,7 @@ /> <field name="scop_resource_id" + filters="1" options="{'no_open': True, 'no_create': True}" /> <field name="description" />