From 3d4f1cb36d9c8f5e2338238f8df3c8516e469969 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Mon, 18 Dec 2023 12:29:28 +0100 Subject: [PATCH 01/12] [IMP] account_commission: Clarify selection fields --- account_commission/models/commission.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/account_commission/models/commission.py b/account_commission/models/commission.py index 5fb18493e..5367c96db 100644 --- a/account_commission/models/commission.py +++ b/account_commission/models/commission.py @@ -10,4 +10,7 @@ class Commission(models.Model): [("open", "Invoice Based"), ("paid", "Payment Based")], string="Invoice Status", default="open", + help="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.", ) From 2d3a9462153770db8503c0ae62889ffd5fcc9c43 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Mon, 18 Dec 2023 12:30:40 +0100 Subject: [PATCH 02/12] [IMP] commission: Clarify selection fields --- commission/README.rst | 6 +++--- commission/models/commission.py | 15 ++++++++++++++- commission/readme/CONFIGURE.rst | 4 ++-- commission/static/description/index.html | 6 +++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/commission/README.rst b/commission/README.rst index b65f6c981..f9243ffc9 100644 --- a/commission/README.rst +++ b/commission/README.rst @@ -7,7 +7,7 @@ Commissions !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:ac4190f66844bdf8fefc856696f1360cc7d7db1dc1e1c18d7252b6eaea22d1e9 + !! source digest: sha256:43f3732088e9c81ab543e9794093ee647571ce1afc99e9856e0f1ec0099b55da !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -60,9 +60,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. For adding new agents: diff --git a/commission/models/commission.py b/commission/models/commission.py index 3f2ac1a2a..b39cd45dc 100644 --- a/commission/models/commission.py +++ b/commission/models/commission.py @@ -14,6 +14,11 @@ class Commission(models.Model): string="Type", required=True, default="fixed", + help="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".', ) fix_qty = fields.Float(string="Fixed percentage") section_ids = fields.One2many( @@ -23,10 +28,18 @@ class Commission(models.Model): ) active = fields.Boolean(default=True) amount_base_type = fields.Selection( - selection=[("gross_amount", "Gross Amount"), ("net_amount", "Net Amount")], + selection=[ + ("gross_amount", "Sale/Invoice Amount"), + ("net_amount", "Margin (Amount - Cost)"), + ], string="Base", required=True, default="gross_amount", + help="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.", ) settlement_type = fields.Selection(selection="_selection_settlement_type") diff --git a/commission/readme/CONFIGURE.rst b/commission/readme/CONFIGURE.rst index 61abded58..65c718417 100644 --- a/commission/readme/CONFIGURE.rst +++ b/commission/readme/CONFIGURE.rst @@ -12,9 +12,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. For adding new agents: diff --git a/commission/static/description/index.html b/commission/static/description/index.html index 1acaabc89..66e87b29d 100644 --- a/commission/static/description/index.html +++ b/commission/static/description/index.html @@ -367,7 +367,7 @@

Commissions

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:ac4190f66844bdf8fefc856696f1360cc7d7db1dc1e1c18d7252b6eaea22d1e9 +!! source digest: sha256:43f3732088e9c81ab543e9794093ee647571ce1afc99e9856e0f1ec0099b55da !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

This module provides the base functions for commission operations to enable the @@ -409,9 +409,9 @@

Configuration

  • 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.
    • From 653807d3c24f710a74af6d32554eff7296f5122f Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 18 Dec 2023 11:37:50 +0000 Subject: [PATCH 03/12] [UPD] Update account_commission.pot --- account_commission/i18n/account_commission.pot | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/account_commission/i18n/account_commission.pot b/account_commission/i18n/account_commission.pot index be7664519..ada066eed 100644 --- a/account_commission/i18n/account_commission.pot +++ b/account_commission/i18n/account_commission.pot @@ -431,6 +431,14 @@ msgstr "" msgid "Sales Invoices" msgstr "" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled From 4eef663ffccceb8ed84f6b21cd68e541c78b1e78 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 18 Dec 2023 11:37:50 +0000 Subject: [PATCH 04/12] [UPD] Update commission.pot --- commission/i18n/commission.pot | 36 ++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/commission/i18n/commission.pot b/commission/i18n/commission.pot index 095cffba9..c371747d3 100644 --- a/commission/i18n/commission.pot +++ b/commission/i18n/commission.pot @@ -372,11 +372,6 @@ msgstr "" msgid "General information" msgstr "" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -474,6 +469,11 @@ msgstr "" msgid "Manual" msgstr "" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -513,11 +513,6 @@ msgstr "" msgid "Name" msgstr "" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -591,6 +586,11 @@ msgstr "" msgid "Responsible User" msgstr "" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -601,11 +601,27 @@ msgstr "" msgid "Sections" msgstr "" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" From 4f021019c69a8dc435c9788653566029dc6976d9 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 18 Dec 2023 11:37:51 +0000 Subject: [PATCH 05/12] [UPD] Update commission_formula.pot --- commission_formula/i18n/commission_formula.pot | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/commission_formula/i18n/commission_formula.pot b/commission_formula/i18n/commission_formula.pot index fc34297e2..7b4447e0d 100644 --- a/commission_formula/i18n/commission_formula.pot +++ b/commission_formula/i18n/commission_formula.pot @@ -80,6 +80,14 @@ msgstr "" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" From 1bd319c5081ecfebb8b37e6d5e55e87570c7c6f6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 18 Dec 2023 11:40:22 +0000 Subject: [PATCH 06/12] [BOT] post-merge updates --- README.md | 4 ++-- account_commission/README.rst | 2 +- account_commission/__manifest__.py | 2 +- account_commission/static/description/index.html | 3 +-- commission/README.rst | 2 +- commission/__manifest__.py | 2 +- commission/static/description/index.html | 3 +-- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1e30ee900..483e0efb3 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ Available addons ---------------- addon | version | maintainers | summary --- | --- | --- | --- -[account_commission](account_commission/) | 16.0.2.0.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions -[commission](commission/) | 16.0.2.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions +[account_commission](account_commission/) | 16.0.2.1.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions +[commission](commission/) | 16.0.2.1.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions [commission_formula](commission_formula/) | 16.0.1.0.0 | | Commissions computed by formulas [hr_commission](hr_commission/) | 16.0.1.0.0 | | HR commissions [sale_commission](sale_commission/) | 16.0.1.0.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions diff --git a/account_commission/README.rst b/account_commission/README.rst index 1f1efd57c..8ed41ab58 100644 --- a/account_commission/README.rst +++ b/account_commission/README.rst @@ -7,7 +7,7 @@ Account commissions !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:592b04f6b2dd3c6155838ead8db480872b356ec1c5cadc3a15957e91ef417d34 + !! source digest: sha256:e48ab3c0b4ae94309c2387e3d8cc43776b259d031a5ece14c3811bb0574a7e7e !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/account_commission/__manifest__.py b/account_commission/__manifest__.py index 20b70e720..796dad806 100644 --- a/account_commission/__manifest__.py +++ b/account_commission/__manifest__.py @@ -3,7 +3,7 @@ # Copyright 2014-2022 Tecnativa - Pedro M. Baeza { "name": "Account commissions", - "version": "16.0.2.0.1", + "version": "16.0.2.1.0", "author": "Tecnativa, Odoo Community Association (OCA)", "category": "Sales Management", "license": "AGPL-3", diff --git a/account_commission/static/description/index.html b/account_commission/static/description/index.html index a5ad1cf8e..ffb1f09b3 100644 --- a/account_commission/static/description/index.html +++ b/account_commission/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,7 +366,7 @@

    Account commissions

    !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:592b04f6b2dd3c6155838ead8db480872b356ec1c5cadc3a15957e91ef417d34 +!! source digest: sha256:e48ab3c0b4ae94309c2387e3d8cc43776b259d031a5ece14c3811bb0574a7e7e !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

    Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

    This module adds the function to calculate commissions in invoices (account moves).

    diff --git a/commission/README.rst b/commission/README.rst index f9243ffc9..db354c782 100644 --- a/commission/README.rst +++ b/commission/README.rst @@ -7,7 +7,7 @@ Commissions !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:43f3732088e9c81ab543e9794093ee647571ce1afc99e9856e0f1ec0099b55da + !! source digest: sha256:ef8716bc55c65c12f67dd17b169c5bbdb4b30a9267c1e1b26db28bee7b0312a9 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/commission/__manifest__.py b/commission/__manifest__.py index f3ae36b4b..295829ec3 100644 --- a/commission/__manifest__.py +++ b/commission/__manifest__.py @@ -3,7 +3,7 @@ # Copyright 2014-2022 Tecnativa - Pedro M. Baeza { "name": "Commissions", - "version": "16.0.2.0.0", + "version": "16.0.2.1.0", "author": "Tecnativa, Odoo Community Association (OCA)", "category": "Invoicing", "license": "AGPL-3", diff --git a/commission/static/description/index.html b/commission/static/description/index.html index 66e87b29d..2a9ac23e3 100644 --- a/commission/static/description/index.html +++ b/commission/static/description/index.html @@ -1,4 +1,3 @@ - @@ -367,7 +366,7 @@

    Commissions

    !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:43f3732088e9c81ab543e9794093ee647571ce1afc99e9856e0f1ec0099b55da +!! source digest: sha256:ef8716bc55c65c12f67dd17b169c5bbdb4b30a9267c1e1b26db28bee7b0312a9 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

    Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

    This module provides the base functions for commission operations to enable the From f9417a7969d23338903b952d87a695c33bac2488 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 18 Dec 2023 11:40:38 +0000 Subject: [PATCH 07/12] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: commission-16.0/commission-16.0-commission Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-commission/ --- commission/i18n/es.po | 46 +++++++++++++++++++++++------- commission/i18n/it.po | 46 +++++++++++++++++++++++------- commission/i18n/ja.po | 46 +++++++++++++++++++++++------- commission/i18n/pt.po | 60 ++++++++++++++++++++++++++++------------ commission/i18n/pt_BR.po | 60 ++++++++++++++++++++++++++++------------ 5 files changed, 194 insertions(+), 64 deletions(-) diff --git a/commission/i18n/es.po b/commission/i18n/es.po index c877c4d38..bac020618 100644 --- a/commission/i18n/es.po +++ b/commission/i18n/es.po @@ -382,11 +382,6 @@ msgstr "Desde" msgid "General information" msgstr "Información general" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "Importe Bruto" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -484,6 +479,11 @@ msgstr "Gerente" msgid "Manual" msgstr "Manual" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -526,11 +526,6 @@ msgstr "Fecha Límite de mi Actividad" msgid "Name" msgstr "Nombre" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "Importe Neto" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -604,6 +599,11 @@ msgstr "Definición de tarifas" msgid "Responsible User" msgstr "Usuario Responsable" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -614,11 +614,31 @@ msgstr "Guardar" msgid "Sections" msgstr "Secciones" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "Seleccione la fecha hasta la que desea realizar las liquidaciones:" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" @@ -832,5 +852,11 @@ msgstr "Sólo puede añadir una vez cada agente." msgid "or" msgstr "o" +#~ msgid "Gross Amount" +#~ msgstr "Importe Bruto" + +#~ msgid "Net Amount" +#~ msgstr "Importe Neto" + #~ msgid "SMS Delivery error" #~ msgstr "Error en la entrega de sms" diff --git a/commission/i18n/it.po b/commission/i18n/it.po index 065a07d8c..298e20605 100644 --- a/commission/i18n/it.po +++ b/commission/i18n/it.po @@ -382,11 +382,6 @@ msgstr "Da" msgid "General information" msgstr "Informazioni generali" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "Importo lordo" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -487,6 +482,11 @@ msgstr "Responsabile" msgid "Manual" msgstr "Manuale" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -526,11 +526,6 @@ msgstr "Scadenza mia attività" msgid "Name" msgstr "Nome" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "Importo netto" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -606,6 +601,11 @@ msgstr "Definizione tariffe" msgid "Responsible User" msgstr "Utente responsabile" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -616,11 +616,31 @@ msgstr "Salva" msgid "Sections" msgstr "Scaglioni" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "Selezionare la data alla quale si vuole creare le liquidazioni:" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" @@ -841,5 +861,11 @@ msgstr "È possibile aggiungere ogni agente solo una volta." msgid "or" msgstr "o" +#~ msgid "Gross Amount" +#~ msgstr "Importo lordo" + +#~ msgid "Net Amount" +#~ msgstr "Importo netto" + #~ msgid "SMS Delivery error" #~ msgstr "Errore consegna SMS" diff --git a/commission/i18n/ja.po b/commission/i18n/ja.po index 290c71c4d..9179064a8 100644 --- a/commission/i18n/ja.po +++ b/commission/i18n/ja.po @@ -383,11 +383,6 @@ msgstr "開始" msgid "General information" msgstr "一般情報" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "総額" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -485,6 +480,11 @@ msgstr "マネジャー" msgid "Manual" msgstr "手動" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -525,11 +525,6 @@ msgstr "" msgid "Name" msgstr "名称" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "純額" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -603,6 +598,11 @@ msgstr "率の定義" msgid "Responsible User" msgstr "" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -613,11 +613,31 @@ msgstr "保存" msgid "Sections" msgstr "セクション" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "精算を行う日付までを選択します：" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" @@ -825,6 +845,12 @@ msgstr "各エージェント1回のみ追加可能です。" msgid "or" msgstr "または" +#~ msgid "Gross Amount" +#~ msgstr "総額" + +#~ msgid "Net Amount" +#~ msgstr "純額" + #~ msgid "Agent:" #~ msgstr "エージェント:" diff --git a/commission/i18n/pt.po b/commission/i18n/pt.po index 38f438b2e..ae55d99c9 100644 --- a/commission/i18n/pt.po +++ b/commission/i18n/pt.po @@ -39,7 +39,8 @@ msgstr "1 agente de comissões" #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "" "\n" -" No automatic settlements can be made. Install any extra\n" +" No automatic settlements can be made. Install any " +"extra\n" " commission module for having this feature enabled.\n" " " msgstr "" @@ -375,11 +376,6 @@ msgstr "De" msgid "General information" msgstr "Informação geral" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "Valor Bruto" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -477,6 +473,11 @@ msgstr "Gestor" msgid "Manual" msgstr "Manual" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -489,8 +490,7 @@ msgstr "Mensagens" #. module: commission #: model:ir.model,name:commission.model_commission_mixin -msgid "" -"Mixin model for applying to any object that wants to handle commissions" +msgid "Mixin model for applying to any object that wants to handle commissions" msgstr "Modelo mixin para aplicar a qualquer objeto que lide com comissões" #. module: commission @@ -518,11 +518,6 @@ msgstr "Prazo Limite da Minha Atividade" msgid "Name" msgstr "Nome" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "Valor Líquido" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -596,6 +591,11 @@ msgstr "Definição de taxas de comissão" msgid "Responsible User" msgstr "Utilizador Responsável" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -606,11 +606,31 @@ msgstr "Guardar" msgid "Sections" msgstr "Secções" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "Selecionar a data até qual quer atribuir comissionamentos:" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" @@ -741,11 +761,11 @@ msgstr "O limite inferior não pode ser maior do que o superior." #. module: commission #: model:ir.model.fields,help:commission.field_commission_settlement__settlement_type msgid "" -"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase" -" order'..." +"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase " +"order'..." msgstr "" -"A origem da liquidação, por exemplo, «Fatura de venda», «Ordem de venda», «" -"Ordem de compra»..." +"A origem da liquidação, por exemplo, «Fatura de venda», «Ordem de venda», " +"«Ordem de compra»..." #. module: commission #: model:ir.model.fields,help:commission.field_res_partner__commission_id @@ -823,3 +843,9 @@ msgstr "Só pode adicionar cada agente uma vez." #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "or" msgstr "ou" + +#~ msgid "Gross Amount" +#~ msgstr "Valor Bruto" + +#~ msgid "Net Amount" +#~ msgstr "Valor Líquido" diff --git a/commission/i18n/pt_BR.po b/commission/i18n/pt_BR.po index 0475b6259..256dbb90e 100644 --- a/commission/i18n/pt_BR.po +++ b/commission/i18n/pt_BR.po @@ -39,15 +39,16 @@ msgstr "1 representante comissionado" #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "" "\n" -" No automatic settlements can be made. Install any extra\n" +" No automatic settlements can be made. Install any " +"extra\n" " commission module for having this feature enabled.\n" " " msgstr "" "\n" " Nenhuma liquidação automática pode ser feita. " "Instale qualquer extra\n" -" módulo de comissão para ter esse recurso habilitado." -"\n" +" módulo de comissão para ter esse recurso " +"habilitado.\n" " " #. module: commission @@ -381,11 +382,6 @@ msgstr "De" msgid "General information" msgstr "Informações Gerais" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount -msgid "Gross Amount" -msgstr "Valor Bruto" - #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_settlement_line_search #: model_terms:ir.ui.view,arch_db:commission.view_settlement_search @@ -483,6 +479,11 @@ msgstr "Gerente" msgid "Manual" msgstr "Manual" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount +msgid "Margin (Amount - Cost)" +msgstr "" + #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__message_has_error msgid "Message Delivery error" @@ -495,8 +496,7 @@ msgstr "Mensagens" #. module: commission #: model:ir.model,name:commission.model_commission_mixin -msgid "" -"Mixin model for applying to any object that wants to handle commissions" +msgid "Mixin model for applying to any object that wants to handle commissions" msgstr "" "Modelo Mixin para aplicar a qualquer objeto que queira lidar com comissões" @@ -525,11 +525,6 @@ msgstr "Prazo da minha Atividade" msgid "Name" msgstr "Nome" -#. module: commission -#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__net_amount -msgid "Net Amount" -msgstr "Valor Líquido" - #. module: commission #: model:ir.model.fields,field_description:commission.field_commission_settlement__activity_date_deadline msgid "Next Activity Deadline" @@ -603,6 +598,11 @@ msgstr "Definição de taxas" msgid "Responsible User" msgstr "Usuário Responsável" +#. module: commission +#: model:ir.model.fields.selection,name:commission.selection__commission__amount_base_type__gross_amount +msgid "Sale/Invoice Amount" +msgstr "" + #. module: commission #: model_terms:ir.ui.view,arch_db:commission.view_commission_mixin_agent_only msgid "Save" @@ -613,11 +613,31 @@ msgstr "Salvar" msgid "Sections" msgstr "Seções" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "Select the date up to which you want to make the settlements:" msgstr "Selecione a data até a qual deseja efetuar as liquidações:" +#. module: commission +#: model:ir.model.fields,help:commission.field_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: commission #: model:ir.model.fields.selection,name:commission.selection__res_partner__settlement__semi msgid "Semi-annual" @@ -747,8 +767,8 @@ msgstr "O limite inferior não pode ser maior que o superior." #. module: commission #: model:ir.model.fields,help:commission.field_commission_settlement__settlement_type msgid "" -"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase" -" order'..." +"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase " +"order'..." msgstr "" "A origem da liquidação, por ex. 'Fatura de venda', 'Pedido de venda', 'Ordem " "de compra'..." @@ -829,3 +849,9 @@ msgstr "Você só pode adicionar uma vez cada representante." #: model_terms:ir.ui.view,arch_db:commission.view_settled_wizard msgid "or" msgstr "ou" + +#~ msgid "Gross Amount" +#~ msgstr "Valor Bruto" + +#~ msgid "Net Amount" +#~ msgstr "Valor Líquido" From b968a5fdf3c55903f2b4aef83143ab2d0253e354 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 18 Dec 2023 11:40:39 +0000 Subject: [PATCH 08/12] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: commission-16.0/commission-16.0-commission_formula Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-commission_formula/ --- commission_formula/i18n/ca.po | 10 ++++++++++ commission_formula/i18n/de.po | 10 ++++++++++ commission_formula/i18n/el_GR.po | 10 ++++++++++ commission_formula/i18n/es.po | 10 ++++++++++ commission_formula/i18n/es_AR.po | 10 ++++++++++ commission_formula/i18n/fi.po | 10 ++++++++++ commission_formula/i18n/fr.po | 10 ++++++++++ commission_formula/i18n/it.po | 10 ++++++++++ commission_formula/i18n/pt.po | 10 ++++++++++ commission_formula/i18n/pt_BR.po | 14 ++++++++++++-- commission_formula/i18n/pt_PT.po | 10 ++++++++++ commission_formula/i18n/ru.po | 10 ++++++++++ commission_formula/i18n/sl.po | 10 ++++++++++ commission_formula/i18n/tr.po | 10 ++++++++++ commission_formula/i18n/tr_TR.po | 10 ++++++++++ commission_formula/i18n/zh_CN.po | 10 ++++++++++ 16 files changed, 162 insertions(+), 2 deletions(-) diff --git a/commission_formula/i18n/ca.po b/commission_formula/i18n/ca.po index a3f01467c..d8327debb 100644 --- a/commission_formula/i18n/ca.po +++ b/commission_formula/i18n/ca.po @@ -87,6 +87,16 @@ msgstr "Quantitat" msgid "Sale Oder Line common fields" msgstr "Camps comuns de la línia de comanda de venda" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/de.po b/commission_formula/i18n/de.po index 9acd7880e..a608d0403 100644 --- a/commission_formula/i18n/de.po +++ b/commission_formula/i18n/de.po @@ -98,6 +98,16 @@ msgstr "Menge" msgid "Sale Oder Line common fields" msgstr "Allg. Felder der Verkaufsauftragsposition" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/el_GR.po b/commission_formula/i18n/el_GR.po index aedf41519..26e41a335 100644 --- a/commission_formula/i18n/el_GR.po +++ b/commission_formula/i18n/el_GR.po @@ -86,6 +86,16 @@ msgstr "" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/es.po b/commission_formula/i18n/es.po index e9ff847ff..0eaa5b4a0 100644 --- a/commission_formula/i18n/es.po +++ b/commission_formula/i18n/es.po @@ -98,6 +98,16 @@ msgstr "Cantidad" msgid "Sale Oder Line common fields" msgstr "Campos comunes de las líneas de ordenes de venta" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/es_AR.po b/commission_formula/i18n/es_AR.po index 23542dcaa..f9e43e89b 100644 --- a/commission_formula/i18n/es_AR.po +++ b/commission_formula/i18n/es_AR.po @@ -95,6 +95,16 @@ msgstr "Cantidad" msgid "Sale Oder Line common fields" msgstr "Campos comunes de la Línea de Orden de Venta" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/fi.po b/commission_formula/i18n/fi.po index c287d2f2d..b935dc5b2 100644 --- a/commission_formula/i18n/fi.po +++ b/commission_formula/i18n/fi.po @@ -85,6 +85,16 @@ msgstr "Määrä" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/fr.po b/commission_formula/i18n/fr.po index ed052aeb0..1ec03310c 100644 --- a/commission_formula/i18n/fr.po +++ b/commission_formula/i18n/fr.po @@ -85,6 +85,16 @@ msgstr "Quantité" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/it.po b/commission_formula/i18n/it.po index 4a4fb7552..df056bfbf 100644 --- a/commission_formula/i18n/it.po +++ b/commission_formula/i18n/it.po @@ -97,6 +97,16 @@ msgstr "Quantità" msgid "Sale Oder Line common fields" msgstr "Campi comuni righe ordini di vendita" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/pt.po b/commission_formula/i18n/pt.po index 81abae3f0..7707cf87b 100644 --- a/commission_formula/i18n/pt.po +++ b/commission_formula/i18n/pt.po @@ -88,6 +88,16 @@ msgstr "Quantidade" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/pt_BR.po b/commission_formula/i18n/pt_BR.po index 48f8d6767..0a0094edb 100644 --- a/commission_formula/i18n/pt_BR.po +++ b/commission_formula/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-12-14 15:14+0000\n" "PO-Revision-Date: 2023-10-30 00:46+0000\n" "Last-Translator: Adriano Prado \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/" -"23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,6 +98,16 @@ msgstr "Quantidade" msgid "Sale Oder Line common fields" msgstr "Campos comuns da Linha Order de Venda" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/pt_PT.po b/commission_formula/i18n/pt_PT.po index 94cdb1c5e..62d33f480 100644 --- a/commission_formula/i18n/pt_PT.po +++ b/commission_formula/i18n/pt_PT.po @@ -86,6 +86,16 @@ msgstr "" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/ru.po b/commission_formula/i18n/ru.po index 49b61715f..fa15fbe86 100644 --- a/commission_formula/i18n/ru.po +++ b/commission_formula/i18n/ru.po @@ -87,6 +87,16 @@ msgstr "" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/sl.po b/commission_formula/i18n/sl.po index e13f904df..5423d45a5 100644 --- a/commission_formula/i18n/sl.po +++ b/commission_formula/i18n/sl.po @@ -88,6 +88,16 @@ msgstr "Količina" msgid "Sale Oder Line common fields" msgstr "Pogosta polja postavk prodajnega naloga" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/tr.po b/commission_formula/i18n/tr.po index 4af5314f5..58b04ce50 100644 --- a/commission_formula/i18n/tr.po +++ b/commission_formula/i18n/tr.po @@ -85,6 +85,16 @@ msgstr "" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/tr_TR.po b/commission_formula/i18n/tr_TR.po index 53cee5a39..304e2838f 100644 --- a/commission_formula/i18n/tr_TR.po +++ b/commission_formula/i18n/tr_TR.po @@ -86,6 +86,16 @@ msgstr "Miktar" msgid "Sale Oder Line common fields" msgstr "" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" diff --git a/commission_formula/i18n/zh_CN.po b/commission_formula/i18n/zh_CN.po index e72c09b9a..833ca7a0b 100644 --- a/commission_formula/i18n/zh_CN.po +++ b/commission_formula/i18n/zh_CN.po @@ -99,6 +99,16 @@ msgstr "数量" msgid "Sale Oder Line common fields" msgstr "销售订单行公用字段" +#. module: commission_formula +#: model:ir.model.fields,help:commission_formula.field_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: commission_formula #: model_terms:ir.ui.view,arch_db:commission_formula.commission_form msgid "Subtotal" From cf79a91fb9ca61faa23c62f7ce33dc6887c29835 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 18 Dec 2023 11:40:39 +0000 Subject: [PATCH 09/12] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: commission-16.0/commission-16.0-account_commission Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-account_commission/ --- account_commission/i18n/es.po | 8 ++++++++ account_commission/i18n/hr.po | 8 ++++++++ account_commission/i18n/it.po | 12 ++++++++++-- account_commission/i18n/ja.po | 8 ++++++++ account_commission/i18n/pt.po | 16 ++++++++++++---- account_commission/i18n/pt_BR.po | 8 ++++++++ 6 files changed, 54 insertions(+), 6 deletions(-) diff --git a/account_commission/i18n/es.po b/account_commission/i18n/es.po index 99b82c577..0e5ba3458 100644 --- a/account_commission/i18n/es.po +++ b/account_commission/i18n/es.po @@ -434,6 +434,14 @@ msgstr "Restablecer borrador" msgid "Sales Invoices" msgstr "Facturas de Ventas" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled diff --git a/account_commission/i18n/hr.po b/account_commission/i18n/hr.po index 19457f346..6286e1d5b 100644 --- a/account_commission/i18n/hr.po +++ b/account_commission/i18n/hr.po @@ -433,6 +433,14 @@ msgstr "" msgid "Sales Invoices" msgstr "" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled diff --git a/account_commission/i18n/it.po b/account_commission/i18n/it.po index adf4d678c..b40968145 100644 --- a/account_commission/i18n/it.po +++ b/account_commission/i18n/it.po @@ -443,6 +443,14 @@ msgstr "Reimposta a bozza" msgid "Sales Invoices" msgstr "Fatture di vendita" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled @@ -515,8 +523,8 @@ msgstr "Imponibile" #. module: account_commission #: model:ir.model.fields,help:account_commission.field_commission_settlement__settlement_type msgid "" -"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase" -" order'..." +"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase " +"order'..." msgstr "" "La sorgente di questa liquidazione, e.g. 'Fatture di vendita', 'Ordini di " "vendita', 'Ordini di acquisto'..." diff --git a/account_commission/i18n/ja.po b/account_commission/i18n/ja.po index 3721daf06..46c974785 100644 --- a/account_commission/i18n/ja.po +++ b/account_commission/i18n/ja.po @@ -434,6 +434,14 @@ msgstr "ドラフトに再設定" msgid "Sales Invoices" msgstr "販売請求書" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled diff --git a/account_commission/i18n/pt.po b/account_commission/i18n/pt.po index 8760ca8d1..1a38df46d 100644 --- a/account_commission/i18n/pt.po +++ b/account_commission/i18n/pt.po @@ -434,6 +434,14 @@ msgstr "Redefinir para rascunho" msgid "Sales Invoices" msgstr "Faturas de Vendas" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled @@ -504,11 +512,11 @@ msgstr "Subtotal" #. module: account_commission #: model:ir.model.fields,help:account_commission.field_commission_settlement__settlement_type msgid "" -"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase" -" order'..." +"The source of the settlement, e.g. 'Sales invoice', 'Sales order', 'Purchase " +"order'..." msgstr "" -"A origem da liquidação, por exemplo, «Fatura de venda», «Encomenda de venda»" -", «Encomenda de compra»..." +"A origem da liquidação, por exemplo, «Fatura de venda», «Encomenda de " +"venda», «Encomenda de compra»..." #. module: account_commission #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_search diff --git a/account_commission/i18n/pt_BR.po b/account_commission/i18n/pt_BR.po index 104012db8..59d80e65a 100644 --- a/account_commission/i18n/pt_BR.po +++ b/account_commission/i18n/pt_BR.po @@ -434,6 +434,14 @@ msgstr "Voltar para Rascunho" msgid "Sales Invoices" msgstr "Faturas de Vendas" +#. module: account_commission +#: model:ir.model.fields,help:account_commission.field_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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__settled From 3fac9a128f7e9c9bb29c3a488097eecb8d249938 Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Mon, 18 Dec 2023 18:15:17 +0000 Subject: [PATCH 10/12] Translated using Weblate (Spanish) Currently translated at 100.0% (99 of 99 strings) Translation: commission-16.0/commission-16.0-account_commission Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-account_commission/es/ --- account_commission/i18n/es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/account_commission/i18n/es.po b/account_commission/i18n/es.po index 0e5ba3458..b40c4de88 100644 --- a/account_commission/i18n/es.po +++ b/account_commission/i18n/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-09-04 19:39+0000\n" +"PO-Revision-Date: 2023-12-18 20:33+0000\n" "Last-Translator: Ivorra78 \n" "Language-Team: none\n" "Language: es\n" @@ -441,6 +441,10 @@ msgid "" "* '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: account_commission #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__settled From fb638db76f31a0e491f8cfb2f3fcb1daadf5d46f Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Mon, 18 Dec 2023 18:15:39 +0000 Subject: [PATCH 11/12] Translated using Weblate (Spanish) Currently translated at 100.0% (138 of 138 strings) Translation: commission-16.0/commission-16.0-commission Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-commission/es/ --- commission/i18n/es.po | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/commission/i18n/es.po b/commission/i18n/es.po index bac020618..6d16d88a2 100644 --- a/commission/i18n/es.po +++ b/commission/i18n/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-09-04 19:39+0000\n" +"PO-Revision-Date: 2023-12-18 20:33+0000\n" "Last-Translator: Ivorra78 \n" "Language-Team: none\n" "Language: es\n" @@ -482,7 +482,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 @@ -602,7 +602,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 @@ -623,6 +623,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 @@ -638,6 +643,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 From b1f4867ea4923e1b6bea72b8bbb0d118b4646dda Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Mon, 18 Dec 2023 18:16:26 +0000 Subject: [PATCH 12/12] Translated using Weblate (Spanish) Currently translated at 100.0% (15 of 15 strings) Translation: commission-16.0/commission-16.0-commission_formula Translate-URL: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-commission_formula/es/ --- commission_formula/i18n/es.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/commission_formula/i18n/es.po b/commission_formula/i18n/es.po index 0eaa5b4a0..ac7fc89df 100644 --- a/commission_formula/i18n/es.po +++ b/commission_formula/i18n/es.po @@ -10,7 +10,7 @@ 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-10-24 14:27+0000\n" +"PO-Revision-Date: 2023-12-18 20:33+0000\n" "Last-Translator: Ivorra78 \n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "Language: es\n" @@ -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