!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:56e2ff22ce208b39c4c616cfc811d55fdac9058be14623cbd491f39069ab7d3a
+!! source digest: sha256:3414620188fba8c73e613851e9efb7877f0668c631edbb6f9828f9a52f8f54c5
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module allows to define sales agents with their commissions and assign
diff --git a/sale_commission/views/report_settlement_templates.xml b/sale_commission/views/report_settlement_templates.xml
index fde0871e2..083b40e29 100644
--- a/sale_commission/views/report_settlement_templates.xml
+++ b/sale_commission/views/report_settlement_templates.xml
@@ -2,9 +2,22 @@
+
+
+
+ Global commission amount:
+
+
+
Agent:
@@ -19,7 +32,7 @@
-
+
Invoice date
@@ -51,20 +64,27 @@
-
-
-
- Total
-
-
-
-
-
-
+
+
+
+
+
+
Total ( - )
+
+
+
+
+
+
+
+
diff --git a/sale_commission_queued/README.rst b/sale_commission_queued/README.rst
index 9adba5eaf..3b17011a3 100644
--- a/sale_commission_queued/README.rst
+++ b/sale_commission_queued/README.rst
@@ -7,7 +7,7 @@ Sales commissions queued
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:72767eb7d9f73ba107b877f1106ee7547aa4cc70b1e25c526c1cd579db64987d
+ !! source digest: sha256:030e1b5f9aa4a3076b0ccae1d078897a3503f7c30c50676aa1c70c65079f5175
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -40,6 +40,8 @@ Usage
In Create commission invoices wizard, use button "enqueue invoices creation" to use the queue feature.
+In Commission settle wizard, use button 'Make settlements in Queue' button to use the queue feature.
+
Bug Tracker
===========
@@ -59,6 +61,11 @@ Authors
* Ilyas
* Ooops404
+Contributors
+~~~~~~~~~~~~
+
+* Eduard Brahas
+
Maintainers
~~~~~~~~~~~
@@ -72,13 +79,16 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
-.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px
- :target: https://github.com/pedrobaeza
- :alt: pedrobaeza
+.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px
+ :target: https://github.com/renda-dev
+ :alt: renda-dev
+.. |maintainer-aleuffre| image:: https://github.com/aleuffre.png?size=40px
+ :target: https://github.com/aleuffre
+ :alt: aleuffre
-Current `maintainer `__:
+Current `maintainers `__:
-|maintainer-pedrobaeza|
+|maintainer-renda-dev| |maintainer-aleuffre|
This module is part of the `OCA/commission `_ project on GitHub.
diff --git a/sale_commission_queued/__manifest__.py b/sale_commission_queued/__manifest__.py
index 8447a169d..0e86dd541 100644
--- a/sale_commission_queued/__manifest__.py
+++ b/sale_commission_queued/__manifest__.py
@@ -1,12 +1,12 @@
{
"name": "Sales commissions queued",
- "version": "14.0.1.0.0",
+ "version": "14.0.1.1.0",
"author": "Ilyas, Ooops404," "Odoo Community Association (OCA)",
"category": "Sales Management",
"license": "AGPL-3",
"depends": ["sale_commission", "queue_job"],
"website": "https://github.com/OCA/commission",
- "maintainers": ["pedrobaeza"],
+ "maintainers": ["renda-dev", "aleuffre"],
"data": [
"wizard/wizard_invoice.xml",
],
diff --git a/sale_commission_queued/i18n/es.po b/sale_commission_queued/i18n/es.po
index 0d92879cc..9c0f18503 100644
--- a/sale_commission_queued/i18n/es.po
+++ b/sale_commission_queued/i18n/es.po
@@ -18,6 +18,7 @@ msgstr ""
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__display_name
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__display_name
msgid "Display Name"
msgstr "Mostrar Nombre"
@@ -28,11 +29,13 @@ msgstr "Poner en cola la Creación de Facturas"
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__id
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__id
msgid "ID"
msgstr "ID"
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice____last_update
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle____last_update
msgid "Last Modified on"
msgstr "Última Modificación el"
@@ -40,3 +43,8 @@ msgstr "Última Modificación el"
#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_invoice
msgid "Wizard for making an invoice from a settlement"
msgstr "Asistente para hacer una factura a partir de una liquidación"
+
+#. module: sale_commission_queued
+#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_settle
+msgid "Wizard for settling commissions in invoices"
+msgstr ""
diff --git a/sale_commission_queued/i18n/it.po b/sale_commission_queued/i18n/it.po
index 5346c0bf3..d112a92d8 100644
--- a/sale_commission_queued/i18n/it.po
+++ b/sale_commission_queued/i18n/it.po
@@ -18,6 +18,7 @@ msgstr ""
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__display_name
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__display_name
msgid "Display Name"
msgstr "Nome visualizzato"
@@ -28,11 +29,13 @@ msgstr "Accoda creazione fatture"
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__id
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__id
msgid "ID"
msgstr "ID"
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice____last_update
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle____last_update
msgid "Last Modified on"
msgstr "Ultima modifica il"
@@ -40,3 +43,8 @@ msgstr "Ultima modifica il"
#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_invoice
msgid "Wizard for making an invoice from a settlement"
msgstr "Procedura per preparare una fattura da una provvigione"
+
+#. module: sale_commission_queued
+#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_settle
+msgid "Wizard for settling commissions in invoices"
+msgstr ""
diff --git a/sale_commission_queued/i18n/sale_commission_queued.pot b/sale_commission_queued/i18n/sale_commission_queued.pot
index 205f1077c..89917c56e 100644
--- a/sale_commission_queued/i18n/sale_commission_queued.pot
+++ b/sale_commission_queued/i18n/sale_commission_queued.pot
@@ -15,6 +15,7 @@ msgstr ""
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__display_name
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__display_name
msgid "Display Name"
msgstr ""
@@ -25,11 +26,13 @@ msgstr ""
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice__id
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle__id
msgid "ID"
msgstr ""
#. module: sale_commission_queued
#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_invoice____last_update
+#: model:ir.model.fields,field_description:sale_commission_queued.field_sale_commission_make_settle____last_update
msgid "Last Modified on"
msgstr ""
@@ -37,3 +40,8 @@ msgstr ""
#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_invoice
msgid "Wizard for making an invoice from a settlement"
msgstr ""
+
+#. module: sale_commission_queued
+#: model:ir.model,name:sale_commission_queued.model_sale_commission_make_settle
+msgid "Wizard for settling commissions in invoices"
+msgstr ""
diff --git a/sale_commission_queued/readme/CONTRIBUTORS.rst b/sale_commission_queued/readme/CONTRIBUTORS.rst
index e69de29bb..537528b3c 100644
--- a/sale_commission_queued/readme/CONTRIBUTORS.rst
+++ b/sale_commission_queued/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Eduard Brahas
diff --git a/sale_commission_queued/readme/USAGE.rst b/sale_commission_queued/readme/USAGE.rst
index d99f31811..85163df67 100644
--- a/sale_commission_queued/readme/USAGE.rst
+++ b/sale_commission_queued/readme/USAGE.rst
@@ -1 +1,3 @@
In Create commission invoices wizard, use button "enqueue invoices creation" to use the queue feature.
+
+In Commission settle wizard, use button 'Make settlements in Queue' button to use the queue feature.
diff --git a/sale_commission_queued/static/description/index.html b/sale_commission_queued/static/description/index.html
index 03314b772..caa56afde 100644
--- a/sale_commission_queued/static/description/index.html
+++ b/sale_commission_queued/static/description/index.html
@@ -1,4 +1,3 @@
-
@@ -9,10 +8,11 @@
/*
:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
@@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
span.pre {
white-space: pre }
-span.problematic {
+span.problematic, pre.problematic {
color: red }
span.section-subtitle {
@@ -367,7 +367,7 @@
Sales commissions queued
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:72767eb7d9f73ba107b877f1106ee7547aa4cc70b1e25c526c1cd579db64987d
+!! source digest: sha256:030e1b5f9aa4a3076b0ccae1d078897a3503f7c30c50676aa1c70c65079f5175
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module allows to use queue for creation of agents settlement invoices.
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
+
+
