Merge pull request #302 from OCA/16.0

Syncing from upstream OCA/commission (16.0)
brain-tec · Aug 19, 2023 · aa177df · aa177df
2 parents 2d5015d + 80b23d8
commit aa177df
Show file tree

Hide file tree

Showing 15 changed files with 537 additions and 112 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.1.1.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
-[commission](commission/) | 16.0.1.1.1 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
+[account_commission](account_commission/) | 16.0.1.2.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Account commissions
+[commission](commission/) | 16.0.1.2.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Commissions
 [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/__manifest__.py b/account_commission/__manifest__.py
@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Account commissions",
-    "version": "16.0.1.1.1",
+    "version": "16.0.1.2.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
@@ -23,6 +23,11 @@ msgstr ""
 msgid "(keep empty for invoicing all the pending settlements)"
 msgstr ""
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "<strong>Settlement invoice:</strong>"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
@@ -227,7 +232,6 @@ msgstr ""
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice"
 msgstr ""
 
@@ -269,7 +273,6 @@ msgstr ""
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_date
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice date"
 msgstr ""
 
@@ -279,7 +282,7 @@ msgid "Invoice exception"
 msgstr ""
 
 #. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice line"
 msgstr ""
 
@@ -402,6 +405,11 @@ msgstr ""
 msgid "Product for invoicing"
 msgstr ""
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Quantity"
+msgstr ""
+
 #. module: account_commission
 #: model_terms:ir.ui.view,arch_db:account_commission.view_move_form
 msgid "Regenerate agents"

diff --git a/account_commission/i18n/es.po b/account_commission/i18n/es.po
@@ -26,6 +26,11 @@ msgstr "# de cantd"
 msgid "(keep empty for invoicing all the pending settlements)"
 msgstr "(mantener vacío para facturar todas las liquidaciones pendientes)"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "<strong>Settlement invoice:</strong>"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
@@ -230,7 +235,6 @@ msgstr "ID (identificación)"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice"
 msgstr "Factura"
 
@@ -272,7 +276,6 @@ msgstr "Estado de Facturación"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_date
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice date"
 msgstr "Fecha de facturación"
 
@@ -282,7 +285,7 @@ msgid "Invoice exception"
 msgstr "Excepción de factura"
 
 #. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice line"
 msgstr "Línea de factura"
 
@@ -405,6 +408,11 @@ msgstr "Producto"
 msgid "Product for invoicing"
 msgstr "Producto para facturar"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Quantity"
+msgstr ""
+
 #. module: account_commission
 #: model_terms:ir.ui.view,arch_db:account_commission.view_move_form
 msgid "Regenerate agents"
@@ -491,8 +499,8 @@ msgstr "Sub total"
 #. 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 ""
 "El origen de la liquidación, por ejemplo, 'Factura de venta','Pedido de "
 "venta', 'Pedido de compra'..."

diff --git a/account_commission/i18n/hr.po b/account_commission/i18n/hr.po
@@ -25,6 +25,11 @@ msgstr ""
 msgid "(keep empty for invoicing all the pending settlements)"
 msgstr ""
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "<strong>Settlement invoice:</strong>"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
@@ -229,7 +234,6 @@ msgstr ""
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice"
 msgstr ""
 
@@ -271,7 +275,6 @@ msgstr ""
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_date
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice date"
 msgstr ""
 
@@ -281,7 +284,7 @@ msgid "Invoice exception"
 msgstr ""
 
 #. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice line"
 msgstr ""
 
@@ -404,6 +407,11 @@ msgstr ""
 msgid "Product for invoicing"
 msgstr ""
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Quantity"
+msgstr ""
+
 #. module: account_commission
 #: model_terms:ir.ui.view,arch_db:account_commission.view_move_form
 msgid "Regenerate agents"
@@ -490,8 +498,8 @@ msgstr ""
 #. 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 ""
 
 #. module: account_commission

diff --git a/account_commission/i18n/ja.po b/account_commission/i18n/ja.po
@@ -26,6 +26,11 @@ msgstr "# 数量"
 msgid "(keep empty for invoicing all the pending settlements)"
 msgstr "(全ての未清算分の請求書を作成するためには空欄にしてください）"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "<strong>Settlement invoice:</strong>"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
@@ -230,7 +235,6 @@ msgstr "ID"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice"
 msgstr "請求書"
 
@@ -272,7 +276,6 @@ msgstr "請求書ステータス"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_date
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice date"
 msgstr "請求日"
 
@@ -282,7 +285,7 @@ msgid "Invoice exception"
 msgstr "請求書例外"
 
 #. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice line"
 msgstr "請求書明細"
 
@@ -405,6 +408,11 @@ msgstr "プロダクト"
 msgid "Product for invoicing"
 msgstr "請求用プロダクト"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Quantity"
+msgstr ""
+
 #. module: account_commission
 #: model_terms:ir.ui.view,arch_db:account_commission.view_move_form
 msgid "Regenerate agents"

diff --git a/account_commission/i18n/pt_BR.po b/account_commission/i18n/pt_BR.po
@@ -26,6 +26,11 @@ msgstr "# de Qtd"
 msgid "(keep empty for invoicing all the pending settlements)"
 msgstr "(manter em branco para faturar todas as liquidações pendentes)"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "<strong>Settlement invoice:</strong>"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__agent_id
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__agent_id
@@ -230,7 +235,6 @@ msgstr "ID"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -272,7 +276,6 @@ msgstr "Situação Fatura"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_date
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
 msgid "Invoice date"
 msgstr "Data Fatura"
 
@@ -282,7 +285,7 @@ msgid "Invoice exception"
 msgstr "Exceção Fatura"
 
 #. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice line"
 msgstr "Linha Fatura"
 
@@ -405,6 +408,11 @@ msgstr "Produto"
 msgid "Product for invoicing"
 msgstr "Produto par Faturar"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Quantity"
+msgstr ""
+
 #. module: account_commission
 #: model_terms:ir.ui.view,arch_db:account_commission.view_move_form
 msgid "Regenerate agents"
@@ -491,8 +499,8 @@ msgstr ""
 #. 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 ""
 
 #. module: account_commission

diff --git a/account_commission/views/report_settlement_templates.xml b/account_commission/views/report_settlement_templates.xml
@@ -1,21 +1,36 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <template id="report_settlement" inherit_id="commission.report_settlement">
-        <xpath expr="//th" position="before">
-            <th>Invoice date</th>
-            <th>Invoice</th>
-            <th>Invoice line</th>
+    <template
+        id="report_settlement_document"
+        inherit_id="commission.report_settlement_document"
+    >
+        <xpath expr="//div[@id='informations']" position="inside">
+            <div class="col-auto col-3 mw-100 mb-2" t-if="o.invoice_id">
+                <strong>Settlement invoice:</strong>
+                <p t-field="o.invoice_id" />
+            </div>
         </xpath>
-        <xpath expr="//table/tbody/tr/td" position="before">
-            <td>
-                <span t-field="l.date" />
-            </td>
-            <td>
-                <span t-field="l.settlement_id.invoice_id" />
-            </td>
-            <td>
-                <span t-field="l.invoice_line_id" />
-            </td>
+        <xpath expr="//th" position="after">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <th class="text-start">Invoice line</th>
+                <th class="text-start">Quantity</th>
+            </t>
+        </xpath>
+        <xpath expr="//table/tbody/tr/td" position="after">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <td>
+                    <span t-field="l.invoice_line_id" />
+                </td>
+                <td>
+                    <span t-field="l.invoice_line_id.quantity" />
+                </td>
+            </t>
+        </xpath>
+        <xpath expr="//table/tfoot/tr/td" position="before">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <td />
+                <td />
+            </t>
         </xpath>
     </template>
 </odoo>
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.1.1.1",
+    "version": "16.0.1.2.0",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Invoicing",
     "license": "AGPL-3",