Skip to content

Commit

Permalink
Merge pull request #469 from OCA/17.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/commission (17.0)
  • Loading branch information
bt-admin authored Jul 11, 2024
2 parents 3e72af1 + e82f4c6 commit 8948659
Show file tree
Hide file tree
Showing 34 changed files with 1,404 additions and 37 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ addon | version | maintainers | summary
[commission_formula](commission_formula/) | 17.0.1.0.0 | | Commissions computed by formulas
[hr_commission](hr_commission/) | 17.0.1.0.0 | | HR commissions
[sale_commission](sale_commission/) | 17.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions
[sale_commission_salesman](sale_commission_salesman/) | 17.0.1.0.0 | | Sales commissions from salesman

[//]: # (end addons)

Expand Down
6 changes: 0 additions & 6 deletions commission/i18n/commission.pot
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ msgstr ""

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -573,11 +572,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down
9 changes: 3 additions & 6 deletions commission/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ msgstr "Si está marcada, nuevos mensajes requieren su atención."

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr "Si está marcada, algunos mensajes tienen un error de entrega."

Expand Down Expand Up @@ -586,11 +585,6 @@ msgstr "Definición de tarifas"
msgid "Responsible User"
msgstr "Usuario Responsable"

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr "Error en la entrega de sms"

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down Expand Up @@ -855,6 +849,9 @@ msgstr "Sólo puede añadir una vez cada agente."
msgid "or"
msgstr "o"

#~ msgid "SMS Delivery error"
#~ msgstr "Error en la entrega de sms"

#~ msgid "Last Modified on"
#~ msgstr "??ltima Modificaci??n el"

Expand Down
9 changes: 3 additions & 6 deletions commission/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,6 @@ msgstr "Se selezionata, nuovi messaggi richiedono attenzione."

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr "Se selezionata, alcuni messaggi hanno un errore di consegna."

Expand Down Expand Up @@ -585,11 +584,6 @@ msgstr "Definizione aliquote"
msgid "Responsible User"
msgstr "Utente responsabile"

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr "Errore consegna SMS"

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down Expand Up @@ -855,6 +849,9 @@ msgstr "È possibile aggiungere ogni agente solo una volta."
msgid "or"
msgstr "o"

#~ msgid "SMS Delivery error"
#~ msgstr "Errore consegna SMS"

#~ msgid "Last Modified on"
#~ msgstr "Ultima modifica il"

Expand Down
6 changes: 0 additions & 6 deletions commission/i18n/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ msgstr ""

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""

Expand Down Expand Up @@ -584,11 +583,6 @@ msgstr "????????????"
msgid "Responsible User"
msgstr ""

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down
9 changes: 3 additions & 6 deletions commission/i18n/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ msgstr "Se selecionado, há novas mensagens que requerem a sua atenção."

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr "Se marcada, algumas mensagens têm um erro de entrega."

Expand Down Expand Up @@ -582,11 +581,6 @@ msgstr "Definição de taxas de comissão"
msgid "Responsible User"
msgstr "Utilizador Responsável"

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr "Erro de Envio de SMS"

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down Expand Up @@ -850,6 +844,9 @@ msgstr "Só pode adicionar cada agente uma vez."
msgid "or"
msgstr "ou"

#~ msgid "SMS Delivery error"
#~ msgstr "Erro de Envio de SMS"

#~ msgid "Last Modified on"
#~ msgstr "??ltima Modif. em"

Expand Down
9 changes: 3 additions & 6 deletions commission/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,6 @@ msgstr "Se marcado novas mensagens solicitar??o sua aten????o."

#. module: commission
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_error
#: model:ir.model.fields,help:commission.field_commission_settlement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr "Se marcado, algumas mensagens tem erro de entrega."

Expand Down Expand Up @@ -586,11 +585,6 @@ msgstr "Defini????o de taxas"
msgid "Responsible User"
msgstr "Usu??rio Respons??vel"

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_sms_error
msgid "SMS Delivery error"
msgstr "Erro de entrega de SMS"

#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
Expand Down Expand Up @@ -856,6 +850,9 @@ msgstr "Voc?? s?? pode adicionar uma vez cada representante."
msgid "or"
msgstr "ou"

#~ msgid "SMS Delivery error"
#~ msgstr "Erro de entrega de SMS"

#~ msgid "Last Modified on"
#~ msgstr "??ltima Modifica????o em"

Expand Down
118 changes: 118 additions & 0 deletions sale_commission_salesman/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
===============================
Sales commissions from salesman
===============================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ff8e4813cb8434bcf88070d72cfd283448beaca5f10cff88b347d2543805cd64
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |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%2Fcommission-lightgray.png?logo=github
:target: https://github.com/OCA/commission/tree/17.0/sale_commission_salesman
:alt: OCA/commission
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/commission-17-0/commission-17-0-sale_commission_salesman
: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/commission&target_branch=17.0
:alt: Try me on Runboat

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

This module extends the functionality of sale_commission to allow you to
auto-populate salesmen as commission agents without setting explicitly
them on the customer.

**IMPORTANT**: The salesman will be only populated if no other
commission agent is set via other method, to assure that there's no
overlapping commissions.

**Table of contents**

.. contents::
:local:

Configuration
=============

1. Go to *Contacts*.
2. Search for the contact linked to the salesman user and open it.
3. If it's actually linked to a user, you'll see a new check in the
*Agent information* page, called "Convert salesman into agent".
4. Check it for having that salesman automatically populated as agent.
You need to assign a commission to that agent as well.

Usage
=====

To use this module, you need to:

1. Go to *Sales > Orders > Quotations* and create a new one.
2. Fill the customer with one with no agents set.
3. Select a salesman with the mark checked.
4. Add a line in the quotation, and you will see the salesman populated
as commission agent.

Known issues / Roadmap
======================

- This module can be split into 2: account_commission_salesman and
sale_commission_salesman.

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

Bugs are tracked on `GitHub Issues <https://github.com/OCA/commission/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/commission/issues/new?body=module:%20sale_commission_salesman%0Aversion:%2017.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
-------

* Tecnativa

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

- `Tecnativa <https://www.tecnativa.com>`__:

- Pedro M. Baeza

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

- Part of the icon made from <a
href="http://www.onlinewebfonts.com/icon">Icon Fonts</a> is licensed
by CC BY 3.0

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.

This module is part of the `OCA/commission <https://github.com/OCA/commission/tree/17.0/sale_commission_salesman>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
3 changes: 3 additions & 0 deletions sale_commission_salesman/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from . import models
14 changes: 14 additions & 0 deletions sale_commission_salesman/__manifest__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright 2020 Tecnativa - Pedro M. Baeza
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

{
"name": "Sales commissions from salesman",
"version": "17.0.1.0.0",
"author": "Tecnativa, " "Odoo Community Association (OCA)",
"category": "Sales",
"website": "https://github.com/OCA/commission",
"license": "AGPL-3",
"depends": ["sale_commission"],
"data": ["views/res_partner_views.xml"],
"installable": True,
}
56 changes: 56 additions & 0 deletions sale_commission_salesman/i18n/ca.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_commission_salesman
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2021-06-04 10:48+0000\n"
"Last-Translator: jabelchi <[email protected]>\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: sale_commission_salesman
#: model:ir.model,name:sale_commission_salesman.model_res_partner
msgid "Contact"
msgstr "Contacte"

#. module: sale_commission_salesman
#: model:ir.model.fields,field_description:sale_commission_salesman.field_res_partner__salesman_as_agent
#: model:ir.model.fields,field_description:sale_commission_salesman.field_res_users__salesman_as_agent
msgid "Convert salesman into agent"
msgstr "Convertir venedor en agent"

#. module: sale_commission_salesman
#: model:ir.model.fields,help:sale_commission_salesman.field_res_partner__salesman_as_agent
#: model:ir.model.fields,help:sale_commission_salesman.field_res_users__salesman_as_agent
msgid ""
"If the user linked to this partner is put as salesman and no other "
"commission rule is triggered, this agent will be added as the commission "
"agent"
msgstr ""
"Si l'usuari enllaçat a aquest contacte es posa com a comercial i no s'activa "
"cap altra regla de comissions, aquest agent s'afegirà com a comissionista"

#. module: sale_commission_salesman
#: model:ir.model,name:sale_commission_salesman.model_account_move_line
msgid "Journal Item"
msgstr "Apunt comptable"

#. module: sale_commission_salesman
#: model:ir.model,name:sale_commission_salesman.model_sale_order_line
msgid "Sales Order Line"
msgstr "Línia de comanda de venda"

#. module: sale_commission_salesman
#. odoo-python
#: code:addons/sale_commission_salesman/models/res_partner.py:0
#, python-format
msgid "You can't have a salesman auto-agent without commission."
msgstr "No podeu tenir un comercial auto-agent sense comissió."
Loading

0 comments on commit 8948659

Please sign in to comment.