Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/commission (14.0) #490

Merged
merged 12 commits into from
Oct 24, 2024
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[sale_commission](sale_commission/) | 14.0.1.9.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions
[sale_commission](sale_commission/) | 14.0.1.10.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions
[sale_commission_advance](sale_commission_advance/) | 14.0.1.0.0 | [![ilyasprogrammer](https://github.com/ilyasprogrammer.png?size=30px)](https://github.com/ilyasprogrammer) | Down payment invoice commission
[sale_commission_agent_restrict](sale_commission_agent_restrict/) | 14.0.2.0.2 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) | Sales Commissions Agent Restrict
[sale_commission_check_deposit](sale_commission_check_deposit/) | 14.0.1.0.2 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sales commission check deposit
Expand All @@ -34,7 +34,7 @@ addon | version | maintainers | summary
[sale_commission_product_criteria](sale_commission_product_criteria/) | 14.0.1.1.6 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Advanced commissions rules
[sale_commission_product_criteria_discount](sale_commission_product_criteria_discount/) | 14.0.1.0.3 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Advanced commissions rules with discount
[sale_commission_product_criteria_domain](sale_commission_product_criteria_domain/) | 14.0.1.0.11 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sale Commission Product Criteria Domain
[sale_commission_queued](sale_commission_queued/) | 14.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions queued
[sale_commission_queued](sale_commission_queued/) | 14.0.1.1.0 | [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) | Sales commissions queued
[sale_commission_salesman](sale_commission_salesman/) | 14.0.1.0.1 | | Sales commissions from salesman
[sale_commission_settlement_report](sale_commission_settlement_report/) | 14.0.1.0.0 | [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Settings to customize the settlement report
[sale_quick_commission](sale_quick_commission/) | 14.0.1.0.0 | | Makes modules compatible
Expand Down
2 changes: 1 addition & 1 deletion sale_commission/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sales commissions
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:56e2ff22ce208b39c4c616cfc811d55fdac9058be14623cbd491f39069ab7d3a
!! source digest: sha256:3414620188fba8c73e613851e9efb7877f0668c631edbb6f9828f9a52f8f54c5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
Expand Down
2 changes: 1 addition & 1 deletion sale_commission/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2020 Tecnativa - Manuel Calero
{
"name": "Sales commissions",
"version": "14.0.1.9.0",
"version": "14.0.1.10.0",
"author": "Tecnativa," "Odoo Community Association (OCA)",
"category": "Sales Management",
"license": "AGPL-3",
Expand Down
7 changes: 6 additions & 1 deletion sale_commission/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,19 @@ msgstr ""
msgid "<strong>From:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,20 @@ msgstr "<strong>Vertreter:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Von:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>An:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Gesamt</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1088,6 +1093,9 @@ msgstr "Abbre_chen"
msgid "or"
msgstr "oder"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Gesamt</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Bruttobetrag"

Expand Down
16 changes: 12 additions & 4 deletions sale_commission/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,20 @@ msgstr "<strong>Agente:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Desde:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Hasta:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -857,8 +862,8 @@ msgid ""
"* 'Payment Based': Commissions are settled when the invoice is paid."
msgstr ""
"Seleccione el estado de la factura para liquidar las comisiones:\n"
"* 'Basado en factura': Las comisiones se liquidan cuando se emite la factura."
"\n"
"* 'Basado en factura': Las comisiones se liquidan cuando se emite la "
"factura.\n"
"* Pago\": Las comisiones se liquidan cuando se paga la factura."

#. module: sale_commission
Expand Down Expand Up @@ -1093,6 +1098,9 @@ msgstr "Cancelar"
msgid "or"
msgstr "o"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Total</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Importe bruto"

Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/es_AR.po
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,20 @@ msgstr "<strong>Agente:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Desde:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Hasta:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1068,6 +1073,9 @@ msgstr "_Cancelar"
msgid "or"
msgstr "o"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Total</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Importe Bruto"

Expand Down
7 changes: 6 additions & 1 deletion sale_commission/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,19 @@ msgstr "<strong>Commissionnaire:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>De:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>à:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
Expand Down
14 changes: 11 additions & 3 deletions sale_commission/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-22 08:15+0000\n"
"PO-Revision-Date: 2024-07-16 17:58+0000\n"
"PO-Revision-Date: 2024-10-23 12:06+0000\n"
"Last-Translator: Francesco Foresti <[email protected]>\n"
"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
"Language: it\n"
Expand Down Expand Up @@ -56,15 +56,20 @@ msgstr "<strong>Agente:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Dal:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr "<strong>Importo provvigioni documento:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Al:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Totale</strong>"
msgid "<strong>Total</strong> ("
msgstr "<strong>Totale</strong> ("

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1094,6 +1099,9 @@ msgstr "_Annulla"
msgid "or"
msgstr "oppure"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Totale</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Importo lordo"

Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/nl_NL.po
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,20 @@ msgstr "<strong>Agent:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Van:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Tot:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Totaal</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1076,6 +1081,9 @@ msgstr "_Annuleer"
msgid "or"
msgstr "of"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Totaal</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Brutobedrag"

Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,20 @@ msgstr "<strong>Agente:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>De:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Para:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1074,6 +1079,9 @@ msgstr "_Cancelar"
msgid "or"
msgstr "ou"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Total</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Valor Bruto"

Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,20 @@ msgstr "<strong>Agente:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>De:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Para:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1075,6 +1080,9 @@ msgstr "_Cancelar"
msgid "or"
msgstr "ou"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Total</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Montante bruto"

Expand Down
12 changes: 10 additions & 2 deletions sale_commission/i18n/pt_PT.po
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,20 @@ msgstr "<strong>Revendedor:</strong>"
msgid "<strong>From:</strong>"
msgstr "<strong>Desde:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr "<strong>Até:</strong>"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgstr "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission__active
Expand Down Expand Up @@ -1064,6 +1069,9 @@ msgstr "_Cancelar"
msgid "or"
msgstr "ou"

#~ msgid "<strong>Total</strong>"
#~ msgstr "<strong>Total</strong>"

#~ msgid "Gross Amount"
#~ msgstr "Valor Bruto"

Expand Down
7 changes: 6 additions & 1 deletion sale_commission/i18n/sale_commission.pot
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,19 @@ msgstr ""
msgid "<strong>From:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Global commission amount:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>To:</strong>"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.report_settlement
msgid "<strong>Total</strong>"
msgid "<strong>Total</strong> ("
msgstr ""

#. module: sale_commission
Expand Down
Loading
Loading