From 9b0baa3aa4c82e7fd10529c9bbf5484b2ea2db8d Mon Sep 17 00:00:00 2001
From: wan <wan@odoo.com>
Date: Wed, 8 Sep 2021 09:16:14 +0000
Subject: [PATCH] [FIX] *: product back2basics post-freeze fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should have been a fixup of 37eb0dfbb54db1c062276cd8c172bf8dac9e557b but we needed
to freeze :man_shrugging:

closes odoo/odoo#77344

closes odoo/odoo#77876

Related: odoo/enterprise#21425
Related: odoo/enterprise#21467
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
Signed-off-by: William André (wan) <wan@odoo.com>
---
 addons/delivery/views/delivery_view.xml       |  2 +-
 addons/event_booth_sale/models/product.py     |  2 +-
 .../views/event_booth_category_views.xml      |  2 +-
 addons/event_sale/models/product.py           |  2 +-
 addons/gift_card/models/product.py            |  2 +-
 addons/hr_expense/views/hr_expense_views.xml  |  2 +-
 addons/membership/views/product_views.xml     |  2 +-
 addons/mrp/tests/test_stock.py                |  2 +-
 addons/mrp/views/mrp_bom_views.xml            |  8 ++++----
 addons/mrp/views/mrp_production_views.xml     |  6 +++---
 addons/mrp/views/product_views.xml            |  2 +-
 addons/pos_sale/views/pos_config_views.xml    |  2 +-
 addons/product/models/product_template.py     | 19 ++++++++++++-------
 .../tests/test_purchase_mrp_flow.py           |  2 +-
 .../sale/views/res_config_settings_views.xml  |  2 +-
 addons/sale_expense/views/product_view.xml    |  2 +-
 .../tests/test_sale_mrp_procurement.py        |  2 +-
 addons/sale_timesheet/models/product.py       |  2 +-
 addons/sale_timesheet/views/product_views.xml |  2 +-
 .../views/project_task_views.xml              |  2 +-
 addons/stock/models/product.py                |  4 ++--
 addons/stock/views/product_views.xml          |  2 +-
 addons/stock/views/stock_move_views.xml       |  2 +-
 addons/stock/views/stock_picking_views.xml    |  2 +-
 .../views/stock_production_lot_views.xml      |  2 +-
 addons/stock/views/stock_scrap_views.xml      |  2 +-
 .../tests/test_stockvaluationlayer.py         |  5 ++---
 .../tests/test_crossdock.py                   |  2 +-
 .../views/stock_landed_cost_views.xml         |  2 +-
 .../views/stock_picking_batch_views.xml       |  2 +-
 .../models/product_pricelist.py               |  4 ++--
 addons/website_event_sale/models/website.py   |  2 +-
 .../views/slide_channel_views.xml             |  2 +-
 odoo/addons/base/views/res_partner_views.xml  |  4 ++--
 34 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 16a6181ca0e..3a8cd8740ec 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -94,7 +94,7 @@
                                 <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, 'default_invoice_policy': 'order'}" />
+                                <field name="product_id" context="{'default_detailed_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False, 'default_invoice_policy': 'order'}" />
                                 <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>
diff --git a/addons/event_booth_sale/models/product.py b/addons/event_booth_sale/models/product.py
index 28b1db54415..d626d98efc9 100644
--- a/addons/event_booth_sale/models/product.py
+++ b/addons/event_booth_sale/models/product.py
@@ -9,7 +9,7 @@ class ProductTemplate(models.Model):
 
     detailed_type = fields.Selection(selection_add=[
         ('event_booth', 'Event Booth'),
-    ], ondelete={'event_booth': 'set default'})
+    ], ondelete={'event_booth': 'set service'})
 
     @api.onchange('detailed_type')
     def _onchange_type_event_booth(self):
diff --git a/addons/event_booth_sale/views/event_booth_category_views.xml b/addons/event_booth_sale/views/event_booth_category_views.xml
index ea7a1a2d8a7..3332f18495f 100644
--- a/addons/event_booth_sale/views/event_booth_category_views.xml
+++ b/addons/event_booth_sale/views/event_booth_category_views.xml
@@ -10,7 +10,7 @@
             <group name="main" position="inside">
                 <group string="Booth Details">
                     <field name="currency_id" invisible="1"/>
-                    <field name="product_id" context="{'default_detailed_type': 'event_booth', 'default_type': 'service'}"/>
+                    <field name="product_id" context="{'default_detailed_type': 'event_booth', 'default_detailed_type': 'service'}"/>
                     <field name="price" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                 </group>
             </group>
diff --git a/addons/event_sale/models/product.py b/addons/event_sale/models/product.py
index 7574c088747..2b72c1b8a7d 100644
--- a/addons/event_sale/models/product.py
+++ b/addons/event_sale/models/product.py
@@ -8,7 +8,7 @@ class ProductTemplate(models.Model):
 
     detailed_type = fields.Selection(selection_add=[
         ('event', 'Event Ticket'),
-    ], ondelete={'event': 'set default'})
+    ], ondelete={'event': 'set service'})
 
     @api.onchange('detailed_type')
     def _onchange_type_event(self):
diff --git a/addons/gift_card/models/product.py b/addons/gift_card/models/product.py
index 156b6eaeedf..636891e41e1 100644
--- a/addons/gift_card/models/product.py
+++ b/addons/gift_card/models/product.py
@@ -10,7 +10,7 @@ class ProductTemplate(models.Model):
 
     detailed_type = fields.Selection(selection_add=[
         ('gift', 'Gift Card'),
-    ], ondelete={'gift': 'set default'})
+    ], ondelete={'gift': 'set service'})
 
     def _detailed_type_mapping(self):
         type_mapping = super()._detailed_type_mapping()
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 6c764088293..2fbb5aca157 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -552,7 +552,7 @@
             <field name="res_model">product.product</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="search_view_id" ref="product.product_search_form_view"/>
-            <field name="context">{"default_can_be_expensed": 1, 'default_type': 'service'}</field>
+            <field name="context">{"default_can_be_expensed": 1, 'default_detailed_type': 'service'}</field>
             <field name="domain">[('can_be_expensed', '=', True)]</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index ceb0e0d1b5f..58626c0bc40 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -113,7 +113,7 @@
             <field name="name">Membership Products</field>
             <field name="res_model">product.template</field>
             <field name="domain">[('membership','=',True), ('type', '=', 'service')]</field>
-            <field name="context">{'membership':True, 'type':'service', 'default_membership': True, 'default_type': 'service'}</field>
+            <field name="context">{'membership':True, 'type':'service', 'default_membership': True, 'default_detailed_type': 'service'}</field>
             <field name="search_view_id" ref="membership_product_search_form_view"/>
         </record>
 
diff --git a/addons/mrp/tests/test_stock.py b/addons/mrp/tests/test_stock.py
index 4da19ce09ab..c0f55da240e 100644
--- a/addons/mrp/tests/test_stock.py
+++ b/addons/mrp/tests/test_stock.py
@@ -179,7 +179,7 @@ class TestKitPicking(common.TestMrpCommon):
         def create_product(name):
             p = Form(self.env['product.product'])
             p.name = name
-            p.type = 'product'
+            p.detailed_type = 'product'
             return p.save()
 
         # Create a kit 'kit_parent' :
diff --git a/addons/mrp/views/mrp_bom_views.xml b/addons/mrp/views/mrp_bom_views.xml
index d8df9e68052..67226f38c60 100644
--- a/addons/mrp/views/mrp_bom_views.xml
+++ b/addons/mrp/views/mrp_bom_views.xml
@@ -51,9 +51,9 @@
                     <group>
                         <group>
                             <field name="active" invisible="1"/>
-                            <field name="product_tmpl_id" context="{'default_type': 'product'}"/>
+                            <field name="product_tmpl_id" context="{'default_detailed_type': 'product'}"/>
                             <field name="product_uom_category_id" invisible="1"/>
-                            <field name="product_id" groups="product.group_product_variant" context="{'default_type': 'product'}"/>
+                            <field name="product_id" groups="product.group_product_variant" context="{'default_detailed_type': 'product'}"/>
                             <label for="product_qty" string="Quantity"/>
                             <div class="o_row">
                                 <field name="product_qty"/>
@@ -83,7 +83,7 @@
                                 <tree string="Components" editable="bottom">
                                     <field name="company_id" invisible="1"/>
                                     <field name="sequence" widget="handle"/>
-                                    <field name="product_id" context="{'default_type': 'product'}"/>
+                                    <field name="product_id" context="{'default_detailed_type': 'product'}"/>
                                     <field name="product_tmpl_id" invisible="1"/>
                                     <button name="action_see_attachments" type="object" icon="fa-files-o" aria-label="Product Attachments" title="Product Attachments" class="float-right oe_read_only"/>
                                     <field name="attachments_count" class="text-left oe_read_only"
@@ -117,7 +117,7 @@
                                     <field name="company_id" invisible="1"/>
                                     <field name="product_uom_category_id" invisible="1"/>
                                     <field name="sequence" widget="handle"/>
-                                    <field name="product_id" context="{'default_type': 'product'}"/>
+                                    <field name="product_id" context="{'default_detailed_type': 'product'}"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" groups="uom.group_uom"/>
                                     <field name="cost_share" optional="hide"/>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index af30468d437..c0f0ad5b19e 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -169,7 +169,7 @@
                             <field name="use_create_components_lots" invisible="1"/>
                             <field name="show_lot_ids" invisible="1"/>
                             <field name="product_tracking" invisible="1"/>
-                            <field name="product_id" context="{'default_type': 'product'}" attrs="{'readonly': [('state', '!=', 'draft')]}" default_focus="1"/>
+                            <field name="product_id" context="{'default_detailed_type': 'product'}" attrs="{'readonly': [('state', '!=', 'draft')]}" default_focus="1"/>
                             <field name="product_tmpl_id" invisible="1"/>
                             <field name="forecasted_issue" invisible="1"/>
                             <field name="product_description_variants" attrs="{'invisible': [('product_description_variants', 'in', (False, ''))], 'readonly': [('state', '!=', 'draft')]}"/>
@@ -252,7 +252,7 @@
                                 context="{'default_date': date_planned_start, 'default_date_deadline': date_deadline, 'default_location_id': location_src_id, 'default_location_dest_id': production_location_id, 'default_state': 'draft', 'default_raw_material_production_id': id, 'default_picking_type_id': picking_type_id, 'default_company_id': company_id}"
                                 attrs="{'readonly': ['|', ('state', '=', 'cancel'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" options="{'delete': [('state', '=', 'draft')]}">
                                 <tree default_order="is_done,sequence" editable="bottom">
-                                    <field name="product_id" force_save="1" required="1" context="{'default_type': 'product'}" attrs="{'readonly': ['|', '|', ('move_lines_count', '&gt;', 0), ('state', '=', 'cancel'), '&amp;', ('state', '!=', 'draft'), ('additional', '=', False) ]}"/>
+                                    <field name="product_id" force_save="1" required="1" context="{'default_detailed_type': 'product'}" attrs="{'readonly': ['|', '|', ('move_lines_count', '&gt;', 0), ('state', '=', 'cancel'), '&amp;', ('state', '!=', 'draft'), ('additional', '=', False) ]}"/>
                                     <field name="location_id" string="From" readonly="1" groups="stock.group_stock_multi_locations" optional="show"/>
                                     <field name="move_line_ids" invisible="1">
                                         <tree>
@@ -331,7 +331,7 @@
                             <field name="move_byproduct_ids" context="{'default_date': date_planned_finished, 'default_date_deadline': date_deadline, 'default_location_id': production_location_id, 'default_location_dest_id': location_src_id, 'default_state': 'draft', 'default_production_id': id, 'default_picking_type_id': picking_type_id, 'default_company_id': company_id}" attrs="{'readonly': ['|', ('state', '=', 'cancel'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" options="{'delete': [('state', '=', 'draft')]}">
                                 <tree default_order="is_done,sequence" decoration-muted="is_done" editable="bottom">
                                     <field name="byproduct_id" invisible="1"/>
-                                    <field name="product_id" context="{'default_type': 'product'}" domain="[('id', '!=', parent.product_id)]" required="1"/>
+                                    <field name="product_id" context="{'default_detailed_type': 'product'}" domain="[('id', '!=', parent.product_id)]" required="1"/>
                                     <field name="location_dest_id" string="To" readonly="1" groups="stock.group_stock_multi_locations"/>
 
                                     <field name="move_line_ids" invisible="1">
diff --git a/addons/mrp/views/product_views.xml b/addons/mrp/views/product_views.xml
index 487348230a0..644ed616540 100644
--- a/addons/mrp/views/product_views.xml
+++ b/addons/mrp/views/product_views.xml
@@ -52,7 +52,7 @@
             <field name="res_model">product.template</field>
             <field name="search_view_id" ref="mrp_product_template_search_view"/>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="context">{"search_default_consumable": 1, 'default_type': 'product'}</field>
+            <field name="context">{"search_default_consumable": 1, 'default_detailed_type': 'product'}</field>
             <field name="help" type="html">
               <p class="o_view_nocontent_smiling_face">
                 No product found. Let's create one!
diff --git a/addons/pos_sale/views/pos_config_views.xml b/addons/pos_sale/views/pos_config_views.xml
index 86fbc27062c..a3e46d32ad9 100644
--- a/addons/pos_sale/views/pos_config_views.xml
+++ b/addons/pos_sale/views/pos_config_views.xml
@@ -27,7 +27,7 @@
                             <field
                                 name="down_payment_product_id"
                                 domain="[('type', '=', 'service'), '|', ('company_id', '=', company_id), ('company_id', '=', False)]"
-                                context="{'default_type': 'service', 'default_taxes_id': False }"
+                                context="{'default_detailed_type': 'service', 'default_taxes_id': False }"
                             />
                         </div>
                     </div>
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 88cfb214baf..b47df281432 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -55,7 +55,6 @@ class ProductTemplate(models.Model):
             ('consu', 'Consumable'),
             ('service', 'Service')
         ],
-        default='consu',
         compute='_compute_type',
         store=True,
         readonly=False,
@@ -417,12 +416,12 @@ class ProductTemplate(models.Model):
         for record in self:
             record.type = type_mapping.get(record.detailed_type, record.detailed_type)
 
-    # @api.constrains('type', 'detailed_type')
-    # def _constrains_detailed_type(self):
-    #     type_mapping = self._detailed_type_mapping()
-    #     for record in self:
-    #         if record.type != type_mapping.get(record.detailed_type, record.detailed_type):
-    #             raise ValidationError(_("The Type of this product doesn't match the Detailed Type"))
+    @api.constrains('type', 'detailed_type')
+    def _constrains_detailed_type(self):
+        type_mapping = self._detailed_type_mapping()
+        for record in self:
+            if record.type != type_mapping.get(record.detailed_type, record.detailed_type):
+                raise ValidationError(_("The Type of this product doesn't match the Detailed Type"))
 
     @api.constrains('uom_id', 'uom_po_id')
     def _check_uom(self):
@@ -445,6 +444,12 @@ class ProductTemplate(models.Model):
         return {}
 
     def _sanitize_vals(self, vals):
+        """Sanitize vales for writing/creating product templates and variants.
+
+        Values need to be sanitized to keep values synchronized, and to be able to preprocess the
+        vals in extensions of create/write.
+        :param vals: create/write values dictionary
+        """
         if 'type' in vals and 'detailed_type' not in vals:
             if vals['type'] not in self.mapped('type'):
                 vals['detailed_type'] = vals['type']
diff --git a/addons/purchase_mrp/tests/test_purchase_mrp_flow.py b/addons/purchase_mrp/tests/test_purchase_mrp_flow.py
index 7e643519dcb..7731be9a53b 100644
--- a/addons/purchase_mrp/tests/test_purchase_mrp_flow.py
+++ b/addons/purchase_mrp/tests/test_purchase_mrp_flow.py
@@ -147,7 +147,7 @@ class TestSaleMrpFlow(TransactionCase):
     def _create_product(self, name, uom_id, routes=()):
         p = Form(self.env['product.product'])
         p.name = name
-        p.type = 'product'
+        p.detailed_type = 'product'
         p.uom_id = uom_id
         p.uom_po_id = uom_id
         p.route_ids.clear()
diff --git a/addons/sale/views/res_config_settings_views.xml b/addons/sale/views/res_config_settings_views.xml
index 03541845e48..1c647c292aa 100644
--- a/addons/sale/views/res_config_settings_views.xml
+++ b/addons/sale/views/res_config_settings_views.xml
@@ -419,7 +419,7 @@
                                     Product used for down payments
                                 </div>
                                 <div class="text-muted">
-                                    <field name="deposit_default_product_id" context="{'default_type': 'service'}"/>
+                                    <field name="deposit_default_product_id" context="{'default_detailed_type': 'service'}"/>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/sale_expense/views/product_view.xml b/addons/sale_expense/views/product_view.xml
index aa3300230bd..519220a04a6 100644
--- a/addons/sale_expense/views/product_view.xml
+++ b/addons/sale_expense/views/product_view.xml
@@ -22,7 +22,7 @@
     </record>
 
     <record id="hr_expense.hr_expense_product" model="ir.actions.act_window">
-        <field name="context">{"default_can_be_expensed": 1, 'default_type': 'service',
+        <field name="context">{"default_can_be_expensed": 1, 'default_detailed_type': 'service',
             'default_invoice_policy':'delivery', 'default_expense_policy' : 'cost'}</field>
     </record>
 
diff --git a/addons/sale_mrp/tests/test_sale_mrp_procurement.py b/addons/sale_mrp/tests/test_sale_mrp_procurement.py
index 478ea46e914..5aeb23ccca6 100644
--- a/addons/sale_mrp/tests/test_sale_mrp_procurement.py
+++ b/addons/sale_mrp/tests/test_sale_mrp_procurement.py
@@ -32,7 +32,7 @@ class TestSaleMrpProcurement(TransactionCase):
         product.categ_id = product_category_allproductssellable0
         product.list_price = 200.0
         product.name = 'Slider Mobile'
-        product.type = 'product'
+        product.detailed_type = 'product'
         product.uom_id = uom_unit
         product.uom_po_id = uom_unit
         product.route_ids.clear()
diff --git a/addons/sale_timesheet/models/product.py b/addons/sale_timesheet/models/product.py
index 18b8bed87cb..730f9f206aa 100644
--- a/addons/sale_timesheet/models/product.py
+++ b/addons/sale_timesheet/models/product.py
@@ -57,7 +57,7 @@ class ProductTemplate(models.Model):
             if product.service_policy:
                 product.invoice_policy, product.service_type = SERVICE_TO_GENERAL.get(product.service_policy, (False, False))
 
-    @api.depends('service_tracking', 'service_policy')
+    @api.depends('service_tracking', 'service_policy', 'type')
     def _compute_product_tooltip(self):
         super()._compute_product_tooltip()
         for record in self.filtered(lambda record: record.type == 'service'):
diff --git a/addons/sale_timesheet/views/product_views.xml b/addons/sale_timesheet/views/product_views.xml
index 3e42795dd13..09080b4fa98 100644
--- a/addons/sale_timesheet/views/product_views.xml
+++ b/addons/sale_timesheet/views/product_views.xml
@@ -43,7 +43,7 @@
         <field name="res_model">product.template</field>
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="sale_timesheet.product_template_view_search_sale_timesheet"/>
-        <field name="context">{'search_default_services': 1, 'default_type': 'service'}</field>
+        <field name="context">{'search_default_services': 1, 'default_detailed_type': 'service'}</field>
     </record>
 
 </odoo>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 055c587540f..2adc3c3966e 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -33,7 +33,7 @@
                         <group>
                             <field name="display_create_order" invisible="1"/>
                             <field name="pricing_type" invisible="1" widget="radio"/>
-                            <field name="timesheet_product_id" string="Default Service" invisible="1" context="{'default_type': 'service', 'default_service_policy': 'delivered_timesheet', 'default_service_type': 'timesheet'}"/>
+                            <field name="timesheet_product_id" string="Default Service" invisible="1" context="{'default_detailed_type': 'service', 'default_service_policy': 'delivered_timesheet', 'default_service_type': 'timesheet'}"/>
                             <field name="sale_order_id" invisible="1" options="{'no_create': True, 'no_edit': True, 'delete': False, 'no_open': True}"/>
                             <field name="sale_line_id" string="Default Sales Order Item" options="{'no_create': True, 'no_edit': True, 'delete': False, 'no_open': True}"/>
                         </group>
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index 92e7cc3b719..5335b97a928 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -605,10 +605,10 @@ class ProductTemplate(models.Model):
         help="This user will be responsible of the next activities related to logistic operations for this product.")
     detailed_type = fields.Selection(selection_add=[
         ('product', 'Storable Product')
-    ], tracking=True, ondelete={'product': 'set default'})
+    ], tracking=True, ondelete={'product': 'set consu'})
     type = fields.Selection(selection_add=[
         ('product', 'Storable Product')
-    ], tracking=True, ondelete={'product': 'set default'})
+    ], ondelete={'product': 'set consu'})
     property_stock_production = fields.Many2one(
         'stock.location', "Production Location",
         company_dependent=True, check_company=True, domain="[('usage', '=', 'production'), '|', ('company_id', '=', False), ('company_id', '=', allowed_company_ids[0])]",
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index e4c185f79f4..c5d9aa011f0 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -457,7 +457,7 @@
         <field name="res_model">product.template</field>
         <field name="view_mode">kanban,tree,form</field>
         <field name="search_view_id" ref="product_template_search_form_view_stock"/>
-        <field name="context">{"search_default_consumable": 1, 'default_type': 'product'}</field>
+        <field name="context">{"search_default_consumable": 1, 'default_detailed_type': 'product'}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 No product found. Let's create one!
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index e249cc1f0a7..018f7c8bfc1 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -251,7 +251,7 @@
             <field name="priority">1000</field>
             <field name="arch" type="xml">
                 <tree editable="bottom" decoration-muted="(state == 'done' and is_locked == True)" decoration-danger="qty_done&gt;product_uom_qty and state!='done' and parent.picking_type_code != 'incoming'" decoration-success="qty_done==product_uom_qty and state!='done' and not result_package_id">
-                    <field name="product_id" required="1" context="{'default_type': 'product'}" attrs="{'readonly': ['|', ('state', '=', 'done'), ('move_id', '!=', False)]}"/>
+                    <field name="product_id" required="1" context="{'default_detailed_type': 'product'}" attrs="{'readonly': ['|', ('state', '=', 'done'), ('move_id', '!=', False)]}"/>
                     <field name="company_id" invisible="1"/>
                     <field name="move_id" invisible="1"/>
                     <field name="picking_id" invisible="1"/>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index e84fbc67860..d1e87597ead 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -375,7 +375,7 @@
                                     <field name="product_uom_category_id" invisible="1"/>
                                     <field name="has_tracking" invisible="1"/>
                                     <field name="display_assign_serial" invisible="1"/>
-                                    <field name="product_id" required="1" context="{'default_type': 'product'}" attrs="{'readonly': ['|', '&amp;', ('state', '!=', 'draft'), ('additional', '=', False), ('move_lines_count', '&gt;', 0)]}"/>
+                                    <field name="product_id" required="1" context="{'default_detailed_type': 'product'}" attrs="{'readonly': ['|', '&amp;', ('state', '!=', 'draft'), ('additional', '=', False), ('move_lines_count', '&gt;', 0)]}"/>
                                     <field name="description_picking" string="Description" optional="hide"/>
                                     <field name="date" invisible="1"/>
                                     <field name="date_deadline" optional="hide"/>
diff --git a/addons/stock/views/stock_production_lot_views.xml b/addons/stock/views/stock_production_lot_views.xml
index 7de7089082b..5023491431e 100644
--- a/addons/stock/views/stock_production_lot_views.xml
+++ b/addons/stock/views/stock_production_lot_views.xml
@@ -31,7 +31,7 @@
                 </div>
                 <group name="main_group">
                     <group>
-                        <field name="product_id" context="{'default_type': 'product', 'default_tracking': 'lot'}" readonly="context.get('set_product_readonly', False)" force_save="1" help="Product this lot/serial number contains. You cannot change it anymore if it has already been moved."/>
+                        <field name="product_id" context="{'default_detailed_type': 'product', 'default_tracking': 'lot'}" readonly="context.get('set_product_readonly', False)" force_save="1" help="Product this lot/serial number contains. You cannot change it anymore if it has already been moved."/>
                         <label for="product_qty" attrs="{'invisible': [('display_complete', '=', False)]}"/>
                         <div class="o_row" attrs="{'invisible': [('display_complete', '=', False)]}">
                             <field name="product_qty"/>
diff --git a/addons/stock/views/stock_scrap_views.xml b/addons/stock/views/stock_scrap_views.xml
index 98a2499da5c..26c6bf2cc84 100644
--- a/addons/stock/views/stock_scrap_views.xml
+++ b/addons/stock/views/stock_scrap_views.xml
@@ -46,7 +46,7 @@
                         </div>
                         <group>
                             <group>
-                                <field name="product_id" context="{'default_type': 'product'}"/>
+                                <field name="product_id" context="{'default_detailed_type': 'product'}"/>
                                 <label for="scrap_qty"/>
                                 <div class="o_row">
                                     <field name="scrap_qty"/>
diff --git a/addons/stock_account/tests/test_stockvaluationlayer.py b/addons/stock_account/tests/test_stockvaluationlayer.py
index 174bfd16e5b..d4d21b1d486 100644
--- a/addons/stock_account/tests/test_stockvaluationlayer.py
+++ b/addons/stock_account/tests/test_stockvaluationlayer.py
@@ -847,9 +847,9 @@ class TestStockValuationChangeValuation(TestStockValuationCommon):
             'property_stock_journal': self.stock_journal.id,
         })
 
-        # Try to change the product category with a `default_type` key in the context and
+        # Try to change the product category with a `default_detailed_type` key in the context and
         # check it doesn't break the account move generation.
-        self.product1.with_context(default_type='product').categ_id = cat2
+        self.product1.with_context(default_detailed_type='product').categ_id = cat2
         self.assertEqual(self.product1.categ_id, cat2)
 
         self.assertEqual(self.product1.value_svl, 100)
@@ -898,4 +898,3 @@ class TestStockValuationChangeValuation(TestStockValuationCommon):
         # An accounting entry should only be created for the emptying now that the category is manual.
         self.assertEqual(len(self.product1.stock_valuation_layer_ids.mapped('account_move_id')), 2)
         self.assertEqual(len(self.product1.stock_valuation_layer_ids), 3)
-
diff --git a/addons/stock_dropshipping/tests/test_crossdock.py b/addons/stock_dropshipping/tests/test_crossdock.py
index 2d13a7c735c..b7fa78a94ed 100644
--- a/addons/stock_dropshipping/tests/test_crossdock.py
+++ b/addons/stock_dropshipping/tests/test_crossdock.py
@@ -26,7 +26,7 @@ class TestCrossdock(common.TransactionCase):
 
         p_f = Form(self.env['product.template'])
         p_f.name = 'PCE'
-        p_f.type = 'product'
+        p_f.detailed_type = 'product'
         p_f.categ_id = self.env.ref('product.product_category_1')
         p_f.list_price = 100.0
         with p_f.seller_ids.new() as seller:
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
index a86da51a2c8..c14e20dc602 100644
--- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml
+++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml
@@ -65,7 +65,7 @@
                                     <tree string="Cost Lines" editable="bottom">
                                         <field name="product_id"
                                             domain="[('landed_cost_ok', '=', True)]"
-                                            context="{'default_landed_cost_ok': True, 'default_type': 'service'}"/>
+                                            context="{'default_landed_cost_ok': True, 'default_detailed_type': 'service'}"/>
                                         <field name="name"/>
                                         <field name="account_id" options="{'no_create': True}"/>
                                         <field name="split_method"/>
diff --git a/addons/stock_picking_batch/views/stock_picking_batch_views.xml b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
index ba694510fd2..5bf7debedbb 100644
--- a/addons/stock_picking_batch/views/stock_picking_batch_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_batch_views.xml
@@ -60,7 +60,7 @@
             <tree editable="top" decoration-muted="state == 'cancel'" string="Move Lines" default_order="location_id">
                 <field name="tracking" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="product_id" context="{'default_type': 'product'}" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="product_id" context="{'default_detailed_type': 'product'}" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="picking_id" required="1" attrs="{'readonly': [('id', '!=', False)]}"
                     options="{'no_create_edit': True}" domain="[('id', 'in', parent.picking_ids)]"/>
                 <field name="lot_id" groups="stock.group_production_lot" attrs="{'readonly': [('tracking', 'not in', ['lot', 'serial'])]}"/>
diff --git a/addons/website_event_sale/models/product_pricelist.py b/addons/website_event_sale/models/product_pricelist.py
index b6fcbb48fdc..fa7d141d38b 100644
--- a/addons/website_event_sale/models/product_pricelist.py
+++ b/addons/website_event_sale/models/product_pricelist.py
@@ -11,8 +11,8 @@ class PricelistItem(models.Model):
             msg = ''
             if self.applied_on == '3_global' or self.applied_on == '2_product_category':
                 msg = _("A pricelist item with a positive min. quantity will not be applied to the event tickets products.")
-            elif ((self.applied_on == '1_product' and self.product_tmpl_id.type == 'event') or
-                    (self.applied_on == '0_product_variant' and self.product_id.type == 'event')):
+            elif ((self.applied_on == '1_product' and self.product_tmpl_id.detailed_type == 'event') or
+                    (self.applied_on == '0_product_variant' and self.product_id.detailed_type == 'event')):
                 msg = _("A pricelist item with a positive min. quantity cannot be applied to this event tickets product.")
             if msg:
                 return {'warning':
diff --git a/addons/website_event_sale/models/website.py b/addons/website_event_sale/models/website.py
index 5250d6d0ed3..f1afdabaae8 100644
--- a/addons/website_event_sale/models/website.py
+++ b/addons/website_event_sale/models/website.py
@@ -8,4 +8,4 @@ class Website(models.Model):
 
     def sale_product_domain(self):
         # remove product event from the website content grid and list view (not removed in detail view)
-        return ['&'] + super(Website, self).sale_product_domain() + [('type', '!=', 'event')]
+        return ['&'] + super(Website, self).sale_product_domain() + [('detailed_type', '!=', 'event')]
diff --git a/addons/website_sale_slides/views/slide_channel_views.xml b/addons/website_sale_slides/views/slide_channel_views.xml
index cffeeabbed6..7d72c53ce26 100644
--- a/addons/website_sale_slides/views/slide_channel_views.xml
+++ b/addons/website_sale_slides/views/slide_channel_views.xml
@@ -8,7 +8,7 @@
             <xpath expr="//field[@name='enroll']" position="after">
                 <field name="product_id"
                     attrs="{'invisible': [('enroll', '!=', 'payment')], 'required': [('enroll', '=', 'payment')]}"
-                    context="{'default_type': 'service', 'default_invoice_policy': 'order', 'default_purchase_ok': False, 'default_sale_ok': True, 'default_website_published': True}"/>
+                    context="{'default_detailed_type': 'service', 'default_invoice_policy': 'order', 'default_purchase_ok': False, 'default_sale_ok': True, 'default_website_published': True}"/>
             </xpath>
             <xpath expr="//button[@name='action_redirect_to_members']" position="after">
                 <button name="action_view_sales"
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 9b70c505821..6258a39524c 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -187,8 +187,8 @@
                     <group>
                         <group>
                             <span class="o_form_label o_td_label" name="address_name">
-                                <field name="type" groups="base.group_no_one" attrs="{'invisible': [('is_company','=', True)], 'required': [('is_company','!=', True)], 'readonly': [('user_ids', '!=', [])]}" class="font-weight-bold"/>
-                                <b class="position-absolute" attrs="{'invisible': [('is_company', '=', False)]}">Address</b>
+                                <field name="type" attrs="{'invisible': [('is_company','=', True)], 'required': [('is_company','!=', True)], 'readonly': [('user_ids', '!=', [])]}" class="font-weight-bold"/>
+                                <b attrs="{'invisible': [('is_company', '=', False)]}">Address</b>
                             </span>
                             <div class="o_address_format">
                                 <field name="street" placeholder="Street..." class="o_address_street"