From 1bbcc078296a929f0a5cddad14f703310a5bdfc0 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Fri, 6 Sep 2019 16:13:32 +0200
Subject: [PATCH] Fix partner_company_group filter priority

Search on company group shouldn't overwrite the default invoice number search
---
 partner_company_group/readme/CONTRIBUTORS.rst      | 3 ++-
 partner_company_group/views/account_move_views.xml | 2 +-
 partner_company_group/views/opportunity_view.xml   | 2 +-
 partner_company_group/views/sale_order_view.xml    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/partner_company_group/readme/CONTRIBUTORS.rst b/partner_company_group/readme/CONTRIBUTORS.rst
index 6505173a1..274fa00ac 100644
--- a/partner_company_group/readme/CONTRIBUTORS.rst
+++ b/partner_company_group/readme/CONTRIBUTORS.rst
@@ -1,4 +1,5 @@
-Timon Tschanz <timon.tschanz@camptocamp.com>
+* Timon Tschanz <timon.tschanz@camptocamp.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * `Tecnativa <https://www.tecnativa.com>`_:
 
   * Ernesto Tejeda
diff --git a/partner_company_group/views/account_move_views.xml b/partner_company_group/views/account_move_views.xml
index f7ae61cef..1fd822986 100644
--- a/partner_company_group/views/account_move_views.xml
+++ b/partner_company_group/views/account_move_views.xml
@@ -4,7 +4,7 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_account_invoice_filter"/>
         <field name="arch" type="xml">
-            <field name="name" position="before">
+            <field name="name" position="after">
                 <field name="company_group_id" />
             </field>
             <filter name="salesperson" position="before">
diff --git a/partner_company_group/views/opportunity_view.xml b/partner_company_group/views/opportunity_view.xml
index 548204883..74985dfef 100644
--- a/partner_company_group/views/opportunity_view.xml
+++ b/partner_company_group/views/opportunity_view.xml
@@ -5,7 +5,7 @@
         <field name="model">crm.lead</field>
         <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter" />
         <field name="arch" type="xml">
-            <field name="name" position="before">
+            <field name="name" position="after">
                 <field name="company_group_id" />
             </field>
             <filter name="salesperson" position="before">
diff --git a/partner_company_group/views/sale_order_view.xml b/partner_company_group/views/sale_order_view.xml
index 321938ef4..e56febf9e 100644
--- a/partner_company_group/views/sale_order_view.xml
+++ b/partner_company_group/views/sale_order_view.xml
@@ -5,7 +5,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_sales_order_filter" />
         <field name="arch" type="xml">
-            <field name="name" position="before">
+            <field name="name" position="after">
                 <field name="company_group_id" />
             </field>
             <filter name="customer" position="before">