Skip to content

Commit

Permalink
Merge pull request #385 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 14, 2023
2 parents 63402cc + 3402a6e commit 631f24a
Show file tree
Hide file tree
Showing 53 changed files with 3,006 additions and 51 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ addon | version | maintainers | summary
[sale_commission_formula](sale_commission_formula/) | 14.0.1.0.0 | | Sale commissions computed by formulas
[sale_commission_geo_assign](sale_commission_geo_assign/) | 14.0.1.1.0 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) | Assign agents to partners according to their location
[sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.2.1 | [![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) | Bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign
[sale_commission_partial_settlement](sale_commission_partial_settlement/) | 14.0.1.0.0 | | Sales commissions based on paid amount
[sale_commission_pricelist](sale_commission_pricelist/) | 14.0.1.0.0 | | Sales commissions by pricelist
[sale_commission_product_criteria](sale_commission_product_criteria/) | 14.0.1.1.3 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules
[sale_commission_product_criteria_discount](sale_commission_product_criteria_discount/) | 14.0.1.0.2 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Advanced commissions rules with discount
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ msgstr ""
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
#, fuzzy
msgid "Commission Amount"
Expand Down Expand Up @@ -850,6 +849,11 @@ msgstr ""
msgid "Settled"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ msgstr "Provision"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
#, fuzzy
msgid "Commission Amount"
Expand Down Expand Up @@ -866,6 +865,11 @@ msgstr "Provisionen ermitteln"
msgid "Settled"
msgstr "Ermittelt"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
32 changes: 21 additions & 11 deletions sale_commission/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ 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: 2021-03-17 15:45+0000\n"
"Last-Translator: Ana Suárez <ana.suarez@qubiq.es>\n"
"PO-Revision-Date: 2023-12-13 12:35+0000\n"
"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\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: Weblate 4.3.2\n"
"X-Generator: Weblate 4.17\n"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_analysis_report__quantity
Expand Down Expand Up @@ -176,7 +176,7 @@ msgstr "Base"
#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__res_partner__settlement__biweekly
msgid "Bi-weekly"
msgstr ""
msgstr "Quincenal"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission__commission_type__section
Expand Down Expand Up @@ -240,7 +240,6 @@ msgstr "Comisión"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Importe de comisión"
Expand Down Expand Up @@ -452,13 +451,19 @@ msgid ""
"For invoice-based commissions, settlements will be created for "
"invoices with date up to the one set in this field."
msgstr ""
"Para las comisiones basadas en facturas, las liquidaciones se crearán para "
"facturas con fecha hasta la establecida en "
"este campo."

#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_sale_commission_make_settle__date_payment_to
msgid ""
"For payment-based commissions, settlements will be created for "
"payments with date up to the one set in this field."
msgstr ""
"Para las comisiones basadas en pagos, se crearán liquidaciones para "
"pagos con fecha hasta la establecida en este "
"campo."

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_product_product__commission_free
Expand Down Expand Up @@ -502,7 +507,7 @@ msgstr "Agrupar por"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_make_invoice__grouped
msgid "Group invoices"
msgstr ""
msgstr "Agrupar facturas"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__id
Expand Down Expand Up @@ -558,7 +563,7 @@ msgstr "Fecha de factura"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_make_settle__date_to
msgid "Invoice date up to"
msgstr ""
msgstr "Fecha de facturación hasta"

#. module: sale_commission
#: model:ir.model.fields.selection,name:sale_commission.selection__sale_commission_settlement__state__except_invoice
Expand All @@ -585,7 +590,7 @@ msgstr "Diario"
#. module: sale_commission
#: model:ir.model,name:sale_commission.model_account_move
msgid "Journal Entry"
msgstr ""
msgstr "Entrada en Diario"

#. module: sale_commission
#: model:ir.model,name:sale_commission.model_account_move_line
Expand Down Expand Up @@ -721,7 +726,7 @@ msgstr "Basada en pagos"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_make_settle__date_payment_to
msgid "Payment date up to"
msgstr ""
msgstr "Fecha de pago hasta"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_section__percent
Expand Down Expand Up @@ -849,6 +854,11 @@ msgstr "Comisiones de liquidaciones"
msgid "Settled"
msgstr "Liquidada"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr "Importe Liquidado"

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down Expand Up @@ -901,7 +911,7 @@ msgstr "Buscar liquidaciones"
#. module: sale_commission
#: model:ir.model.fields,help:sale_commission.field_account_move_line__settlement_id
msgid "Settlement that generates this invoice line"
msgstr ""
msgstr "Liquidación que genera esta línea de factura"

#. module: sale_commission
#: model:ir.actions.act_window,name:sale_commission.action_settle_commission
Expand Down Expand Up @@ -1015,7 +1025,7 @@ msgstr "Sólo puede añadir una vez cada agente."
#: code:addons/sale_commission/models/account_move.py:0
#, python-format
msgid "You can't cancel an invoice with settled lines"
msgstr ""
msgstr "No se puede cancelar una factura con líneas liquidadas"

#. module: sale_commission
#: code:addons/sale_commission/models/settlement.py:0
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/es_AR.po
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ msgstr "Comisión"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Importe de comisión"
Expand Down Expand Up @@ -845,6 +844,11 @@ msgstr "Comisiones de liquidaciones"
msgid "Settled"
msgstr "Liquidada"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ msgstr ""
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Montant de la commission"
Expand Down Expand Up @@ -847,6 +846,11 @@ msgstr "Etablir les commissionnements"
msgid "Settled"
msgstr "Commissionné"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ msgstr "Provvigione"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Importo provvigione"
Expand Down Expand Up @@ -853,6 +852,11 @@ msgstr "Regola provvigioni"
msgid "Settled"
msgstr "Regolato"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/nl_NL.po
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ msgstr "Commissie"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Commissie Bedrag"
Expand Down Expand Up @@ -849,6 +848,11 @@ msgstr "Afrekeningen maken"
msgid "Settled"
msgstr "Afgerekend"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ msgstr "Comissão"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Montante da Comissão"
Expand Down Expand Up @@ -849,6 +848,11 @@ msgstr "Executar comissões"
msgid "Settled"
msgstr "Comissionado"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ msgstr "Comissão"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Total de Comissão"
Expand Down Expand Up @@ -850,6 +849,11 @@ msgstr "Abater comissões"
msgid "Settled"
msgstr "Liquidado"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/pt_PT.po
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ msgstr "Comissão"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "Valor da Comissão"
Expand Down Expand Up @@ -846,6 +845,11 @@ msgstr "Calcular comissões"
msgid "Settled"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/sale_commission.pot
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ msgstr ""
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr ""
Expand Down Expand Up @@ -840,6 +839,11 @@ msgstr ""
msgid "Settled"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/sl.po
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ msgstr ""
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
#, fuzzy
msgid "Commission Amount"
Expand Down Expand Up @@ -851,6 +850,11 @@ msgstr ""
msgid "Settled"
msgstr ""

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
6 changes: 5 additions & 1 deletion sale_commission/i18n/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ msgstr "佣金"
#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_account_invoice_line_agent__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_line_mixin__amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
#: model:ir.model.fields,field_description:sale_commission.field_sale_order_line_agent__amount
msgid "Commission Amount"
msgstr "佣金金额"
Expand Down Expand Up @@ -847,6 +846,11 @@ msgstr "结算佣金"
msgid "Settled"
msgstr "结算"

#. module: sale_commission
#: model:ir.model.fields,field_description:sale_commission.field_sale_commission_settlement_line__settled_amount
msgid "Settled Amount"
msgstr ""

#. module: sale_commission
#: model_terms:ir.ui.view,arch_db:sale_commission.view_partner_form_agent
#: model_terms:ir.ui.view,arch_db:sale_commission.view_settlement_line_tree
Expand Down
Loading

0 comments on commit 631f24a

Please sign in to comment.