Skip to content

Commit

Permalink
Merge pull request #393 from OCA/14.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/commission (14.0)
  • Loading branch information
bt-admin authored Dec 19, 2023
2 parents 90104ca + d155f3e commit b538788
Show file tree
Hide file tree
Showing 42 changed files with 847 additions and 146 deletions.
2 changes: 1 addition & 1 deletion 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.7.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions
[sale_commission](sale_commission/) | 14.0.1.8.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.0 | | Sales commission check deposit
Expand Down
6 changes: 3 additions & 3 deletions 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:c2f655ae5e258630917d62c8c9af3142059c4712ddeaf45bd49ccd13ff6ed87b
!! source digest: sha256:aa47b590bbc54ecd8d05a7e7a581cf0df4b8bd9a302b2d83b56820621c1904c6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Mature-brightgreen.png
Expand Down Expand Up @@ -59,9 +59,9 @@ For adding commissions:

#. Select the base amount for computing the percentage:

* **Gross Amount**: percentage is computed from the amount put on
* **Sale/Invoice Amount**: percentage is computed from the amount put on
sales order/invoice.
* **Net Amount**: percentage is computed from the profit only, taken the
* **Margin (Amount - Cost)**: percentage is computed from the profit only, taken the
cost from the product.

#. Select the invoice status for settling the commissions:
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.7.1",
"version": "14.0.1.8.0",
"author": "Tecnativa," "Odoo Community Association (OCA)",
"category": "Sales Management",
"license": "AGPL-3",
Expand Down
48 changes: 38 additions & 10 deletions sale_commission/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,6 @@ msgstr ""
msgid "Generated invoice"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Gross Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_search
Expand Down Expand Up @@ -659,6 +654,11 @@ msgstr ""
msgid "Make settlements"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Margin (Amount - Cost)"
msgstr ""

#. module: sale_commission
#: model:ir.model,name:sale_commission.model_sale_commission_mixin
msgid "Mixin model for applying to any object that wants to handle commissions"
Expand All @@ -682,11 +682,6 @@ msgstr ""
msgid "Name"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Net Amount"
msgstr ""

#. module: sale_commission
#: code:addons/sale_commission/models/sale_commission_mixin.py:0
#, fuzzy, python-format
Expand Down Expand Up @@ -798,6 +793,11 @@ msgstr "Comissió de les vendes"
msgid "Sale commission"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
#, fuzzy
Expand All @@ -824,11 +824,39 @@ msgstr ""
msgid "Sections"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__amount_base_type
msgid ""
"Select the base amount for computing the percentage:\n"
"* 'Sale/Invoice Amount': percentage is computed from the amount put on sales "
"order/invoice.\n"
"* 'Margin (Amount - Cost)': percentage is computed from the profit only, "
"taken the cost from the product."
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settled_wizard
msgid "Select the date up to which you want to make the settlements:"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__invoice_state
msgid ""
"Select the invoice status for settling the commissions:\n"
"* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
"* 'Payment Based': Commissions are settled when the invoice is paid."
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__commission_type
msgid ""
"Select the percentage type of the commission:\n"
"* 'Fixed percentage': all commissions are computed with a fixed percentage. "
"You can fill the percentage in the field \"Fixed percentage\".\n"
"* 'By sections': percentage varies depending amount intervals. You can fill "
"intervals and percentages in the section \"Rate definition\"."
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__res_partner__settlement__semi
msgid "Semi-annual"
Expand Down
54 changes: 44 additions & 10 deletions sale_commission/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -493,11 +493,6 @@ msgstr "Allgemeine Information"
msgid "Generated invoice"
msgstr "Erzeugte Rechnung"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Gross Amount"
msgstr "Bruttobetrag"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_search
Expand Down Expand Up @@ -669,6 +664,11 @@ msgstr "Rechnungen erstellen"
msgid "Make settlements"
msgstr "Provisionen ermitteln"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Margin (Amount - Cost)"
msgstr ""

#. module: sale_commission
#: model:ir.model,name:sale_commission.model_sale_commission_mixin
msgid "Mixin model for applying to any object that wants to handle commissions"
Expand All @@ -692,11 +692,6 @@ msgstr "Monatlich"
msgid "Name"
msgstr "Name"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Net Amount"
msgstr "Nettosumme"

#. module: sale_commission
#: code:addons/sale_commission/models/sale_commission_mixin.py:0
#, fuzzy, python-format
Expand Down Expand Up @@ -813,6 +808,11 @@ msgstr "Provision im Verkauf"
msgid "Sale commission"
msgstr "Provisionen ermitteln"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
#, fuzzy
Expand Down Expand Up @@ -840,11 +840,39 @@ msgstr ""
msgid "Sections"
msgstr "Bereiche"

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__amount_base_type
msgid ""
"Select the base amount for computing the percentage:\n"
"* 'Sale/Invoice Amount': percentage is computed from the amount put on sales "
"order/invoice.\n"
"* 'Margin (Amount - Cost)': percentage is computed from the profit only, "
"taken the cost from the product."
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settled_wizard
msgid "Select the date up to which you want to make the settlements:"
msgstr "Wählen Sie das Datum, bis zu dem Sie abrechnen möchten:"

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__invoice_state
msgid ""
"Select the invoice status for settling the commissions:\n"
"* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
"* 'Payment Based': Commissions are settled when the invoice is paid."
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__commission_type
msgid ""
"Select the percentage type of the commission:\n"
"* 'Fixed percentage': all commissions are computed with a fixed percentage. "
"You can fill the percentage in the field \"Fixed percentage\".\n"
"* 'By sections': percentage varies depending amount intervals. You can fill "
"intervals and percentages in the section \"Rate definition\"."
msgstr ""

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__res_partner__settlement__semi
msgid "Semi-annual"
Expand Down Expand Up @@ -1064,6 +1092,12 @@ msgstr "Abbre_chen"
msgid "or"
msgstr "oder"

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

#~ msgid "Net Amount"
#~ msgstr "Nettosumme"

#~ msgid "Invoice line agents and commissions"
#~ msgstr "Vertreter und Provisionen der Rechnungsposition"

Expand Down
71 changes: 60 additions & 11 deletions sale_commission/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-13 11:05+0000\n"
"PO-Revision-Date: 2023-12-13 12:35+0000\n"
"PO-Revision-Date: 2023-12-18 20:33+0000\n"
"Last-Translator: Ivorra78 <[email protected]>\n"
"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
"Language: es\n"
Expand Down Expand Up @@ -492,11 +492,6 @@ msgstr "Información general"
msgid "Generated invoice"
msgstr "Factura generada"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Gross Amount"
msgstr "Importe bruto"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_search
Expand Down Expand Up @@ -664,6 +659,11 @@ msgstr "Crear facturas"
msgid "Make settlements"
msgstr "Realizar liquidaciones"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Margin (Amount - Cost)"
msgstr "Margen (Importe - Coste)"

#. module: sale_commission
#: model:ir.model,name:sale_commission.model_sale_commission_mixin
msgid "Mixin model for applying to any object that wants to handle commissions"
Expand All @@ -690,11 +690,6 @@ msgstr "Mensual"
msgid "Name"
msgstr "Nombre"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__net_amount
msgid "Net Amount"
msgstr "Importe neto"

#. module: sale_commission
#: code:addons/sale_commission/models/sale_commission_mixin.py:0
#, python-format
Expand Down Expand Up @@ -804,6 +799,11 @@ msgstr "Informe de análisis de comisiones"
msgid "Sale commission"
msgstr "Comisión de venta"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
msgstr "Importe de la Venta / Factura"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_sale_commission_analysis_search
msgid "Sales Commission Analysis"
Expand All @@ -829,11 +829,54 @@ msgstr "Guardar"
msgid "Sections"
msgstr "Secciones"

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__amount_base_type
msgid ""
"Select the base amount for computing the percentage:\n"
"* 'Sale/Invoice Amount': percentage is computed from the amount put on sales "
"order/invoice.\n"
"* 'Margin (Amount - Cost)': percentage is computed from the profit only, "
"taken the cost from the product."
msgstr ""
"Seleccione el importe base para calcular el porcentaje:\n"
"* 'Importe Venta/Factura': el porcentaje se computa a partir del importe "
"puesto en la orden de venta/factura.\n"
"* Margen (Importe - Coste)\": el porcentaje se calcula únicamente a partir "
"del beneficio, teniendo en cuenta el coste del producto."

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settled_wizard
msgid "Select the date up to which you want to make the settlements:"
msgstr "Seleccione la fecha hasta la que quiere realizar las liquidaciones:"

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__invoice_state
msgid ""
"Select the invoice status for settling the commissions:\n"
"* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
"* '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"
"* Pago\": Las comisiones se liquidan cuando se paga la factura."

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission__commission_type
msgid ""
"Select the percentage type of the commission:\n"
"* 'Fixed percentage': all commissions are computed with a fixed percentage. "
"You can fill the percentage in the field \"Fixed percentage\".\n"
"* 'By sections': percentage varies depending amount intervals. You can fill "
"intervals and percentages in the section \"Rate definition\"."
msgstr ""
"Seleccione el tipo de porcentaje de la comisión:\n"
"* \"Porcentaje fijo\": todas las comisiones se computan con un porcentaje "
"fijo. Puede rellenar el porcentaje en el campo \"Porcentaje fijo\".\n"
"* 'Por tramos': el porcentaje varía en función de los intervalos de importe. "
"Puede rellenar los intervalos y porcentajes en el apartado \"Definición de "
"la tarifa\"."

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__res_partner__settlement__semi
msgid "Semi-annual"
Expand Down Expand Up @@ -1050,6 +1093,12 @@ msgstr "Cancelar"
msgid "or"
msgstr "o"

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

#~ msgid "Net Amount"
#~ msgstr "Importe neto"

#~ msgid "Invoice line agents and commissions"
#~ msgstr "Agentes y comisiones de línea de factura"

Expand Down
Loading

0 comments on commit b538788

Please sign in to comment.