Merge pull request #500 from OCA/14.0

Syncing from upstream OCA/commission (14.0)
brain-tec · Nov 20, 2024 · c61087b · c61087b
2 parents c142f81 + 8a20346
commit c61087b
Show file tree

Hide file tree

Showing 14 changed files with 270 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"