diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py
index fe30a1c33e9..bda14428315 100644
--- a/addons/account/models/res_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -43,10 +43,6 @@ class ResConfigSettings(models.TransientModel):
         "Show line subtotals with taxes (B2C)",
         implied_group='account.group_show_line_subtotals_tax_included',
         group='base.group_portal,base.group_user,base.group_public')
-    group_products_in_bills = fields.Boolean(string="Use products in vendor bills",
-        implied_group='account.group_products_in_bills',
-        group='base.group_user',
-        help="Disable this option to use a simplified versions of vendor bills, where products are hidden.")
     show_line_subtotals_tax_selection = fields.Selection([
         ('tax_excluded', 'Tax-Excluded'),
         ('tax_included', 'Tax-Included')], string="Line Subtotals Tax Display",
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 029b06d5334..fa998f922ea 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -59,10 +59,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_products_in_bills" model="res.groups">
-        <field name="name">Use products on vendor bills</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
 
     <record id="account_analytic_line_rule_billing_user" model="ir.rule">
         <field name="name">account.analytic.line.billing.user</field>
@@ -218,10 +214,5 @@
         <field name="domain_force">[('invoice_id.message_partner_ids','child_of',[user.commercial_partner_id.id])]</field>
         <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
     </record>
-
-    <!-- Enable products on bills by default at installation -->
-    <record id="base.group_user" model="res.groups">
-        <field name="implied_ids" eval="[(4, ref('account.group_products_in_bills'))]"/>
-    </record>
 </data>
 </odoo>
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index d173f9cd09e..b965b67f488 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -343,22 +343,24 @@
                             <field context="{'type': type, 'journal_id': journal_id}" name="invoice_line_ids">
                                 <tree string="Bill lines" editable="bottom">
                                     <field name="sequence" widget="handle" />
-                                    <field name="product_id" groups="account.group_products_in_bills"
-                                        context="{'partner_id': parent.partner_id}" domain="[('purchase_ok','=',True)]"/>
+                                    <field name="product_id"
+                                        context="{'partner_id': parent.partner_id}" domain="[('purchase_ok','=',True)]"
+                                        optional="show"/>
                                     <field name="name"/>
                                     <field name="company_id" invisible="1"/>
                                     <field name="account_id" options="{'no_create': True}" groups="account.group_account_user"
                                         domain="[('company_id', '=', parent.company_id), ('internal_type', '=', 'other'), ('deprecated', '=', False)]"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
                                         domain="[('company_id', '=', parent.company_id)]"
-                                        context="{'default_partner_id': parent.partner_id}"/>
+                                        context="{'default_partner_id': parent.partner_id}"
+                                        optional="show"/>
                                     <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
                                     <field name="quantity"/>
-                                    <field name="uom_id" string="UoM" groups="uom.group_uom"/>
+                                    <field name="uom_id" string="UoM" groups="uom.group_uom" optional="show"/>
                                     <field name="price_unit"/>
-                                    <field name="discount" string="Disc.%" groups="base.group_no_one"/>
+                                    <field name="discount" string="Disc.%" groups="base.group_no_one" optional="show"/>
                                     <field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type, 'tree_view_ref': 'account.account_tax_view_tree', 'search_view_ref': 'account.account_tax_view_search'}"
-                                        domain="[('type_tax_use','=','purchase'),('company_id', '=', parent.company_id)]"/>
+                                        domain="[('type_tax_use','=','purchase'),('company_id', '=', parent.company_id)]" optional="show"/>
                                     <field name="price_subtotal" string="Amount"/>
                                     <field name="currency_id" invisible="1"/>
                                 </tree>
@@ -514,7 +516,7 @@
                                     </control>
 
                                     <field name="sequence" widget="handle"/>
-                                    <field name="product_id" domain="[('sale_ok','=',True)]"/>
+                                    <field name="product_id" domain="[('sale_ok','=',True)]" optional="show"/>
                                     <field name="origin" invisible="1"/>
                                     <field name="is_rounding_line" invisible="1"/>
                                     <field name="name" widget="section_and_note_text"/>
@@ -529,14 +531,17 @@
                                     />
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
                                         domain="[('company_id', '=', parent.company_id)]"
-                                        context="{'default_partner_id': parent.partner_id}"/>
-                                    <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                                        context="{'default_partner_id': parent.partner_id}"
+                                        optional="show"/>
+                                    <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"
+                                     optional="show"/>
                                     <field name="quantity"/>
-                                    <field name="uom_id" string="UoM" groups="uom.group_uom"/>
+                                    <field name="uom_id" string="UoM" groups="uom.group_uom" optional="show"/>
                                     <field name="price_unit" string="Price"/>
-                                    <field name="discount" groups="base.group_no_one" string="Disc.%"/>
+                                    <field name="discount" groups="base.group_no_one" string="Disc.%" optional="show"/>
                                     <field name="invoice_line_tax_ids" widget="many2many_tags" options="{'no_create': True}" context="{'type':parent.type, 'tree_view_ref': 'account.account_tax_view_tree', 'search_view_ref': 'account.account_tax_view_search'}"
-                                        domain="[('type_tax_use','=','sale'),('company_id', '=', parent.company_id)]"/>
+                                        domain="[('type_tax_use','=','sale'),('company_id', '=', parent.company_id)]"
+                                        optional="hide"/>
                                     <field name="price_subtotal" string="Subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
                                     <field name="price_total" string="Total" groups="account.group_show_line_subtotals_tax_included"/>
                                     <field name="currency_id" invisible="1"/>
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 107623839de..e9154f04d31 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -357,17 +357,6 @@
                         </div>
                         <h2>Vendor Bills</h2>
                         <div class="row mt16 o_settings_container" id="account_vendor_bills">
-                            <div class="col-xs-12 col-md-6 o_setting_box">
-                                <div class="o_setting_left_pane">
-                                    <field name="group_products_in_bills"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="group_products_in_bills"/>
-                                    <div class="text-muted">
-                                        Disable to have a simplified view of vendor bills, without the products.
-                                    </div>
-                                </div>
-                            </div>
                             <div class="col-12 col-lg-6 o_setting_box" id="account_ocr_settings">
                                 <div class="o_setting_left_pane">
                                     <field name="module_account_invoice_extract" widget="upgrade_boolean"/>
diff --git a/addons/event_sale/views/sale_order_views.xml b/addons/event_sale/views/sale_order_views.xml
index a13776072f3..bc875cd7114 100644
--- a/addons/event_sale/views/sale_order_views.xml
+++ b/addons/event_sale/views/sale_order_views.xml
@@ -36,8 +36,8 @@
             </xpath>
             <xpath expr="//field[@name='order_line']//tree//field[@name='product_id']" position="after">
                 <field name="event_ok" invisible="1" />
-                <field name="event_id" invisible="1" />
-                <field name="event_ticket_id" invisible="1" />
+                <field name="event_id" optional="hide" />
+                <field name="event_ticket_id" optional="hide" />
             </xpath>
         </field>
     </record>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index edaa5693f3f..19b654a7c6f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -191,19 +191,19 @@
                                     <field name="product_uom_category_id" invisible="1"/>
                                     <field name="sequence" widget="handle"/>
                                     <field name="product_id" attrs="{'readonly': [('state', 'in', ('purchase', 'to approve','done', 'cancel'))]}" context="{'partner_id':parent.partner_id, 'quantity':product_qty,'uom':product_uom, 'company_id': parent.company_id}" force_save="1"/>
-                                    <field name="name"/>
-                                    <field name="date_planned"/>
+                                    <field name="name" optional="show"/>
+                                    <field name="date_planned" optional="hide"/>
                                     <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
-                                    <field name="account_analytic_id" context="{'default_partner_id':parent.partner_id}" groups="analytic.group_analytic_accounting"/>
-                                    <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                                    <field name="account_analytic_id" optional="hide" context="{'default_partner_id':parent.partner_id}" groups="analytic.group_analytic_accounting"/>
+                                    <field name="analytic_tag_ids" optional="hide" groups="analytic.group_analytic_tags" widget="many2many_tags" options="{'color_field': 'color'}"/>
                                     <field name="product_qty"/>
                                     <field name="qty_received_manual" invisible="1"/>
                                     <field name="qty_received_method" invisible="1"/>
-                                    <field name="qty_received" string="Received" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))], 'readonly': [('qty_received_method', '!=', 'manual')]}"/>
-                                    <field name="qty_invoiced" string="Billed" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))]}"/>
-                                    <field name="product_uom" string="UoM" groups="uom.group_uom" attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))]}" force_save="1"/>
+                                    <field name="qty_received" string="Received" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))], 'readonly': [('qty_received_method', '!=', 'manual')]}" optional="show"/>
+                                    <field name="qty_invoiced" string="Billed" attrs="{'column_invisible': [('parent.state', 'not in', ('purchase', 'done'))]}" optional="show"/>
+                                    <field name="product_uom" string="UoM" groups="uom.group_uom" attrs="{'readonly': [('state', 'in', ('purchase', 'done', 'cancel'))]}" force_save="1" optional="show"/>
                                     <field name="price_unit"/>
-                                    <field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]" context="{'default_type_tax_use': 'purchase', 'search_view_ref': 'account.account_tax_view_search'}" options="{'no_create': True}"/>
+                                    <field name="taxes_id" widget="many2many_tags" domain="[('type_tax_use','=','purchase')]" context="{'default_type_tax_use': 'purchase', 'search_view_ref': 'account.account_tax_view_search'}" options="{'no_create': True}" optional="show"/>
                                     <field name="price_subtotal" widget="monetary"/>
                                 </tree>
                                 <form string="Purchase Order Line">
diff --git a/addons/purchase_requisition/views/purchase_requisition_views.xml b/addons/purchase_requisition/views/purchase_requisition_views.xml
index 9ac52db35fd..c3e0748ae08 100644
--- a/addons/purchase_requisition/views/purchase_requisition_views.xml
+++ b/addons/purchase_requisition/views/purchase_requisition_views.xml
@@ -168,12 +168,12 @@
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" context="{'default_purchase_requisition': 'tenders'}"/>
                                 <field name="product_qty"/>
-                                <field name="qty_ordered"/>
+                                <field name="qty_ordered" optional="show"/>
                                 <field name="product_uom_category_id" invisible="1"/>
-                                <field name="product_uom_id" string="UoM" groups="uom.group_uom"/>
+                                <field name="product_uom_id" string="UoM" groups="uom.group_uom" optional="show"/>
                                 <field name="schedule_date" groups="base.group_no_one"/>
-                                <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-                                <field name="analytic_tag_ids" groups="analytic.group_analytic_tags" widget="many2many_tags"/>
+                                <field name="account_analytic_id" optional="hide" groups="analytic.group_analytic_accounting"/>
+                                <field name="analytic_tag_ids" optional="hide" groups="analytic.group_analytic_tags" widget="many2many_tags"/>
                                 <field name="price_unit"/>
                             </tree>
                             <form string="Products">
diff --git a/addons/repair/views/repair_views.xml b/addons/repair/views/repair_views.xml
index dd9cbd1f6cc..f91daadd95c 100644
--- a/addons/repair/views/repair_views.xml
+++ b/addons/repair/views/repair_views.xml
@@ -106,15 +106,15 @@
                             <tree string="Operations" editable="bottom">
                                 <field name="type"/>
                                 <field name="product_id"/>
-                                <field name='name'/>
+                                <field name='name' optional="show"/>
                                 <field name="product_uom_category_id" invisible="1"/>
                                 <field name="lot_id" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}" groups="stock.group_production_lot"/>
-                                <field name="location_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
-                                <field name="location_dest_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
+                                <field name="location_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations" optional="show"/>
+                                <field name="location_dest_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations" optional="show"/>
                                 <field name="product_uom_qty" string="Quantity"/>
-                                <field name="product_uom" string="UoM" groups="uom.group_uom"/>
+                                <field name="product_uom" string="UoM" groups="uom.group_uom" optional="show"/>
                                 <field name="price_unit"/>
-                                <field name="tax_id" widget="many2many_tags" domain="[('type_tax_use','=','sale')]"/>
+                                <field name="tax_id" widget="many2many_tags" domain="[('type_tax_use','=','sale')]" optional="show"/>
                                 <field name="price_subtotal" widget="monetary"/>
                             </tree>
                         </field>
@@ -150,12 +150,12 @@
                             </form>
                             <tree string="Fees" editable="bottom">
                                 <field name="product_id" domain="[('type','=','service')]" required="True"/>
-                                <field name='name'/>
+                                <field name='name' optional="show"/>
                                 <field name="product_uom_qty" string="Quantity"/>
                                 <field name="product_uom_category_id" invisible="1"/>
-                                <field name="product_uom" string="Unit of Measure" groups="uom.group_uom"/>
+                                <field name="product_uom" string="Unit of Measure" groups="uom.group_uom" optional="show"/>
                                 <field name="price_unit"/>
-                                <field name="tax_id" domain="[('type_tax_use', '=', 'sale')]" widget="many2many_tags"/>
+                                <field name="tax_id" domain="[('type_tax_use', '=', 'sale')]" widget="many2many_tags" optional="show"/>
                                 <field name="price_subtotal" widget="monetary"/>
                             </tree>
                         </field>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index e592d69373d..758108db0ea 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -419,9 +419,10 @@
                                             'default_description_sale': name
                                         }"
                                     />
-                                    <field name="name" widget="section_and_note_text"/>
+                                    <field name="name" widget="section_and_note_text" optional="show"/>
                                     <field
                                         name="analytic_tag_ids"
+                                        optional="hide"
                                         groups="analytic.group_analytic_tags"
                                         widget="many2many_tags"
                                     />
@@ -442,6 +443,7 @@
                                             'column_invisible': [('parent.state', 'not in', ['sale', 'done'])],
                                             'readonly': [('qty_delivered_method', '!=', 'manual')]
                                         }"
+                                        optional="show"
                                     />
                                     <field name="qty_delivered_manual" invisible="1"/>
                                     <field name="qty_delivered_method" invisible="1"/>
@@ -449,6 +451,7 @@
                                         name="qty_invoiced"
                                         string="Invoiced"
                                         attrs="{'column_invisible': [('parent.state', 'not in', ['sale', 'done'])]}"
+                                        optional="show"
                                     />
                                     <field name="qty_to_invoice" invisible="1"/>
                                     <field
@@ -462,8 +465,9 @@
                                         context="{'company_id': parent.company_id}"
                                         groups="uom.group_uom"
                                         options='{"no_open": True}'
+                                        optional="show"
                                     />
-                                    <field name="customer_lead" />
+                                    <field name="customer_lead" optional="hide"/>
                                     <field
                                         name="price_unit"
                                         attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"
@@ -474,8 +478,9 @@
                                         options="{'no_create': True}"
                                         domain="[('type_tax_use','=','sale'),('company_id','=',parent.company_id)]"
                                         attrs="{'readonly': [('qty_invoiced', '&gt;', 0)]}"
+                                        optional="show"
                                     />
-                                    <field name="discount" string="Disc.%" groups="sale.group_discount_per_so_line"/>
+                                    <field name="discount" string="Disc.%" groups="sale.group_discount_per_so_line" optional="show"/>
                                     <field name="price_subtotal" widget="monetary" groups="account.group_show_line_subtotals_tax_excluded"/>
                                     <field name="price_total" widget="monetary" groups="account.group_show_line_subtotals_tax_included"/>
                                     <field name="state" invisible="1"/>
diff --git a/addons/sale_management/views/sale_order_views.xml b/addons/sale_management/views/sale_order_views.xml
index 6ecd09c2fca..d67671ab6de 100644
--- a/addons/sale_management/views/sale_order_views.xml
+++ b/addons/sale_management/views/sale_order_views.xml
@@ -66,11 +66,11 @@
                             </control>
                             <field name="sequence" widget="handle"/>
                             <field name="product_id"/>
-                            <field name="name"/>
+                            <field name="name" optional="show"/>
                             <field name="quantity"/>
-                            <field name="uom_id" string="UoM" groups="uom.group_uom"/>
+                            <field name="uom_id" string="UoM" groups="uom.group_uom" optional="show"/>
                             <field name="price_unit"/>
-                            <field name="discount" string="Disc.%" groups="sale.group_discount_per_so_line"/>
+                            <field name="discount" string="Disc.%" groups="sale.group_discount_per_so_line" optional="show"/>
                             <button name="button_add_to_order" class="oe_link" icon="fa-shopping-cart" string="Add to order lines" type="object"/>
                         </tree>
                     </field>
diff --git a/addons/sale_margin/views/sale_margin_view.xml b/addons/sale_margin/views/sale_margin_view.xml
index bd306877f37..c954cee3110 100644
--- a/addons/sale_margin/views/sale_margin_view.xml
+++ b/addons/sale_margin/views/sale_margin_view.xml
@@ -29,7 +29,7 @@
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
            <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after">
-                <field name="purchase_price" groups="base.group_user"/>
+                <field name="purchase_price" optional="hide" groups="base.group_user"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/sale_stock/models/res_config_settings.py b/addons/sale_stock/models/res_config_settings.py
index 686e4d06226..e7c6fc78336 100644
--- a/addons/sale_stock/models/res_config_settings.py
+++ b/addons/sale_stock/models/res_config_settings.py
@@ -8,8 +8,6 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     security_lead = fields.Float(related='company_id.security_lead', string="Security Lead Time", readonly=False)
-    group_route_so_lines = fields.Boolean("Order-Specific Routes",
-        implied_group='sale_stock.group_route_so_lines')
     group_display_incoterm = fields.Boolean("Incoterms", implied_group='sale_stock.group_display_incoterm')
     group_lot_on_invoice = fields.Boolean("Display Lots & Serial Numbers on Invoices",
         implied_group='sale_stock.group_lot_on_invoice')
diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml
index 66bf35ce0a2..58e672b29d4 100644
--- a/addons/sale_stock/security/sale_stock_security.xml
+++ b/addons/sale_stock/security/sale_stock_security.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="0">    
-        <record id="group_route_so_lines" model="res.groups">
-            <field name="name">Enable Route on Sales Order Line</field>
-            <field name="category_id" ref="base.module_category_hidden"/>
-        </record>
-
+    <data noupdate="0">
         <record id="group_display_incoterm" model="res.groups">
             <field name="name">Display incoterms on Sales Order and related invoices</field>
             <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale_stock/views/res_config_settings_views.xml b/addons/sale_stock/views/res_config_settings_views.xml
index 9ff01a94077..bf1ddad8c00 100644
--- a/addons/sale_stock/views/res_config_settings_views.xml
+++ b/addons/sale_stock/views/res_config_settings_views.xml
@@ -23,22 +23,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-12 col-lg-6 o_setting_box" title="This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form.">
-                    <div class="o_setting_left_pane">
-                        <field name="group_route_so_lines"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="group_route_so_lines"/>
-                        <div class="text-muted">
-                            Apply special routes from orders (e.g. dropshipping, MTO)
-                        </div>
-                        <div class="content-group" attrs="{'invisible': [('group_route_so_lines','=',False)]}">
-                            <div class="mt16">
-                                <button name="%(stock.action_routes_form)d" icon="fa-arrow-right" type="action" string="Routes for Sales Order Lines" class="btn-link" context="{'default_sale_selectable': 1}"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
             </xpath>
         </field>
     </record>
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 6f100f51521..8cdccd0514e 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -31,13 +31,13 @@
                     <field name="product_packaging" attrs="{'invisible': [('product_id', '=', False)]}" context="{'default_product_id': product_id, 'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" />
                 </xpath>
                 <xpath expr="//page/field[@name='order_line']/tree/field[@name='tax_id']" position="before">
-                    <field name="product_packaging" attrs="{'invisible': [('product_id', '=', False)]}" context="{'default_product_id': product_id, 'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" />
+                    <field name="product_packaging" attrs="{'invisible': [('product_id', '=', False)]}" context="{'default_product_id': product_id, 'tree_view_ref':'product.product_packaging_tree_view', 'form_view_ref':'product.product_packaging_form_view'}" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" optional="show"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/form/group/group/field[@name='analytic_tag_ids']" position="before">
-                    <field name="route_id" groups="sale_stock.group_route_so_lines" options="{'no_create': True}"/>
+                    <field name="route_id" groups="stock.group_adv_location" options="{'no_create': True}"/>
                 </xpath>
                 <xpath expr="//field[@name='order_line']/tree/field[@name='analytic_tag_ids']" position="after">
-                    <field name="route_id" groups="sale_stock.group_route_so_lines" options="{'no_create': True}"/>
+                    <field name="route_id" groups="stock.group_adv_location" options="{'no_create': True}" optional="hide"/>
                 </xpath>
            </field>
         </record>
@@ -48,7 +48,7 @@
             <field name="model">sale.order.line</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='price_subtotal']" position="before">
-                    <field name="route_id" groups="sale_stock.group_route_so_lines" options="{'no_create': True}"/>
+                    <field name="route_id" groups="stock.group_adv_location" options="{'no_create': True}"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/sale_stock/wizard/stock_rules_report_views.xml b/addons/sale_stock/wizard/stock_rules_report_views.xml
index 1fb6594f6cc..61cad856757 100644
--- a/addons/sale_stock/wizard/stock_rules_report_views.xml
+++ b/addons/sale_stock/wizard/stock_rules_report_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="stock.view_stock_rules_report"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='warehouse_ids']" position="after">
-                <field name="so_route_ids" widget="many2many_tags" groups="sale_stock.group_route_so_lines"/>
+                <field name="so_route_ids" widget="many2many_tags" groups="stock.group_adv_location"/>
             </xpath>
         </field>
     </record>