Skip to content

Commit

Permalink
Merge pull request #1332 from brain-tec/18.0
Browse files Browse the repository at this point in the history
[t153253] Update project branch with latest changes from origin
  • Loading branch information
BT-dmoreno authored Dec 17, 2024
2 parents 0fa7c7b + 135437c commit 73da215
Show file tree
Hide file tree
Showing 66 changed files with 2,542 additions and 11 deletions.
8 changes: 8 additions & 0 deletions .oca/oca-port/blacklist/partner_company_group.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pull_requests": {
"orphaned_commits": "(auto) Nothing to port from PR #",
"1243": "(auto) Nothing to port from PR #1243",
"1257": "(auto) Nothing to port from PR #1257",
"1657": "(auto) Nothing to port from PR #1657"
}
}
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ addon | version | maintainers | summary
[account_partner_company_group](account_partner_company_group/) | 18.0.1.0.0 | | Adds the possibility to add a company group to a company
[base_location](base_location/) | 18.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Enhanced zip/npa management system
[base_location_geonames_import](base_location_geonames_import/) | 18.0.1.0.0 | | Import zip entries from Geonames
[base_partner_company_group](base_partner_company_group/) | 18.0.1.0.0 | | Adds the possibility to add a company group to a company
[base_partner_company_group](base_partner_company_group/) | 18.0.1.1.0 | | Adds the possibility to add a company group to a company
[base_partner_sequence](base_partner_sequence/) | 18.0.1.0.0 | | Sets customer's code from a sequence
[crm_partner_company_group](crm_partner_company_group/) | 18.0.1.0.0 | | Adds the possibility to add a company group to a company
[partner_company_group](partner_company_group/) | 18.0.1.0.0 | [![luisg123v](https://github.com/luisg123v.png?size=30px)](https://github.com/luisg123v) | Adds the possibility to add a company group to a company
[partner_contact_access_link](partner_contact_access_link/) | 18.0.1.0.0 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Allow to visit the full contact form from a company
[partner_firstname](partner_firstname/) | 18.0.1.1.0 | | Split first name and last name for non company partners
[partner_identification](partner_identification/) | 18.0.1.0.0 | | Partner Identification Numbers
[partner_identification_unique_by_category](partner_identification_unique_by_category/) | 18.0.1.0.0 | | Partner Identification Numbers Unique By Category
[partner_pricelist_search](partner_pricelist_search/) | 18.0.1.0.0 | | Partner pricelist search
[partner_ref_unique](partner_ref_unique/) | 18.0.1.0.0 | | Add an unique constraint to partner ref field
[partner_title_order](partner_title_order/) | 18.0.1.0.0 | | Makes partner title sortable by sequence
[partner_tz](partner_tz/) | 18.0.1.0.0 | | Remove partner timezone default value and display on form
[sale_partner_company_group](sale_partner_company_group/) | 18.0.1.0.0 | | Adds the possibility to add a company group to a company

Expand Down
14 changes: 7 additions & 7 deletions base_partner_company_group/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Base Partner Company Group
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c89bf903fb407d8d48952578838ed3ff9da00530ad566ff12f3452e010030c52
!! source digest: sha256:1f7d1c4a2b02ab4891d95d6f1886073bbc52c27a0353e58e5ca9b174876d5b6f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -60,14 +60,14 @@ Authors
Contributors
------------

- Timon Tschanz <timon.tschanz@camptocamp.com>
- Yannick Vaucher <yannick.vaucher@camptocamp.com>
- `Tecnativa <https://www.tecnativa.com>`__:
- Timon Tschanz <timon.tschanz@camptocamp.com>
- Yannick Vaucher <yannick.vaucher@camptocamp.com>
- `Tecnativa <https://www.tecnativa.com>`__:

- Ernesto Tejeda
- Ernesto Tejeda

- Tharathip Chaweewongphan <tharathipc@ecosoft.co.th>
- Nguyen Minh Chien <chien@trobz.com>
- Tharathip Chaweewongphan <tharathipc@ecosoft.co.th>
- Nguyen Minh Chien <chien@trobz.com>

Other credits
-------------
Expand Down
2 changes: 1 addition & 1 deletion base_partner_company_group/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Base Partner Company Group",
"summary": "Adds the possibility to add a company group to a company",
"version": "18.0.1.0.0",
"version": "18.0.1.1.0",
"category": "Sales",
"author": "Camptocamp, Odoo Community Association (OCA)",
"license": "AGPL-3",
Expand Down
1 change: 1 addition & 0 deletions base_partner_company_group/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Contact(models.Model):
"res.partner",
domain=[("is_company", "=", True)],
recursive=True,
index=True,
)
company_group_member_ids = fields.One2many(
comodel_name="res.partner",
Expand Down
2 changes: 1 addition & 1 deletion base_partner_company_group/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Base Partner Company Group</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:c89bf903fb407d8d48952578838ed3ff9da00530ad566ff12f3452e010030c52
!! source digest: sha256:1f7d1c4a2b02ab4891d95d6f1886073bbc52c27a0353e58e5ca9b174876d5b6f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/base_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-18-0/partner-contact-18-0-base_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=18.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 companies, which is also
Expand Down
100 changes: 100 additions & 0 deletions partner_company_group/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
=====================
Partner Company Group
=====================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:980c8e0db01ed0a596d84559d2a0c291e0fe8f176511ba80df2943b16fa484e2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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/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
:target: https://github.com/OCA/partner-contact/tree/18.0/partner_company_group
:alt: OCA/partner-contact
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/partner-contact-18-0/partner-contact-18-0-partner_company_group
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/partner-contact&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This Module adds a company group field to companies, which is also
propagated to contacts and allows to search and group for the company
group in contact, leads, sale orders and invoices.

**Table of contents**

.. contents::
:local:

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/partner-contact/issues>`_.
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
`feedback <https://github.com/OCA/partner-contact/issues/new?body=module:%20partner_company_group%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
-------

* Camptocamp SA

Contributors
------------

- Timon Tschanz <timon.tschanz@camptocamp.com>
- Yannick Vaucher <yannick.vaucher@camptocamp.com>
- `Tecnativa <https://www.tecnativa.com>`__:

- Ernesto Tejeda
- Carlos Roca
- Víctor Martínez

- Tharathip Chaweewongphan <tharathipc@ecosoft.co.th>

Other credits
-------------

The migration of this module from 17.0 to 18.0 was financially supported
by Camptocamp.

Maintainers
-----------

This module is maintained by the OCA.

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

.. |maintainer-luisg123v| image:: https://github.com/luisg123v.png?size=40px
:target: https://github.com/luisg123v
:alt: luisg123v

Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-luisg123v|

This module is part of the `OCA/partner-contact <https://github.com/OCA/partner-contact/tree/18.0/partner_company_group>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
Empty file.
24 changes: 24 additions & 0 deletions partner_company_group/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright 2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
"name": "Partner Company Group",
"summary": "Adds the possibility to add a company group to a company",
"version": "18.0.1.0.0",
"category": "Sales",
"author": "Camptocamp SA, Odoo Community Association (OCA)",
"license": "AGPL-3",
"maintainers": ["luisg123v"],
"depends": [
"account_partner_company_group",
"crm_partner_company_group",
"sale_partner_company_group",
],
"website": "https://github.com/OCA/partner-contact",
"data": [
"views/opportunity_view.xml",
"views/contact_view.xml",
"views/sale_order_view.xml",
"views/account_move_views.xml",
],
"installable": True,
}
54 changes: 54 additions & 0 deletions partner_company_group/i18n/ca.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * partner_company_group
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2022-03-24 10:17+0000\n"
"Last-Translator: jabelchi <jabelchi@gmail.com>\n"
"Language-Team: none\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.3.2\n"

#. module: partner_company_group
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_account_invoice_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_crm_case_opportunities_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_res_partner_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_sales_order_filter
msgid "Company Group"
msgstr "Grup d'empreses"

#. module: partner_company_group
#: model:ir.actions.act_window,name:partner_company_group.action_open_group_members
msgid "Company group members"
msgstr "Membres del grup d'empreses"

#~ msgid "Company group"
#~ msgstr "Grup d'empreses"

#~ msgid "Contact"
#~ msgstr "Contacte"

#~ msgid "Journal Entry"
#~ msgstr "Assentaments comptables"

#~ msgid "Lead/Opportunity"
#~ msgstr "Iniciativa/Oportunitat"

#~ msgid "Sales Order"
#~ msgstr "Comanda de venda"

#~ msgid "Display Name"
#~ msgstr "Nom a mostrar"

#~ msgid "ID"
#~ msgstr "ID"

#~ msgid "Last Modified on"
#~ msgstr "Darrera modificació el"
77 changes: 77 additions & 0 deletions partner_company_group/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * partner_company_group
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2022-08-04 18:24+0200\n"
"Last-Translator: Sergio Teruel <sergio.teruel@tecnativa.com>\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 2.3\n"

#. module: partner_company_group
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_account_invoice_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_crm_case_opportunities_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_res_partner_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_sales_order_filter
msgid "Company Group"
msgstr "Grupo compañía"

#. module: partner_company_group
#: model:ir.actions.act_window,name:partner_company_group.action_open_group_members
msgid "Company group members"
msgstr "Miembros del grupo compañía"

#~ msgid "Company group"
#~ msgstr "Grupo compañía"

#~ msgid "Contact"
#~ msgstr "Contacto"

#~ msgid "Journal Entry"
#~ msgstr "Asiento contable"

#~ msgid "Lead/Opportunity"
#~ msgstr "Iniciativa / Oportunidad"

#~ msgid "Sales Order"
#~ msgstr "Pedido de venta"

#, python-format
#~ msgid ""
#~ "The company group %(name)s has the pricelist %(pricelist)s, that is "
#~ "different than the pricelist set on this contact"
#~ msgstr ""
#~ "El grupo compañía %(name)s tiene la tarifa %(pricelist)s, que es "
#~ "diferente a la tarifa de este contacto"

#, python-format
#~ msgid ""
#~ "This contact has members of a company group with different pricelists, "
#~ "the members are:\n"
#~ "%(members)s"
#~ msgstr ""
#~ "Este contacto tiene miembros de un grupo compañía con diferentes tarifas, "
#~ "los miembros son:\n"
#~ "%(members)s"

#, python-format
#~ msgid "Warning"
#~ msgstr "Advertencia"

#~ msgid "Display Name"
#~ msgstr "Nombre mostrado"

#~ msgid "ID"
#~ msgstr "ID"

#~ msgid "Last Modified on"
#~ msgstr "Última modificación en"
30 changes: 30 additions & 0 deletions partner_company_group/i18n/it.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * partner_company_group
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-12-27 11:42+0000\n"
"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
"Language-Team: none\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.17\n"

#. module: partner_company_group
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_account_invoice_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_crm_case_opportunities_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_res_partner_filter
#: model_terms:ir.ui.view,arch_db:partner_company_group.view_sales_order_filter
msgid "Company Group"
msgstr "Azienda capogruppo"

#. module: partner_company_group
#: model:ir.actions.act_window,name:partner_company_group.action_open_group_members
msgid "Company group members"
msgstr "Membri gruppo azienda"
Loading

0 comments on commit 73da215

Please sign in to comment.