From 5ae494f2bba91fa7725735d2dc0d8c9f032ba544 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 30 Jan 2018 13:31:13 +0100
Subject: [PATCH] [FIX] stock: more flexible xpath

If you have stock installed before 0322f6e5 and try to install stock_account
today, the installation fails.

Should not rely on a field added after the stable freeze

Fixes #21823
opw-802767
---
 addons/stock_account/views/stock_account_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index e169a2b7a8d..bd9f7f523f8 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -43,9 +43,9 @@
             <field name="inherit_id" ref="stock.view_stock_return_picking_form"/>
             <field name="model">stock.return.picking</field>
             <field name="arch" type="xml">
-                <field name="uom_id" position="after">
+                <xpath expr="//field[@name='product_return_moves']/tree" position="inside">
                     <field name="to_refund"/>
-                </field>
+                </xpath>
             </field>
         </record>