diff --git a/modules/purchase/invoice.xml b/modules/purchase/invoice.xml
index 18e7e663d4..11ecbf138a 100644
--- a/modules/purchase/invoice.xml
+++ b/modules/purchase/invoice.xml
@@ -28,6 +28,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="False"/>
         </record>
 
+        <record model="ir.action.act_window" id="act_invoice_line_form">
+            <field name="name">Invoice Lines</field>
+            <field name="res_model">account.invoice.line</field>
+            <field
+                name="domain"
+                eval="[('origin.id', 'in', Eval('active_ids', []), 'purchase.line')]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword" id="act_invoice_line_form_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">purchase.line,-1</field>
+            <field name="action" ref="act_invoice_line_form"/>
+        </record>
+
         <record model="ir.model.access" id="access_invoice_line_purchase">
             <field name="model">account.invoice.line</field>
             <field name="group" ref="group_purchase"/>
diff --git a/modules/purchase/stock.xml b/modules/purchase/stock.xml
index 70d78b8d1f..08fb250f9a 100644
--- a/modules/purchase/stock.xml
+++ b/modules/purchase/stock.xml
@@ -36,7 +36,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="res_model">stock.move</field>
             <field
                 name="domain"
-                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('purchase', '=', Eval('active_id')), ('purchase', 'in', Eval('active_ids')))]"
+                eval="[
+                If(Eval('active_model') == 'purchase.purchase',
+                ('purchase', 'in', Eval('active_ids', [])), ()),
+                If(Eval('active_model') == 'purchase.line',
+                ('origin.id', 'in', Eval('active_ids', []), 'purchase.line'), ()),
+                ]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_move_form_view1">
@@ -49,11 +54,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="stock.move_view_form"/>
             <field name="act_window" ref="act_purchase_move_relate"/>
         </record>
-        <record model="ir.action.keyword" id="act_move_form_keyword1">
+        <record model="ir.action.keyword" id="act_move_form_keyword_purchase">
             <field name="keyword">form_relate</field>
             <field name="model">purchase.purchase,-1</field>
             <field name="action" ref="act_purchase_move_relate"/>
         </record>
+        <record model="ir.action.keyword" id="act_move_form_keyword_purchase_line">
+            <field name="keyword">form_relate</field>
+            <field name="model">purchase.line,-1</field>
+            <field name="action" ref="act_purchase_move_relate"/>
+        </record>
 
         <record model="ir.action.act_window" id="act_shipment_form">
             <field name="name">Shipments</field>
diff --git a/modules/sale/invoice.xml b/modules/sale/invoice.xml
index 8c927501a3..7062455e4a 100644
--- a/modules/sale/invoice.xml
+++ b/modules/sale/invoice.xml
@@ -27,6 +27,20 @@ this repository contains the full copyright notices and license terms. -->
             <field name="perm_delete" eval="False"/>
         </record>
 
+        <record model="ir.action.act_window" id="act_invoice_line_form">
+            <field name="name">Invoice Lines</field>
+            <field name="res_model">account.invoice.line</field>
+            <field
+                name="domain"
+                eval="[('origin.id', 'in', Eval('active_ids', []), 'sale.line')]"
+                pyson="1"/>
+        </record>
+        <record model="ir.action.keyword" id="act_invoice_line_form_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">sale.line,-1</field>
+            <field name="action" ref="act_invoice_line_form"/>
+        </record>
+
         <record model="ir.model.access" id="access_invoice_line_sale">
             <field name="model">account.invoice.line</field>
             <field name="group" ref="group_sale"/>
diff --git a/modules/sale/stock.xml b/modules/sale/stock.xml
index 894ab3b464..046c389f5d 100644
--- a/modules/sale/stock.xml
+++ b/modules/sale/stock.xml
@@ -24,7 +24,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="res_model">stock.move</field>
             <field
                 name="domain"
-                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('sale', '=', Eval('active_id')), ('sale', 'in', Eval('active_ids')))]"
+                eval="[
+                If(Eval('active_model') == 'sale.sale',
+                ('sale', 'in', Eval('active_ids', [])), ()),
+                If(Eval('active_model') == 'sale.line',
+                ('origin.id', 'in', Eval('active_ids', []), 'sale.line'), ()),
+                ]"
                 pyson="1"/>
         </record>
         <record model="ir.action.act_window.view" id="act_move_form_view1">
@@ -37,11 +42,16 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="stock.move_view_form"/>
             <field name="act_window" ref="act_sale_move_relate"/>
         </record>
-        <record model="ir.action.keyword" id="act_move_form_keyword1">
+        <record model="ir.action.keyword" id="act_move_form_keyword_sale">
             <field name="keyword">form_relate</field>
             <field name="model">sale.sale,-1</field>
             <field name="action" ref="act_sale_move_relate"/>
         </record>
+        <record model="ir.action.keyword" id="act_move_form_keyword_sale_line">
+            <field name="keyword">form_relate</field>
+            <field name="model">sale.line,-1</field>
+            <field name="action" ref="act_sale_move_relate"/>
+        </record>
 
         <record model="ir.model.access" id="access_shipment_out_group_sale">
             <field name="model">stock.shipment.out</field>