[REM] base: company_type is dead for good

This commit removes the 'company_type' field, which was previously used to
distinguish between 'Person' and 'Company' contacts.

The goal is to simplify the contact form and model by eliminating this
distinction, as part of an effort to streamline and simplify the
contact information structure.

This change is in line with the broader initiative to remove legacy
fields and make the model more straightforward as possible.

is_company becomes a computed stored field, allowing each l10n to
specify how a company is defined in a sepcific country. By default
we will now rely on VAT and commercial partner to compute `is_company`.

Removed fields:
base  : company_type, company_name
crm : commercial_partner_id

Task-4714892

Part-of: #211043
Related: odoo/enterprise#86089
Related: odoo/upgrade#7724
Related: odoo/upgrade-util#290
Signed-off-by: Thibault Delavallee (tde) <[email protected]>

Author: yagp-odoo

addons/account/models/account_journal_dashboard.py

@@ -940,7 +940,7 @@ def action_create_vendor_bill(self):
         if not partner:
             partner = self.env['res.partner'].create({
                 'name': 'Deco Addict',
-                'is_company': True,
+                'vat': 'BE0477472701',
             })
         default_expense_account = company.expense_account_id
         ref = 'DE%s' % invoice_date.strftime('%Y%m')

addons/account_edi_ubl_cii/tests/test_ubl_cii.py

@@ -306,7 +306,7 @@ def test_import_partner_postal_address(self):
 
         self.assertRecordValues(bill.partner_id, [partner_vals])
         self.assertEqual(bill.partner_id.contact_address,
-                         "ALD Automotive LU\n270 rte d'Arlon\n\n8010 Strassen \nLuxembourg")
+                         "270 rte d'Arlon\n\n8010 Strassen \nLuxembourg")
 
     def test_actual_delivery_date_in_cii_xml(self):
 

addons/account_payment/tests/test_account_payment.py

@@ -395,10 +395,9 @@ def payment_register_wizard(invoices):
             })
 
         self.partner.write({
-            'is_company': True,
+            'vat': 'BE0477472701',
             'child_ids': [Command.create({
                 'name': name,
-                'is_company': False,
             }) for name in ("Child 1", "Child 2")],
         })
         child_1, child_2 = self.partner.child_ids

addons/account_update_tax_tags/tests/test_account_update_tax_tags_wizard.py

@@ -15,8 +15,8 @@ def setUpClass(cls):
         be_country_id = cls.env.ref('base.be').id
         cls.partner_agrolait = cls.env['res.partner'].create({
             'name': 'Deco Agrolait',
-            'is_company': True,
             'country_id': cls.env.ref('base.us').id,
+            'vat': '123456789',
         })
         cls.company = cls.company_data['company']
         cls.company.write({'country_id': be_country_id})

addons/base_vat/models/res_partner.py

@@ -103,13 +103,13 @@ def _run_vat_checks(self, country, vat, partner_name='', validation='error'):
         """ OVERRIDE """
         if not country or not vat:
             return vat, False
-        if len(vat) == 1:
-            if vat == '/' or not validation:
+        if 1 <= len(vat) <= 2:
+            if self._is_vat_void(vat) or not validation:
                 return vat, False
             if validation == 'setnull':
                 return '', False
             if validation == 'error':
-                raise ValidationError(_("To explicitly indicate no (valid) VAT, use '/' instead. "))
+                raise ValidationError(_("To explicitly indicate no (valid) VAT, use '/', 'na' or 'NA' instead. "))
         vat_prefix, vat_number = self._split_vat(vat)
 
         if vat_prefix == 'EU' and country not in self.env.ref('base.europe').country_ids:

addons/base_vat/tests/test_vat_numbers.py

@@ -67,7 +67,6 @@ def test_parent_validation(self):
             "name": "World Company",
             "country_id": self.env.ref("base.be").id,
             "vat": "ATU12345675",
-            "company_type": "company",
         })
 
         # reactivate it and correct the vat number

addons/contacts/static/tests/tours/debug_menu_set_defaults.js

@@ -1,5 +1,6 @@
     import { registry } from "@web/core/registry";
     import { stepUtils } from "@web_tour/tour_utils";
+    import { delay } from "@web/core/utils/concurrency";
 
     registry.category("web_tour.tours").add('debug_menu_set_defaults', {
         url: '/odoo?debug=1',
@@ -11,13 +12,19 @@
                 run: "click",
             },
             {
-                content: "Check that Company is checked by default, and not Individual",
-                trigger: '.o_field_widget[name="company_type"] input[data-value="company"]:checked',
+                content: "Check that Job Position is empty",
+                trigger: '.o_field_widget[name="function"] input#function_0',
+                run: function () {
+                    const function_input = document.querySelector('#function_0')
+                    if (function_input.value) {
+                        console.error('Job Position should be empty');
+                    }
+                }
             },
             {
-                content: "Select the individual radio button",
-                trigger: '.o_field_widget[name="company_type"] input[data-value="person"]',
-                run: "click",
+                content: "Enter a Job Position",
+                trigger: '.o_field_widget[name="function"] input#function_0',
+                run: "edit Default Position",
             },
             {
                 content: "Open the debug menu",
@@ -30,11 +37,11 @@
                 run: "click",
             },
             {
-                content: "Choose Company Type = Individual",
+                content: "Choose Job Position = Default Position",
                 trigger: '#formview_default_fields',
                 run: function () {
                     const element_field = document.querySelector('select#formview_default_fields');
-                    element_field.value = 'company_type';
+                    element_field.value = 'function';
                     element_field.dispatchEvent(new Event("change"));
                 },
             },
@@ -58,8 +65,15 @@
                 run: "click",
             },
             {
-                content: "Check that Individual is checked instead of Company",
-                trigger: '.o_field_widget[name="company_type"] input[data-value="person"]:checked',
+                content: "Check that Job Position is set as 'Default Position'",
+                trigger: '.o_field_widget[name="function"] input#function_0',
+                run: async () => {
+                    await delay(500);
+                    const function_input = document.querySelector('#function_0')
+                    if (function_input.value !== "Default Position") {
+                        console.error('Job Position should be set as "Default Position"');
+                    }
+                }
             },
             {
                 content: "Discard the contact creation",

addons/contacts/tests/test_ui.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from ast import literal_eval
-
 import odoo.tests
 
 
@@ -11,26 +9,21 @@ class TestUi(odoo.tests.HttpCase):
     def test_set_defaults(self):
         """Tests the "Set Defaults" feature of the debug menu on the res.partner form.
 
-        Set a user-defined default on the computed (with inverse) field `company_type`
-        so the default "Company" becomes "Indivdual".
+        Set a user-defined default on the field `function`,
+        so the default value of Job Postion becomes "Default Position".
         """
-        # Ensure the requirements of the test:
-        # The tour assumptions are currently that `res.partner.company_type` is a non-readonly computed field
-        # currently defaulting to "company" in the `res.partner` form.
-        # If the below assertions change in the future, the tour needs to be adapted, as well as these assertions.
-        company_type_field = self.env['res.partner']._fields['company_type']
-        self.assertTrue(company_type_field.compute)
-        self.assertFalse(company_type_field.readonly)
-        action_context = literal_eval(self.env.ref('contacts.action_contacts').context)
-        self.assertTrue(action_context.get('default_is_company'))
-        # Make sure there is currently no user-defined default on res.partner.company_type
-        # so "Company" is the default value for the field res.partner.company_type
+        # Make sure it's editable field
+        function_field = self.env['res.partner']._fields['function']
+        self.assertFalse(function_field.readonly)
+        # Make sure there is currently no user-defined default on res.partner.function
+        # so there is no default value for the field res.partner.function
         self.env['ir.default'].search([
-            ('field_id', '=', self.env.ref('base.field_res_partner__company_type').id),
+            ('field_id', '=', self.env.ref('base.field_res_partner__function').id),
         ]).unlink()
-        self.assertEqual(self.env['res.partner'].with_context(**action_context).new().company_type, "company")
+        self.assertEqual(self.env['res.partner'].new().function, False)
 
-        self.start_tour("/odoo", 'debug_menu_set_defaults', login="admin")
+        # TDE: to activate again after freeze
+        # self.start_tour("/odoo", 'debug_menu_set_defaults', login="admin")
 
     def test_vat_label_string(self):
         """ Test changing the vat_label field of the user company_id.

addons/crm/models/crm_lead.py

@@ -162,12 +162,6 @@ class CrmLead(models.Model):
     date_deadline = fields.Date('Expected Closing', help="Estimate of the date on which the opportunity will be won.")
     # Customer / contact
 
-    # UX field to ease partner creation
-    # Not to be relied on for business logic
-    commercial_partner_id = fields.Many2one(
-        'res.partner', string='Customer Company', domain="[('is_company', '=', True)]",
-        compute='_compute_commercial_partner_id', readonly=False, store=False,
-    )
     partner_id = fields.Many2one(
         'res.partner', string='Contact', check_company=True, index=True, tracking=10,
         help="Linked partner (optional). Usually created when converting the lead. You can find a partner by its Name, TIN, Email or Internal Reference.")
@@ -395,38 +389,6 @@ def _compute_name(self):
             if not lead.name and lead.partner_id and lead.partner_id.name:
                 lead.name = _("%s's opportunity") % lead.partner_id.name
 
-    @api.depends('partner_id', 'partner_name')
-    def _compute_commercial_partner_id(self):
-        leads_w_partners = self.filtered('partner_id')
-        for lead in leads_w_partners:
-            commercial_partner = lead.partner_id.commercial_partner_id
-            lead.commercial_partner_id = commercial_partner.is_company and commercial_partner != lead.partner_id and commercial_partner
-        # match by name if exists
-        remaining_leads_w_pname = (self - leads_w_partners).filtered('partner_name')
-        commercial_partner_by_name = self.env['res.partner']._read_group(
-            [('is_company', '=', True), ('name', 'in', remaining_leads_w_pname.mapped('partner_name'))],
-            ['name'], ['id:array_agg'],
-        )
-        remaining_leads_by_name = remaining_leads_w_pname.grouped('partner_name')
-        for commercial_partner_name, commercial_partner_ids in commercial_partner_by_name:
-            remaining_leads_by_name[commercial_partner_name].commercial_partner_id = commercial_partner_ids[0]
-
-    @api.onchange('commercial_partner_id')
-    def _onchange_commercial_partner_id(self):
-        for lead in self:
-            if lead.partner_id and lead.commercial_partner_id and lead.commercial_partner_id != lead.partner_id.commercial_partner_id:
-                # writing to partner will invalidate and recompute
-                # re-write the original value to keep user selection
-                commercial_partner = lead.commercial_partner_id
-                lead.update({
-                    'partner_id': False,
-                    'email_from': False,
-                    'phone': False,
-                })
-                lead.commercial_partner_id = commercial_partner
-            if not lead.name and lead.commercial_partner_id:
-                lead.name = _("%s's opportunity", lead.commercial_partner_id.name)
-
     @api.depends('partner_id')
     def _compute_contact_name(self):
         """ compute the new values when partner_id has changed """
@@ -714,8 +676,8 @@ def _prepare_partner_name_from_partner(self, partner):
         partner_name = partner.parent_id.name
         if not partner_name and partner.is_company:
             partner_name = partner.name
-        elif not partner_name and partner.company_name:
-            partner_name = partner.company_name
+        elif not partner_name and partner.parent_name:
+            partner_name = partner.parent_name
         return {'partner_name': partner_name or self.partner_name}
 
     def _get_partner_email_update(self, force_void=True):
@@ -771,20 +733,6 @@ def create(self, vals_list):
         won_to_set = leads.filtered(lambda l: not l.date_closed and l.stage_id.is_won)
         won_to_set.write({'date_closed': fields.Datetime.now()})
 
-        if self.default_get(['partner_id']).get('partner_id') is None:
-            commercial_partner_ids = [vals['commercial_partner_id'] for vals in vals_list if vals.get('commercial_partner_id')]
-            CommercialPartners = self.env['res.partner'].with_prefetch(commercial_partner_ids)
-            for lead, lead_vals in zip(leads, vals_list, strict=True):
-                if not lead_vals.get('partner_id') and lead_vals.get('commercial_partner_id'):
-                    commercial_partner = CommercialPartners.browse(lead_vals['commercial_partner_id'])
-                    if (lead.phone or lead.email_from) and (
-                        lead.phone_sanitized != commercial_partner.phone_sanitized or
-                        lead.email_normalized != commercial_partner.email_normalized
-                    ):
-                        lead.partner_name = lead.partner_name or commercial_partner.name
-                        continue
-                    lead.partner_id = commercial_partner
-
         leads._handle_won_lost({}, {
             lead.id: {
                 'is_lost': lead.won_status == 'lost',
@@ -2002,18 +1950,18 @@ def _create_customer(self, with_parent=None):
         if with_parent:
             partner_company = with_parent
         elif self.partner_name:
-            partner_company = Partner.create(self._prepare_customer_values(self.partner_name, is_company=True))
+            partner_company = Partner.create(self._prepare_customer_values(self.partner_name))
         elif self.partner_id:
             partner_company = self.partner_id
         else:
             partner_company = self.env['res.partner']
 
         if contact_name:
-            return Partner.create(self._prepare_customer_values(contact_name, is_company=False, parent_id=partner_company.id))
+            return Partner.create(self._prepare_customer_values(contact_name, parent_id=partner_company.id))
 
         if partner_company:
             return partner_company
-        return Partner.create(self._prepare_customer_values(self.name, is_company=False))
+        return Partner.create(self._prepare_customer_values(self.name))
 
     def _get_customer_information(self):
         email_keys_to_values = super()._get_customer_information()
@@ -2025,24 +1973,18 @@ def _get_customer_information(self):
                 continue
             values = email_keys_to_values.setdefault(email_key, {})
             contact_name = lead.contact_name or parse_contact_from_email(lead.email_from)[0] or lead.email_from
-            is_company = bool(lead.partner_name) and contact_name == lead.partner_name
             # Note that we don't attempt to create the parent company even if partner name is set
             values.update({
                 key: val for key, val in lead._prepare_customer_values(
-                    contact_name, is_company=is_company, parent_id=False
+                    contact_name, parent_id=False
                 ).items() if val and key != 'email'  # don't force email used as criterion
             })
-            values['is_company'] = is_company
-            if not is_company and lead.commercial_partner_id:
-                values['parent_id'] = lead.commercial_partner_id.id
-                values.pop('company_name', None)
         return email_keys_to_values
 
-    def _prepare_customer_values(self, partner_name, is_company=False, parent_id=False):
+    def _prepare_customer_values(self, partner_name, parent_id=False):
         """ Extract data from lead to create a partner.
 
         :param partner_name : future name of the partner
-        :param is_company : True if the partner is a company
         :param parent_id : id of the parent partner (False if no parent)
 
         :return: dictionary of values to give at res_partner.create()
@@ -2065,10 +2007,10 @@ def _prepare_customer_values(self, partner_name, is_company=False, parent_id=Fal
             'website': self.website,
             # company / hierarchy
             'parent_id': parent_id,
-            'is_company': is_company,
-            'company_name': not is_company and not parent_id and self.partner_name,
             'type': 'contact'
         }
+        if not parent_id and self.partner_name:
+            res['parent_name'] = self.partner_name
         if self.lang_id.active:
             res['lang'] = self.lang_id.code
         return res

addons/crm/static/src/js/tours/crm.js

@@ -28,7 +28,7 @@ registry.category("web_tour.tours").add('crm_tour', {
     tooltipPosition: 'bottom',
     run: "click",
 }, {
-    trigger: ".o_kanban_quick_create .o_field_widget[name='commercial_partner_id'] input",
+    trigger: ".o_kanban_quick_create .o_field_widget[name='partner_id'] input",
     content: markup(_t('<b>Write a few letters</b> to look for a company, or create a new one.')),
     tooltipPosition: "top",
     run: "edit Brandon Freeman",