diff --git a/README.md b/README.md
index d830179cd..ea7f2f646 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ addon | version | maintainers | summary
 [sale_commission_formula](sale_commission_formula/) | 14.0.1.0.0 |  | Sale commissions computed by formulas
 [sale_commission_geo_assign](sale_commission_geo_assign/) | 14.0.1.1.3 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Assign agents to partners according to their location
 [sale_commission_geo_assign_product_domain](sale_commission_geo_assign_product_domain/) | 14.0.1.3.2 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) | Bridge module between sale_commission_product_criteria_domain and sale_commission_geo_assign
-[sale_commission_partial_settlement](sale_commission_partial_settlement/) | 14.0.1.1.0 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sales commissions based on paid amount
+[sale_commission_partial_settlement](sale_commission_partial_settlement/) | 14.0.1.2.0 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Sales commissions based on paid amount
 [sale_commission_pricelist](sale_commission_pricelist/) | 14.0.1.0.0 |  | Sales commissions by pricelist
 [sale_commission_product_criteria](sale_commission_product_criteria/) | 14.0.1.1.6 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Advanced commissions rules
 [sale_commission_product_criteria_discount](sale_commission_product_criteria_discount/) | 14.0.1.0.3 | [![aleuffre](https://github.com/aleuffre.png?size=30px)](https://github.com/aleuffre) [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) [![renda-dev](https://github.com/renda-dev.png?size=30px)](https://github.com/renda-dev) [![PicchiSeba](https://github.com/PicchiSeba.png?size=30px)](https://github.com/PicchiSeba) | Advanced commissions rules with discount
diff --git a/sale_commission_partial_settlement/README.rst b/sale_commission_partial_settlement/README.rst
index 45f8e6cf3..414ffd1db 100644
--- a/sale_commission_partial_settlement/README.rst
+++ b/sale_commission_partial_settlement/README.rst
@@ -7,7 +7,7 @@ Sales commissions based on paid amount
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:a72af57445fd0ac9f90055f42fcb49f4b91da523ecc5b3374a331761af00933e
+   !! source digest: sha256:2f300c66a8ac18abc62bcc71d89fd4e9177442723de7bc880f7833606b95cf64
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/sale_commission_partial_settlement/__manifest__.py b/sale_commission_partial_settlement/__manifest__.py
index eb5e8a989..9e3a2db0d 100644
--- a/sale_commission_partial_settlement/__manifest__.py
+++ b/sale_commission_partial_settlement/__manifest__.py
@@ -1,7 +1,7 @@
 # Copyright 2023 Nextev
 {
     "name": "Sales commissions based on paid amount",
-    "version": "14.0.1.1.0",
+    "version": "14.0.1.2.0",
     "author": "Nextev Srl," "Ooops," "Odoo Community Association (OCA)",
     "maintainers": ["aleuffre", "renda-dev", "PicchiSeba"],
     "category": "Sales Management",
@@ -10,6 +10,8 @@
     "website": "https://github.com/OCA/commission",
     "data": [
         "security/ir.model.access.csv",
+        "views/res_config_settings_view.xml",
+        "views/sale_commission_settlement_view.xml",
         "views/sale_commission_view.xml",
     ],
     "installable": True,
diff --git a/sale_commission_partial_settlement/i18n/es.po b/sale_commission_partial_settlement/i18n/es.po
index 255234345..141b671f1 100644
--- a/sale_commission_partial_settlement/i18n/es.po
+++ b/sale_commission_partial_settlement/i18n/es.po
@@ -16,6 +16,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 4.17\n"
 
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__account_invoice_line_agent_partial_ids
 msgid "Account Invoice Line Agent Partial"
@@ -51,6 +58,16 @@ msgstr "Importe de la Comisión"
 msgid "Commission in sales"
 msgstr "Comisión en ventas"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0
 #, python-format
@@ -76,6 +93,8 @@ msgstr "Divisa"
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__display_name
@@ -92,6 +111,8 @@ msgstr "Importe total"
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__id
@@ -109,6 +130,11 @@ msgstr "Agente de Línea de Facturación"
 msgid "Invoice Line Agent Partial"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "Invoice date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__is_fully_settled
 msgid "Is Fully Settled"
@@ -118,6 +144,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement____last_update
@@ -170,6 +198,11 @@ msgstr "Comisiones parciales de agente"
 msgid "Payment amount type"
 msgstr "Tipo de importe del pago"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount
 msgid "Settled Amount"
@@ -180,6 +213,28 @@ msgstr "Importe Liquidado"
 msgid "Settlement"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__show_settlement_dates
+msgid "Show invoice and payment dates in settlements"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid "Shows the dates used to create the settlement itself"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "The invoice date used to create the settlement"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "The payment date used to create the settlement"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle
 msgid "Wizard for settling commissions in invoices"
diff --git a/sale_commission_partial_settlement/i18n/it.po b/sale_commission_partial_settlement/i18n/it.po
index 3e05e2e51..a0ec246d8 100644
--- a/sale_commission_partial_settlement/i18n/it.po
+++ b/sale_commission_partial_settlement/i18n/it.po
@@ -16,6 +16,13 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 5.6.2\n"
 
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__account_invoice_line_agent_partial_ids
 msgid "Account Invoice Line Agent Partial"
@@ -51,6 +58,16 @@ msgstr "Importo provvigione"
 msgid "Commission in sales"
 msgstr "Provvigione nelle vendite"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0
 #, python-format
@@ -76,6 +93,8 @@ msgstr "Valuta"
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__display_name
@@ -92,6 +111,8 @@ msgstr "Importo totale"
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__id
@@ -109,6 +130,11 @@ msgstr "Riga fattura agente"
 msgid "Invoice Line Agent Partial"
 msgstr "Riga fattura parziale agente"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "Invoice date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__is_fully_settled
 msgid "Is Fully Settled"
@@ -118,6 +144,8 @@ msgstr "E' totalmente liquidata"
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement____last_update
@@ -170,6 +198,11 @@ msgstr "Provvigioni parziali agente"
 msgid "Payment amount type"
 msgstr "Tipo importo pagamento"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount
 msgid "Settled Amount"
@@ -180,6 +213,28 @@ msgstr "Importo regolato"
 msgid "Settlement"
 msgstr "Liquidazione"
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__show_settlement_dates
+msgid "Show invoice and payment dates in settlements"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid "Shows the dates used to create the settlement itself"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "The invoice date used to create the settlement"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "The payment date used to create the settlement"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle
 msgid "Wizard for settling commissions in invoices"
diff --git a/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot b/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot
index 1807815fc..54813319a 100644
--- a/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot
+++ b/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot
@@ -13,6 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__account_invoice_line_agent_partial_ids
 msgid "Account Invoice Line Agent Partial"
@@ -48,6 +55,16 @@ msgstr ""
 msgid "Commission in sales"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model,name:sale_commission_partial_settlement.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0
 #, python-format
@@ -73,6 +90,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__display_name
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__display_name
@@ -89,6 +108,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__id
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__id
@@ -106,6 +127,11 @@ msgstr ""
 msgid "Invoice Line Agent Partial"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "Invoice date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__is_fully_settled
 msgid "Is Fully Settled"
@@ -115,6 +141,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company____last_update
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement____last_update
@@ -167,6 +195,11 @@ msgstr ""
 msgid "Payment amount type"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "Payment date up to"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount
 msgid "Settled Amount"
@@ -177,6 +210,28 @@ msgstr ""
 msgid "Settlement"
 msgstr ""
 
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_company__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_res_config_settings__commission_show_settlement_dates
+#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement__show_settlement_dates
+msgid "Show invoice and payment dates in settlements"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model_terms:ir.ui.view,arch_db:sale_commission_partial_settlement.res_config_settings_view_form
+msgid "Shows the dates used to create the settlement itself"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_to
+msgid "The invoice date used to create the settlement"
+msgstr ""
+
+#. module: sale_commission_partial_settlement
+#: model:ir.model.fields,help:sale_commission_partial_settlement.field_sale_commission_settlement__settlement_date_payment_to
+msgid "The payment date used to create the settlement"
+msgstr ""
+
 #. module: sale_commission_partial_settlement
 #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle
 msgid "Wizard for settling commissions in invoices"
diff --git a/sale_commission_partial_settlement/models/__init__.py b/sale_commission_partial_settlement/models/__init__.py
index 61873e96a..da2661b51 100644
--- a/sale_commission_partial_settlement/models/__init__.py
+++ b/sale_commission_partial_settlement/models/__init__.py
@@ -1,6 +1,8 @@
 from . import account_invoice_line_agent
 from . import account_invoice_line_agent_partial
 from . import account_partial_reconcile
+from . import res_company
+from . import res_config_settings
 from . import sale_commission
 from . import sale_commission_settlement
 from . import sale_commission_settlement_line
diff --git a/sale_commission_partial_settlement/models/res_company.py b/sale_commission_partial_settlement/models/res_company.py
new file mode 100644
index 000000000..ad0c7e5a5
--- /dev/null
+++ b/sale_commission_partial_settlement/models/res_company.py
@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    commission_show_settlement_dates = fields.Boolean(
+        "Show invoice and payment dates in settlements",
+    )
diff --git a/sale_commission_partial_settlement/models/res_config_settings.py b/sale_commission_partial_settlement/models/res_config_settings.py
new file mode 100644
index 000000000..74f38e47a
--- /dev/null
+++ b/sale_commission_partial_settlement/models/res_config_settings.py
@@ -0,0 +1,10 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    commission_show_settlement_dates = fields.Boolean(
+        related="company_id.commission_show_settlement_dates",
+        readonly=False,
+    )
diff --git a/sale_commission_partial_settlement/models/sale_commission_settlement.py b/sale_commission_partial_settlement/models/sale_commission_settlement.py
index 1aa58e699..0f5225704 100644
--- a/sale_commission_partial_settlement/models/sale_commission_settlement.py
+++ b/sale_commission_partial_settlement/models/sale_commission_settlement.py
@@ -1,9 +1,23 @@
-from odoo import models
+from odoo import fields, models
 
 
-class Settlement(models.Model):
+class SaleCommissionSettlement(models.Model):
     _inherit = "sale.commission.settlement"
 
+    show_settlement_dates = fields.Boolean(
+        related="company_id.commission_show_settlement_dates"
+    )
+    settlement_date_to = fields.Date(
+        readonly=True,
+        string="Invoice date up to",
+        help="The invoice date used to create the settlement",
+    )
+    settlement_date_payment_to = fields.Date(
+        readonly=True,
+        string="Payment date up to",
+        help="The payment date used to create the settlement",
+    )
+
     def unlink(self):
         self.mapped("line_ids.agent_line_partial_ids").unlink()
         return super().unlink()
diff --git a/sale_commission_partial_settlement/static/description/index.html b/sale_commission_partial_settlement/static/description/index.html
index e742040f8..7d6f4921f 100644
--- a/sale_commission_partial_settlement/static/description/index.html
+++ b/sale_commission_partial_settlement/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Sales commissions based on paid amount</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:a72af57445fd0ac9f90055f42fcb49f4b91da523ecc5b3374a331761af00933e
+!! source digest: sha256:2f300c66a8ac18abc62bcc71d89fd4e9177442723de7bc880f7833606b95cf64
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/14.0/sale_commission_partial_settlement"><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-14-0/commission-14-0-sale_commission_partial_settlement"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to settle commissions based on paid amount.</p>
diff --git a/sale_commission_partial_settlement/views/res_config_settings_view.xml b/sale_commission_partial_settlement/views/res_config_settings_view.xml
new file mode 100644
index 000000000..ad872ddcf
--- /dev/null
+++ b/sale_commission_partial_settlement/views/res_config_settings_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.sale.management</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="sale_management.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//div[@name='quotation_order_setting_container']"
+                position="inside"
+            >
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    id="commission_show_settlement_dates"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="commission_show_settlement_dates" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="commission_show_settlement_dates" />
+                        <span
+                            class="fa fa-lg fa-building-o"
+                            title="Values set here are company-specific."
+                            groups="base.group_multi_company"
+                        />
+                        <div class="text-muted">
+                            Shows the dates used to create the settlement itself
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/sale_commission_partial_settlement/views/sale_commission_settlement_view.xml b/sale_commission_partial_settlement/views/sale_commission_settlement_view.xml
new file mode 100644
index 000000000..d7272f36a
--- /dev/null
+++ b/sale_commission_partial_settlement/views/sale_commission_settlement_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_settlement_form" model="ir.ui.view">
+        <field name="name">Settlements</field>
+        <field name="model">sale.commission.settlement</field>
+        <field name="inherit_id" ref="sale_commission.view_settlement_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[field[@name='date_to']]" position="after">
+                <group attrs="{'invisible': [('show_settlement_dates', '=', False)]}">
+                    <field name="show_settlement_dates" invisible="1" />
+                    <field name="settlement_date_to" />
+                    <field name="settlement_date_payment_to" />
+                    <field name="create_date" />
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/sale_commission_partial_settlement/wizard/wizard_settle.py b/sale_commission_partial_settlement/wizard/wizard_settle.py
index aad31f6ad..f95f4587e 100644
--- a/sale_commission_partial_settlement/wizard/wizard_settle.py
+++ b/sale_commission_partial_settlement/wizard/wizard_settle.py
@@ -10,6 +10,16 @@
 class SaleCommissionMakeSettle(models.TransientModel):
     _inherit = "sale.commission.make.settle"
 
+    def _prepare_settlement_vals(self, agent, company, sett_from, sett_to):
+        vals = super()._prepare_settlement_vals(agent, company, sett_from, sett_to)
+        vals.update(
+            {
+                "settlement_date_to": self.date_to,
+                "settlement_date_payment_to": self.date_payment_to,
+            }
+        )
+        return vals
+
     def action_settle(self):
         partial_res = self.action_settle_partial()
         res = super().action_settle()