[REV] Finish to revert OCA#1905.

Begin of the revert has been done in OCA#2263. But after comments in OCA#2263, it looks like it's better to full revert the initial PR. (Also the other module partner_type_base, will be removed in another PR OCA#2266).

Author: legalsylvain

partner_firstname/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 ================================
 Partner first name and last name
 ================================
@@ -11,13 +7,13 @@ Partner first name and last name
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:bcf53401576a235e25d371fa9fa02b35e39bab9df9045b75bf04724a72b7bed9
+   !! source digest: sha256:224a197e758626faea4d1e92876a2039c4c17bb1d8d5acea1270f4a9b4b5e9eb
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github

partner_firstname/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Partner first name and last name",
     "summary": "Split first name and last name for non company partners",
-    "version": "18.0.5.0.0",
+    "version": "18.0.6.0.0",
     "author": "Camptocamp, "
     "Grupo ESOC Ingeniería de Servicios, "
     "Tecnativa, "

partner_firstname/models/firstname_mixin.py

@@ -12,32 +12,20 @@ class FirstNameMixin(models.AbstractModel):
         " that have firstname / lastname fields."
     )
 
-    is_individual = fields.Boolean(compute="_compute_is_individual")
-
     form_has_lastname_first = fields.Boolean(compute="_compute_form_has_lastname_first")
 
     firstname_required = fields.Boolean(compute="_compute_firstname_lastname_required")
 
     lastname_required = fields.Boolean(compute="_compute_firstname_lastname_required")
 
-    def _compute_is_individual(self):
-        # By default, models that inherit 'firstname.mixin' are individual
-        # (like hr.employee, for exemple)
-        # Overload this function for more complex model, like res.partner.
-        for item in self:
-            item.is_individual = True
-
     @api.depends(lambda self: self._get_fields_depend_firstname_lastname_required())
     def _compute_firstname_lastname_required(self):
         required_fields = (
             self.env["ir.config_parameter"]
             .sudo()
             .get_param("partner_names_required_fields")
         )
-        for item in self.filtered(lambda x: not x.is_individual):
-            item.firstname_required = False
-            item.lastname_required = False
-        for item in self.filtered(lambda x: x.is_individual):
+        for item in self:
             item.firstname_required = not item.lastname or required_fields in [
                 "firstname",
                 "firstname_lastname",

partner_firstname/models/res_partner.py

@@ -28,14 +28,6 @@ class ResPartner(models.Model):
         readonly=False,
     )
 
-    @api.depends("is_company")
-    def _compute_is_individual(self):
-        # As a first approximation, individuals are
-        # just non-company partners.
-        # Overload this function to refine this algorithm.
-        for item in self:
-            item.is_individual = not item.is_company
-
     # @api.depends(lambda self: self._get_fields_depend_firstname_lastname_required())
     def _compute_firstname_lastname_required(self):
         for partner in self.filtered(lambda x: x.is_company or not x.type == "contact"):

partner_firstname/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>Partner first name and last name</title>
 <style type="text/css">
 
 /*
@@ -360,21 +360,16 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="partner-first-name-and-last-name">
+<h1 class="title">Partner first name and last name</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="partner-first-name-and-last-name">
-<h1>Partner first name and last name</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:bcf53401576a235e25d371fa9fa02b35e39bab9df9045b75bf04724a72b7bed9
+!! source digest: sha256:224a197e758626faea4d1e92876a2039c4c17bb1d8d5acea1270f4a9b4b5e9eb
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/partner-contact/tree/18.0/partner_firstname"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/partner-contact-18-0/partner-contact-18-0-partner_firstname"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/partner-contact/tree/18.0/partner_firstname"><img alt="OCA/partner-contact" src="https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/partner-contact-18-0/partner-contact-18-0-partner_firstname"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module was written to extend the functionality of contacts to
 support having separate last name and first name.</p>
 <p><strong>Table of contents</strong></p>
@@ -393,7 +388,7 @@ <h1>Partner first name and last name</h1>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <p><strong>Fields Order</strong></p>
 <p>You can configure some common name patterns for the inverse function in
 Settings &gt; General settings:</p>
@@ -419,7 +414,7 @@ <h2><a class="toc-backref" href="#toc-entry-1">Configuration</a></h2>
 <p><img alt="partner_names_required_fields" src="https://raw.githubusercontent.com/OCA/partner-contact/18.0/partner_firstname/static/description/partner_names_required_fields.png" /></p>
 </div>
 <div class="section" id="usage">
-<h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>The field <em>name</em> becomes a stored function field concatenating the <em>last
 name</em> and the <em>first name</em>. This avoids breaking compatibility with
 other modules.</p>
@@ -436,7 +431,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Usage</a></h2>
 contact).</p>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
 <p>Patterns for the inverse function are configurable only at system level.
 Maybe this configuration could depend on partner language, country or
 company, as discussed at <a class="reference external" href="https://github.com/OCA/partner-contact/issues/210">this OCA
@@ -445,17 +440,17 @@ <h2><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h2>
 level in firstname.mixin level, harmonizing different implementations.</p>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/partner-contact/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_firstname%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-5">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>Camptocamp</li>
 <li>Grupo ESOC Ingeniería de Servicios</li>
@@ -467,7 +462,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Authors</a></h3>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li>Nicolas Bessi &lt;<a class="reference external" href="mailto:nicolas.bessi&#64;camptocamp.com">nicolas.bessi&#64;camptocamp.com</a>&gt;</li>
 <li>Yannick Vaucher &lt;<a class="reference external" href="mailto:yannick.vaucher&#64;camptocamp.com">yannick.vaucher&#64;camptocamp.com</a>&gt;</li>
@@ -496,7 +491,7 @@ <h3><a class="toc-backref" href="#toc-entry-7">Contributors</a></h3>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -511,6 +506,5 @@ <h3><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

partner_firstname/views/res_partner.xml

@@ -3,18 +3,22 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_simple_form" />
         <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="is_individual" invisible="1" />
-            </field>
             <xpath expr="//field[@id='individual']" position="attributes">
-                <attribute name="readonly">is_individual</attribute>
+                <attribute name="invisible">is_company</attribute>
+                <attribute name="readonly">not is_company</attribute>
+                <attribute name="required">type == 'contact' and is_company</attribute>
+            </xpath>
+            <xpath expr="//field[@id='company']" position="attributes">
+                <attribute name="invisible">is_company == False</attribute>
+                <attribute name="readonly">not is_company</attribute>
+                <attribute name="required">type == 'contact' and is_company</attribute>
             </xpath>
             <xpath expr="//h1//field[@id='company']/.." position="before">
-                <group invisible="not is_individual">
+                <group invisible="is_company">
                     <field
-                        name="lastname"
-                        required="lastname_required"
                         invisible="not form_has_lastname_first"
+                        name="lastname"
+                        required="form_has_lastname_first and lastname_required"
                     />
                     <field name="firstname" required="firstname_required" />
                     <field
@@ -30,18 +34,22 @@
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
-            <field name="name" position="after">
-                <field name="is_individual" invisible="1" />
-            </field>
             <xpath expr="//field[@id='individual']" position="attributes">
-                <attribute name="readonly">is_individual</attribute>
+                <attribute name="invisible">is_company</attribute>
+                <attribute name="readonly">not is_company</attribute>
+                <attribute name="required">type == 'contact' and is_company</attribute>
+            </xpath>
+            <xpath expr="//field[@id='company']" position="attributes">
+                <attribute name="invisible">not is_company</attribute>
+                <attribute name="readonly">not is_company</attribute>
+                <attribute name="required">type == 'contact' and is_company</attribute>
             </xpath>
             <xpath
                 expr="//div[hasclass('oe_title')]//field[@id='company']/.."
                 position="after"
             >
                 <div class="oe_edit_only">
-                    <group invisible="not is_individual">
+                    <group invisible="is_company">
                         <field
                             invisible="not form_has_lastname_first"
                             name="lastname"
@@ -56,20 +64,21 @@
                     </group>
                 </div>
             </xpath>
-
+            <!-- Modify inner contact form of child_ids -->
             <xpath
                 expr="//field[@name='child_ids']/form//field[@name='name']"
                 position="attributes"
             >
-                <attribute name="invisible">is_individual</attribute>
+                <attribute name="readonly">not is_company</attribute>
+                <attribute name="required">is_company</attribute>
             </xpath>
-
             <xpath
                 expr="//field[@name='child_ids']/form//field[@name='name']"
                 position="after"
             >
                 <div class="oe_edit_only" colspan="2">
-                    <group invisible="not is_individual">
+                    <field name="is_company" invisible="True" />
+                    <group invisible="is_company">
                         <field
                             invisible="not form_has_lastname_first"
                             name="lastname"