diff --git a/invoice.xml b/invoice.xml
index fe1a39e549..ed964fd6f5 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -6,21 +6,27 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="invoice_line_view_form">
             <field name="model">account.invoice.line</field>
             <field name="inherit" ref="account_invoice.invoice_line_view_form"/>
-            <field name="domain">context.get('standalone', False)</field>
+            <field name="domain"
+                eval="Eval('context', {}).get('standalone', False)" pyson="1"/>
             <field name="name">invoice_line_form</field>
         </record>
         <record model="ir.ui.view" id="invoice_line_view_tree">
             <field name="model">account.invoice.line</field>
             <field name="inherit" ref="account_invoice.invoice_line_view_tree"/>
-            <field name="domain">context.get('standalone', False)</field>
+            <field name="domain"
+                eval="Eval('context', {}).get('standalone', False)" pyson="1"/>
             <field name="name">invoice_line_tree</field>
         </record>
 
         <record model="ir.action.act_window" id="act_invoice_line_out_invoice_form">
             <field name="name">Invoice Lines</field>
             <field name="res_model">account.invoice.line</field>
-            <field name="domain">[('invoice_type', '=', 'out_invoice'), ('invoice', '=', None)]</field>
-            <field name="context">{'invoice_type': 'out_invoice', 'standalone': True}</field>
+            <field name="domain"
+                eval="[('invoice_type', '=', 'out_invoice'), ('invoice', '=', None)]"
+                pyson="1"/>
+            <field name="context"
+                eval="{'invoice_type': 'out_invoice', 'standalone': True}"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_invoice_line_out_invoice_form_view1">
             <field name="sequence" eval="10"/>
@@ -39,8 +45,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_invoice_line_out_credit_note_form">
             <field name="name">Credit Note Lines</field>
             <field name="res_model">account.invoice.line</field>
-            <field name="domain">[('invoice_type', '=', 'out_credit_note'), ('invoice', '=', None)]</field>
-            <field name="context">{'invoice_type': 'out_credit_note', 'standalone': True}</field>
+            <field name="domain"
+                eval="[('invoice_type', '=', 'out_credit_note'), ('invoice', '=', None)]"
+                pyson="1"/>
+            <field name="context"
+                eval="{'invoice_type': 'out_credit_note', 'standalone': True}"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_invoice_line_out_credit_note_form_view1">
             <field name="sequence" eval="10"/>
@@ -59,8 +69,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_invoice_line_in_invoice_form">
             <field name="name">Supplier Invoice Lines</field>
             <field name="res_model">account.invoice.line</field>
-            <field name="domain">[('invoice_type', '=', 'in_invoice'), ('invoice', '=', None)]</field>
-            <field name="context">{'invoice_type': 'in_invoice', 'standalone': True}</field>
+            <field name="domain"
+                eval="[('invoice_type', '=', 'in_invoice'), ('invoice', '=', None)]"
+                pyson="1"/>
+            <field name="context"
+                eval="{'invoice_type': 'in_invoice', 'standalone': True}"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_invoice_line_in_invoice_form_view1">
             <field name="sequence" eval="10"/>
@@ -79,8 +93,12 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_invoice_line_in_credit_note_form">
             <field name="name">Supplier Credit Note Lines</field>
             <field name="res_model">account.invoice.line</field>
-            <field name="domain">[('invoice_type', '=', 'in_credit_note'), ('invoice', '=', None)]</field>
-            <field name="context">{'invoice_type': 'in_credit_note', 'standalone': True}</field>
+            <field name="domain"
+                eval="[('invoice_type', '=', 'in_credit_note'), ('invoice', '=', None)]"
+                pyson="1"/>
+            <field name="context"
+                eval="{'invoice_type': 'in_credit_note', 'standalone': True}"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_invoice_line_in_credit_note_form_view1">
             <field name="sequence" eval="10"/>