Merge pull request #515 from OCA/14.0

Syncing from upstream OCA/commission (14.0)
brain-tec · Jan 29, 2025 · 07c0ff6 · 07c0ff6
2 parents 76d3af1 + 2de8c47
commit 07c0ff6
Show file tree

Hide file tree

Showing 23 changed files with 1,184 additions and 201 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,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.2.1 | [![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.2.0.1 | [![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:9596c13efc487356fc34bac45ca9c0138c0ec5127e6e12f5427aea0a1630db80
+   !! source digest: sha256:5a28fe32a76a6595689804a4dbbe29bb0256a29216618dc9d53c419256078a6c
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -44,6 +44,18 @@ Usage
 
 Behavior for commission settlements will be as per module description.
 
+Known issues / Roadmap
+======================
+
+Due to the data structure of the module before version 14.0.2.0.0,
+there is no way to link partial settlements created before this version
+of the module to a specific payment or account move, and therefore to the
+new data structure existing after the changes.
+
+A "best effort" migration of previous data could be developed to
+ensure a smoother transition between versions.
+
+
 Bug Tracker
 ===========
 

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.2.1",
+    "version": "14.0.2.0.1",
     "author": "Nextev Srl," "Ooops," "Odoo Community Association (OCA)",
     "maintainers": ["aleuffre", "renda-dev", "PicchiSeba"],
     "category": "Sales Management",
@@ -10,7 +10,10 @@
     "website": "https://github.com/OCA/commission",
     "data": [
         "security/ir.model.access.csv",
+        "views/account_invoice_line_agent_views.xml",
+        "views/account_invoice_line_agent_partial_views.xml",
         "views/res_config_settings_view.xml",
+        "views/sale_commission_settlement_line_partial_views.xml",
         "views/sale_commission_settlement_view.xml",
         "views/sale_commission_view.xml",
     ],