From 9410e0ce0065619d064ab398fc26366f45a40bba Mon Sep 17 00:00:00 2001
From: Arnaud Baes <arb@odoo.com>
Date: Fri, 2 Aug 2019 14:08:21 +0000
Subject: [PATCH] [MOV] stock, stock_barcode: barcode fields in views

---
 addons/stock/views/stock_location_views.xml        | 8 +-------
 addons/stock/views/stock_picking_views.xml         | 1 -
 addons/stock_account/views/stock_account_views.xml | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/stock/views/stock_location_views.xml b/addons/stock/views/stock_location_views.xml
index 322dcb27d28..9d8d668a19d 100644
--- a/addons/stock/views/stock_location_views.xml
+++ b/addons/stock/views/stock_location_views.xml
@@ -36,19 +36,13 @@
                     <h2><field name="location_id" options="{'no_create': True}"/></h2>
 
                     <group>
-                        <group string="Additional Information">
+                        <group string="Additional Information" name="additional_info">
                             <field name="active" invisible="1"/>
                             <field name="usage"/>
                             <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                             <field name="scrap_location" attrs="{'invisible': [('usage', 'not in', ('inventory', 'internal'))]}"/>
                             <field name="return_location"/>
                         </group>
-                        <group string="Localization" name="localization">
-                            <field name="posx"/>
-                            <field name="posy"/>
-                            <field name="posz"/>
-                            <field name="barcode"/>
-                        </group>
                         <group string="Logistics" groups="stock.group_adv_location">
                             <field name="removal_strategy_id" options="{'no_create': True}"/>
                         </group>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 44eb7992d7c..cb623895036 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -42,7 +42,6 @@
                                 <field name="name"/>
                                 <field name="sequence_id"/>
                                 <field name="warehouse_id" groups="stock.group_stock_multi_warehouses"/>
-                                <field name="barcode"/>
                             </group>
                             <group>
                                 <field name="code"/>
diff --git a/addons/stock_account/views/stock_account_views.xml b/addons/stock_account/views/stock_account_views.xml
index 50a59a11bb6..e6a1456180f 100644
--- a/addons/stock_account/views/stock_account_views.xml
+++ b/addons/stock_account/views/stock_account_views.xml
@@ -46,7 +46,7 @@
             <field name="model">stock.location</field>
             <field name="inherit_id" ref="stock.view_location_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='localization']" position="after">
+                <xpath expr="//group[@name='additional_info']" position="after">
                     <group string="Accounting Information" attrs="{'invisible':[('usage','not in',('inventory','production'))]}">
                         <field name="valuation_in_account_id" options="{'no_create': True}"/>
                         <field name="valuation_out_account_id" options="{'no_create': True}"/>