Merge pull request #1376 from OCA/17.0

Syncing from upstream OCA/partner-contact (17.0)
brain-tec · Feb 9, 2025 · aa02d4c · aa02d4c
2 parents d1d25af + 405873c
commit aa02d4c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ addon | version | maintainers | summary
 [base_location_nuts](base_location_nuts/) | 17.0.1.0.0 | [![rafaelbn](https://github.com/rafaelbn.png?size=30px)](https://github.com/rafaelbn) [![edlopen](https://github.com/edlopen.png?size=30px)](https://github.com/edlopen) | NUTS Regions
 [base_partner_company_group](base_partner_company_group/) | 17.0.1.0.0 |  | Adds the possibility to add a company group to a company
 [base_partner_sequence](base_partner_sequence/) | 17.0.1.0.0 |  | Sets customer's code from a sequence
-[crm_partner_company_group](crm_partner_company_group/) | 17.0.1.0.0 |  | Adds the possibility to add a company group to a company
+[crm_partner_company_group](crm_partner_company_group/) | 17.0.1.1.0 |  | Adds the possibility to add a company group to a company
 [partner_address_split](partner_address_split/) | 17.0.1.0.0 |  | Add specific helper methods
 [partner_address_street3](partner_address_street3/) | 17.0.1.0.0 |  | Add a third address line on partners
 [partner_affiliate](partner_affiliate/) | 17.0.1.1.0 |  | Partner Affiliates

diff --git a/crm_partner_company_group/README.rst b/crm_partner_company_group/README.rst
@@ -7,7 +7,7 @@ CRM Partner Company Group
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:b187650350db691ed92176edf560bd584434beed33ae4609018dabb82bcd59ba
+   !! source digest: sha256:30fd75d8fec9f9163c6a430d3ab0327ab52356dace41a7065f3cace77657fefe
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -57,13 +57,13 @@ Authors
 Contributors
 ------------
 
--  Timon Tschanz <[email protected]>
--  Yannick Vaucher <[email protected]>
--  `Tecnativa <https://www.tecnativa.com>`__:
+- Timon Tschanz <[email protected]>
+- Yannick Vaucher <[email protected]>
+- `Tecnativa <https://www.tecnativa.com>`__:
 
-   -  Ernesto Tejeda
+  - Ernesto Tejeda
 
--  Tharathip Chaweewongphan <[email protected]>
+- Tharathip Chaweewongphan <[email protected]>
 
 Maintainers
 -----------

diff --git a/crm_partner_company_group/__manifest__.py b/crm_partner_company_group/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "CRM Partner Company Group",
     "summary": "Adds the possibility to add a company group to a company",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "category": "Sales",
     "author": "Camptocamp SA, Odoo Community Association (OCA)",
     "license": "AGPL-3",

diff --git a/crm_partner_company_group/static/description/index.html b/crm_partner_company_group/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">CRM Partner Company Group</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:b187650350db691ed92176edf560bd584434beed33ae4609018dabb82bcd59ba
+!! source digest: sha256:30fd75d8fec9f9163c6a430d3ab0327ab52356dace41a7065f3cace77657fefe
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.0/crm_partner_company_group"><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-17-0/partner-contact-17-0-crm_partner_company_group"><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=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This Module adds a company group field to leads. For more details

diff --git a/crm_partner_company_group/views/opportunity_view.xml b/crm_partner_company_group/views/opportunity_view.xml
@@ -17,4 +17,43 @@
             </filter>
         </field>
     </record>
+    <record id="crm_lead_view_form" model="ir.ui.view">
+        <field name="name">crm.lead.form</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_lead_view_form" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//group[@name='opportunity_partner']/field[@name='partner_id']"
+                position="after"
+            >
+                <field name="company_group_id" invisible="not company_group_id" />
+            </xpath>
+            <xpath
+                expr="//group[@name='lead_partner']/field[@name='partner_id']"
+                position="after"
+            >
+                <field name="company_group_id" invisible="not company_group_id" />
+            </xpath>
+        </field>
+    </record>
+    <record id="crm_case_tree_view_oppor" model="ir.ui.view">
+        <field name="name">crm.lead.tree.opportunity</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_tree_view_oppor" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="company_group_id" optional="hide" />
+            </field>
+        </field>
+   </record>
+    <record id="crm_case_tree_view_leads" model="ir.ui.view">
+        <field name="name">crm.lead.tree.lead</field>
+        <field name="model">crm.lead</field>
+        <field name="inherit_id" ref="crm.crm_case_tree_view_leads" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="company_group_id" optional="hide" />
+            </field>
+        </field>
+   </record>
 </odoo>