diff --git a/line.xml b/line.xml
index 4530afb4e0..c03227721b 100644
--- a/line.xml
+++ b/line.xml
@@ -35,7 +35,8 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_line_form_work">
             <field name="name">Timesheet Lines</field>
             <field name="res_model">timesheet.line</field>
-            <field name="domain">[('work', 'in', Eval('active_ids'))]</field>
+            <field name="domain"
+                eval="[('work', 'in', Eval('active_ids'))]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_line_form_work_view1">
@@ -61,7 +62,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_line1">
-            <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
+            <field name="domain"
+                eval="[('employee', '=', Eval('user', {}).get('employee', None))]"
+                pyson="1"/>
             <field name="rule_group" ref="rule_group_line"/>
         </record>
         <record model="ir.rule.group" id="rule_group_line_admin">
@@ -121,7 +124,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_hours_employee1">
-            <field name="domain">[('employee', '=', user.employee.id if user.employee else None)]</field>
+            <field name="domain"
+                eval="[('employee', '=', Eval('user', {}).get('employee', None))]"
+                pyson="1"/>
             <field name="rule_group" ref="rule_group_hours_employee"/>
         </record>
         <record model="ir.rule.group" id="rule_group_hours_employee_admin">
diff --git a/work.xml b/work.xml
index e3570470cd..0ba7859470 100644
--- a/work.xml
+++ b/work.xml
@@ -25,7 +25,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_work_tree">
             <field name="name">Works</field>
             <field name="res_model">timesheet.work</field>
-            <field name="domain">[('parent', '=', None)]</field>
+            <field name="domain" eval="[('parent', '=', None)]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_work_tree_view1">
@@ -71,7 +71,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_work_tree2">
             <field name="name">Works</field>
             <field name="res_model">timesheet.work</field>
-            <field name="domain">[('parent', '=', None)]</field>
+            <field name="domain" eval="[('parent', '=', None)]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_work_tree2_view1">
@@ -88,7 +88,9 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_work_form2">
             <field name="name">Hours per Work</field>
             <field name="res_model">timesheet.work</field>
-            <field name="domain">[('parent', '=', Get(Eval('timesheet.act_work_tree2', {}), 'id', None))]</field>
+            <field name="domain"
+                eval="[('parent', '=', Get(Eval('timesheet.act_work_tree2', {}), 'id', None))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_work_form2_view1">
@@ -129,7 +131,8 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_work_form3">
             <field name="name">Hours per Work</field>
             <field name="res_model">timesheet.work</field>
-            <field name="domain">[('parent', 'in', Eval('active_ids'))]</field>
+            <field name="domain"
+                eval="[('parent', 'in', Eval('active_ids'))]" pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_work_form3_view1">
@@ -169,7 +172,9 @@ this repository contains the full copyright notices and license terms. -->
             <field name="default_p" eval="True"/>
         </record>
         <record model="ir.rule" id="rule_work1">
-            <field name="domain">[('company', '=', user.company.id if user.company else None)]</field>
+            <field name="domain"
+                eval="[('company', '=', Eval('user', {}).get('company', None))]"
+                pyson="1"/>
             <field name="rule_group" ref="rule_group_work"/>
         </record>
         <record model="ir.rule.group" id="rule_group_work_admin">