From 5a6f6edb17eaaa9937d298cdeea0f35e0a4d29a7 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 12 Jun 2018 10:35:25 +0200
Subject: [PATCH] [IMP] point_of_sale: move barcode field into base

The field was already declared in base but added in the view in point_of_sale
only.

Remove the duplicated field definition on the model.

Closes #25070
Fixes #13544
---
 addons/point_of_sale/models/res_partner.py      | 1 -
 addons/point_of_sale/views/res_partner_view.xml | 5 -----
 odoo/addons/base/views/res_partner_views.xml    | 1 +
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/point_of_sale/models/res_partner.py b/addons/point_of_sale/models/res_partner.py
index e094d68cf21..5f005d308cb 100644
--- a/addons/point_of_sale/models/res_partner.py
+++ b/addons/point_of_sale/models/res_partner.py
@@ -6,7 +6,6 @@ from odoo import api, fields, models
 class ResPartner(models.Model):
     _inherit = 'res.partner'
 
-    barcode = fields.Char(string='Barcode', oldname='ean13')
     pos_order_count = fields.Integer(
         compute='_compute_pos_order',
         help="The number of point of sales orders related to this customer",
diff --git a/addons/point_of_sale/views/res_partner_view.xml b/addons/point_of_sale/views/res_partner_view.xml
index b7be54f7c9f..5a532aec6e5 100644
--- a/addons/point_of_sale/views/res_partner_view.xml
+++ b/addons/point_of_sale/views/res_partner_view.xml
@@ -14,11 +14,6 @@
                         <field string="POS Sales" name="pos_order_count" widget="statinfo"/>
                     </button>
                 </div>
-                <xpath expr="//page[@name='sales_purchases']/group">
-                    <group string="Point of Sale" name="point_of_sale">
-                        <field name="barcode" />
-                    </group>
-                </xpath>
             </field>
         </record>
         <record id="view_partner_pos_kanban" model="ir.ui.view">
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 3370eaeb5ce..5ded79d3e67 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -380,6 +380,7 @@
                                 </group>
                                 <group string="Misc">
                                     <field name="ref"/>
+                                    <field name="barcode"/>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
                                     <field name="industry_id" attrs="{'invisible': [('is_company', '=', False)]}" options="{'no_create': True}"/>
                                 </group>