From 4c56b223c49ae3960b08afaf0ed236a2fa2fcf6e Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 17 Feb 2017 11:06:33 +0100
Subject: [PATCH] Improve relate domain inversion when single record

issue5475
review33801002
---
 party.xml    |  3 ++-
 purchase.xml | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/party.xml b/party.xml
index 2d2003418f..285f699e93 100644
--- a/party.xml
+++ b/party.xml
@@ -7,7 +7,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Purchases</field>
             <field name="res_model">purchase.purchase</field>
             <field name="domain"
-                eval="[('party', 'in', Eval('active_ids'))]" pyson="1"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('party', '=', Eval('active_id')), ('party', 'in', Eval('active_ids')))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_purchase_keyword1">
diff --git a/purchase.xml b/purchase.xml
index 22504b6846..531d0f6802 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -70,7 +70,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Shipments</field>
             <field name="res_model">stock.shipment.in</field>
             <field name="domain"
-                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('moves.purchase', '=', Eval('active_id')), ('moves.purchase', 'in', Eval('active_ids')))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.keyword"
@@ -83,7 +83,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Returns</field>
             <field name="res_model">stock.shipment.in.return</field>
             <field name="domain"
-                eval="[('moves.purchase', 'in', Eval('active_ids'))]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('moves.purchase', '=', Eval('active_id')), ('moves.purchase', 'in', Eval('active_ids')))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.keyword"
@@ -97,7 +97,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="res_model">account.invoice</field>
             <field name="context"></field>
             <field name="domain"
-                eval="[('lines.origin.purchase.id', 'in', Eval('active_ids'), 'purchase.line')]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('lines.origin.purchase.id', '=', Eval('active_id'), 'purchase.line'), ('lines.origin.purchase.id', 'in', Eval('active_ids'), 'purchase.line'))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.keyword"
@@ -184,7 +184,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Purchases</field>
             <field name="res_model">purchase.purchase</field>
             <field name="domain"
-                eval="[('invoices', 'in', Eval('active_ids'))]" pyson="1"/>
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('invoices', '=', Eval('active_id')), ('invoices', 'in', Eval('active_ids')))]"
+                pyson="1"/>
         </record>
         <record model="ir.action.act_window.view"
             id="act_purchase_invoice_relate_view1">
@@ -461,7 +462,7 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">Prices</field>
             <field name="res_model">purchase.product_supplier.price</field>
             <field name="domain"
-                eval="[('product_supplier', 'in', Eval('active_ids'))]"
+                eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('product_supplier', '=', Eval('active_id')), ('product_supplier', 'in', Eval('active_ids')))]"
                 pyson="1"/>
         </record>
         <record model="ir.action.keyword"