Skip to content

Commit

Permalink
Merge pull request #414 from OCA/15.0
Browse files Browse the repository at this point in the history 
Syncing from upstream OCA/commission (15.0)
  • Loading branch information
@bt-admin
bt-admin authored Mar 21, 2024
2 parents eedb80e + 78bea9a commit 6c58af4
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 9 deletions.
10 changes: 7 additions & 3 deletions account_commission/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2024-01-04 13:52+0100\n"
"Last-Translator: luis-ron <luis.ron@sygel.es>\n"
"PO-Revision-Date: 2024-03-20 21:36+0000\n"
"Last-Translator: Ivorra78 <informatica@totmaterial.es>\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 3.0.1\n"
"X-Generator: Weblate 4.17\n"

#. module: account_commission
#: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__quantity
Expand Down Expand Up @@ -431,6 +431,10 @@ msgid ""
"* 'Payment Based': Commissions are settled when the invoice is paid (or "
"refunded)."
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 (o reembolsa) la factura."

#. module: account_commission
#: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled
Expand Down
17 changes: 14 additions & 3 deletions commission/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-10-28 20:21+0000\n"
"PO-Revision-Date: 2024-03-20 21:36+0000\n"
"Last-Translator: Ivorra78 <[email protected]>\n"
"Language-Team: none\n"
"Language: es\n"
Expand Down Expand Up @@ -473,7 +473,7 @@ msgstr "Manual"
#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount
msgid "Margin (Amount - Cost)"
msgstr ""
msgstr "Margen (Importe - Coste)"

#. module: commission
#: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error
Expand Down Expand Up @@ -600,7 +600,7 @@ msgstr "Usuario Responsable"
#. module: commission
#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount
msgid "Sale/Invoice Amount"
msgstr ""
msgstr "Importe de la Venta / Factura"

#. module: commission
#: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only
Expand All @@ -621,6 +621,11 @@ msgid ""
"* '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: commission
#: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard
Expand All @@ -636,6 +641,12 @@ msgid ""
"* '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: commission
#: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi
Expand Down
12 changes: 9 additions & 3 deletions commission_formula/i18n/es.po
View file
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: 2021-02-04 17:16+0000\n"
"PO-Revision-Date: 2023-04-05 17:23+0000\n"
"Last-Translator: luis-ron <luis.ron@sygel.es>\n"
"PO-Revision-Date: 2024-03-20 21: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.14.1\n"
"X-Generator: Weblate 4.17\n"

#. module: commission_formula
#: model_terms:ir.ui.view,arch_db:commission_formula.commission_form
Expand Down Expand Up @@ -107,6 +107,12 @@ msgid ""
"* '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: commission_formula
#: model_terms:ir.ui.view,arch_db:commission_formula.commission_form
Expand Down

0 comments on commit 6c58af4

Please sign in to comment.