From 46a897dead5fe9fb6d3acf59f54b5c8e9b76ee72 Mon Sep 17 00:00:00 2001
From: Joseph Caburnay <jcb@odoo.com>
Date: Mon, 7 Oct 2019 09:11:22 +0000
Subject: [PATCH] [IMP] delivery: clean the shipping methods config

The shipping method configuration (with carrier) is a bit messy,
with a lot of fields which have been added => reorganize the fields
and the view to add coherence (on each carrier + between the different
carriers) and improve ease of use.

closes odoo/odoo#38052

Task-id: 2046300
Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
---
 addons/delivery/views/delivery_view.xml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 0cd4dfe90b4..32f57ffd2e7 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -94,17 +94,18 @@
                         </div>
                         <group>
                             <group name="provider_details">
-                                <field name="active"/>
                                 <field name="prod_environment" invisible="1"/>
                                 <field name="debug_logging" invisible="1"/>
                                 <label for="delivery_type"/>
                                 <div>
-                                    <field name="delivery_type" widget="radio"/>
+                                    <field name="delivery_type" />
                                     <button string="Install more Providers" name="install_more_provider" type="object" class="oe_link oe_edit_only"/>
                                 </div>
                                 <field name="integration_level" widget="radio" attrs="{'invisible': ['|', ('delivery_type', '=', 'fixed'), ('delivery_type', '=', 'base_on_rule')]}"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                             <group name="delivery_details">
+                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False}" />
                                 <field name="invoice_policy" widget="radio" attrs="{'invisible': ['|', ('delivery_type', 'in', ('fixed', 'base_on_rule')), ('integration_level', '=', 'rate')]}"/>
                                 <label for="margin" string="Margin on Rate"/>
                                 <div>
@@ -112,11 +113,6 @@
                                 </div>
                                 <field name="free_over"/>
                                 <field name="amount" attrs="{'required':[('free_over','!=', False)], 'invisible':[('free_over','=', False)]}"/>
-                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False}" />
-                                <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="can_generate_return" invisible="1"/>
-                                <field name="return_label_on_delivery" attrs="{'invisible': [('can_generate_return', '=', False)]}"/>
-                                <field name="get_return_label_from_portal" attrs="{'invisible': [('return_label_on_delivery', '=', False)]}"/>
                             </group>
                         </group>
                         <notebook>