Merge pull request #395 from OCA/16.0

Syncing from upstream OCA/commission (16.0)
brain-tec · Dec 19, 2023 · 3e8bcee · 3e8bcee
2 parents 616faf4 + b1f4867
commit 3e8bcee
Show file tree

Hide file tree

Showing 40 changed files with 507 additions and 102 deletions.
diff --git 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
@@ -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
@@ -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/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

diff --git 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 <[email protected]>\n"
 "Language-Team: none\n"
 "Language: es\n"
@@ -434,6 +434,18 @@ 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 ""
+"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
 #: 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git 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.",
     )
diff --git a/account_commission/static/description/index.html b/account_commission/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Account commissions</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:592b04f6b2dd3c6155838ead8db480872b356ec1c5cadc3a15957e91ef417d34
+!! source digest: sha256:e48ab3c0b4ae94309c2387e3d8cc43776b259d031a5ece14c3811bb0574a7e7e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/16.0/account_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-account_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the function to calculate commissions in invoices (account moves).</p>

diff --git 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:ef8716bc55c65c12f67dd17b169c5bbdb4b30a9267c1e1b26db28bee7b0312a9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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/__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/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"