Merge pull request #394 from OCA/15.0

Syncing from upstream OCA/commission (15.0)

README.md

@@ -21,8 +21,8 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[account_commission](account_commission/) | 15.0.3.0.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
-[commission](commission/) | 15.0.3.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
+[account_commission](account_commission/) | 15.0.3.1.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
+[commission](commission/) | 15.0.3.1.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
 [commission_formula](commission_formula/) | 15.0.1.0.0 |  | Commissions computed by formulas
 [hr_commission](hr_commission/) | 15.0.1.0.1 |  | HR commissions
 [sale_commission](sale_commission/) | 15.0.2.1.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Sales commissions

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:555492991c4d7a73f70b5a165d1ca04c3e7c394d16f3b29e33f6d45e173bab0d
+   !! source digest: sha256:13ba3c13ba5785ebf446dfba2ac84a2a13f9390274c47cd21f027994806b79c7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

account_commission/__manifest__.py

@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Account commissions",
-    "version": "15.0.3.0.1",
+    "version": "15.0.3.1.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Sales Management",
     "license": "AGPL-3",

account_commission/i18n/account_commission.pot

@@ -416,6 +416,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

account_commission/i18n/es.po

@@ -419,6 +419,14 @@ msgstr "Devolver a borrador"
 msgid "Sales Invoices"
 msgstr "Facturas de Venta"
 
+#. 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

account_commission/i18n/ja.po

@@ -419,6 +419,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

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.",
     )

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:555492991c4d7a73f70b5a165d1ca04c3e7c394d16f3b29e33f6d45e173bab0d
+!! source digest: sha256:13ba3c13ba5785ebf446dfba2ac84a2a13f9390274c47cd21f027994806b79c7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.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-15-0/commission-15-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=15.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>

commission/README.rst

@@ -7,7 +7,7 @@ Commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:bd708805ef1aa38cbaeaebcf0211677a4e1ac0d43118e5eb7d8a96784d165458
+   !! source digest: sha256:a56cd342a9ab9f11d7b39cfe028dec32ed4ee02478a73da7195fe5aac015a541
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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:

commission/__manifest__.py

@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Commissions",
-    "version": "15.0.3.0.0",
+    "version": "15.0.3.1.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Invoicing",
     "license": "AGPL-3",

commission/i18n/commission.pot

@@ -362,11 +362,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
@@ -465,6 +460,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"
@@ -504,11 +504,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"
@@ -590,6 +585,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"
@@ -600,11 +600,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"

commission/i18n/es.po

@@ -372,11 +372,6 @@ msgstr "De"
 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
@@ -475,6 +470,11 @@ msgstr "Responsable"
 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"
@@ -516,11 +516,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"
@@ -602,6 +597,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"
@@ -612,11 +612,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"
@@ -839,6 +859,12 @@ 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 de Entrega SMS"
 

commission/i18n/ja.po

@@ -373,11 +373,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
@@ -476,6 +471,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"
@@ -516,11 +516,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"
@@ -602,6 +597,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"
@@ -612,11 +612,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"
@@ -833,5 +853,11 @@ msgstr "各エージェント1回のみ追加可能です。"
 msgid "or"
 msgstr "または"
 
+#~ msgid "Gross Amount"
+#~ msgstr "総額"
+
+#~ msgid "Net Amount"
+#~ msgstr "純額"
+
 #~ msgid "<strong>Agent:</strong>"
 #~ msgstr "<strong>エージェント:</strong>"