From 4b0441281d812692b0f9e9704a7332f9f5064b34 Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Wed, 16 Oct 2024 18:07:59 +0200 Subject: [PATCH 1/2] [FIX] sale_commission_product_criteria: remove empty file --- sale_commission_product_criteria/models/__init__.py | 1 - sale_commission_product_criteria/models/settlement.py | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 sale_commission_product_criteria/models/settlement.py diff --git a/sale_commission_product_criteria/models/__init__.py b/sale_commission_product_criteria/models/__init__.py index b14568ddb..d4414b3f5 100644 --- a/sale_commission_product_criteria/models/__init__.py +++ b/sale_commission_product_criteria/models/__init__.py @@ -2,4 +2,3 @@ from . import commission from . import sale from . import account_move -from . import settlement diff --git a/sale_commission_product_criteria/models/settlement.py b/sale_commission_product_criteria/models/settlement.py deleted file mode 100644 index ea1688f6b..000000000 --- a/sale_commission_product_criteria/models/settlement.py +++ /dev/null @@ -1,7 +0,0 @@ -# © 2023 ooops404 -# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html -from odoo import models - - -class SettlementLine(models.Model): - _inherit = "sale.commission.settlement.line" From 553e9b06eb9192ce143e319dc54db8eb855f20d0 Mon Sep 17 00:00:00 2001 From: Alessandro Uffreduzzi Date: Wed, 16 Oct 2024 18:08:41 +0200 Subject: [PATCH 2/2] [IMP] sale_commission_product_criteria: print comm value on report --- sale_commission_product_criteria/README.rst | 17 +++++++--- .../__manifest__.py | 3 +- .../reports/report_settlement_template.xml | 33 +++++++++++++++++++ .../static/description/index.html | 4 +-- 4 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 sale_commission_product_criteria/reports/report_settlement_template.xml diff --git a/sale_commission_product_criteria/README.rst b/sale_commission_product_criteria/README.rst index 184b2244a..acd93a373 100644 --- a/sale_commission_product_criteria/README.rst +++ b/sale_commission_product_criteria/README.rst @@ -103,10 +103,19 @@ promote its widespread use. .. |maintainer-ilyasProgrammer| image:: https://github.com/ilyasProgrammer.png?size=40px :target: https://github.com/ilyasProgrammer :alt: ilyasProgrammer - -Current `maintainer `__: - -|maintainer-ilyasProgrammer| +.. |maintainer-aleuffre| image:: https://github.com/aleuffre.png?size=40px + :target: https://github.com/aleuffre + :alt: aleuffre +.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px + :target: https://github.com/renda-dev + :alt: renda-dev +.. |maintainer-PicchiSeba| image:: https://github.com/PicchiSeba.png?size=40px + :target: https://github.com/PicchiSeba + :alt: PicchiSeba + +Current `maintainers `__: + +|maintainer-ilyasProgrammer| |maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba| This module is part of the `OCA/commission `_ project on GitHub. diff --git a/sale_commission_product_criteria/__manifest__.py b/sale_commission_product_criteria/__manifest__.py index 6e872260a..ac8b68e4c 100644 --- a/sale_commission_product_criteria/__manifest__.py +++ b/sale_commission_product_criteria/__manifest__.py @@ -5,12 +5,13 @@ "summary": "Advanced commissions rules", "version": "14.0.1.1.5", "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", - "maintainers": ["ilyasProgrammer"], + "maintainers": ["ilyasProgrammer", "aleuffre", "renda-dev", "PicchiSeba"], "website": "https://github.com/OCA/commission", "category": "Sales Management", "license": "AGPL-3", "depends": ["sale_commission", "web_domain_field"], "data": [ + "reports/report_settlement_template.xml", "views/views.xml", "security/ir.model.access.csv", ], diff --git a/sale_commission_product_criteria/reports/report_settlement_template.xml b/sale_commission_product_criteria/reports/report_settlement_template.xml new file mode 100644 index 000000000..36ab5d325 --- /dev/null +++ b/sale_commission_product_criteria/reports/report_settlement_template.xml @@ -0,0 +1,33 @@ + + + + diff --git a/sale_commission_product_criteria/static/description/index.html b/sale_commission_product_criteria/static/description/index.html index e587abc0a..75fca42aa 100644 --- a/sale_commission_product_criteria/static/description/index.html +++ b/sale_commission_product_criteria/static/description/index.html @@ -439,8 +439,8 @@

Maintainers

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.

-

Current maintainer:

-

ilyasProgrammer

+

Current maintainers:

+

ilyasProgrammer aleuffre renda-dev PicchiSeba

This module is part of the OCA/commission project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.