[FIX] commission module installable

[IMP] Add default agent boolean when creating an agent from the commission profile view
[FIX] chatter in commission result view + add action name for all commission related new actions
2025-11-13 15:46:58 +01:00 · 2025-11-13 11:29:33 +01:00 · 2025-11-13 11:29:24 +01:00 · 2025-11-13 11:29:20 +01:00 · 2025-11-13 11:29:13 +01:00 · 2025-11-13 11:28:57 +01:00
42 changed files with 643 additions and 474 deletions
--- a/commission_simple/init.py
+++ b/commission_simple/init.py
@@ -1,2 +1,3 @@
 from . import models
 from . import wizards
+from . import reports
--- a/commission_simple/manifest.py
+++ b/commission_simple/manifest.py
@@ -4,7 +4,7 @@

 {
    'name': 'Commission Simple',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
    'category': 'Sales',
    'license': 'AGPL-3',
    'summary': 'Compute commissions for salesman',
@@ -30,19 +30,18 @@ This module has been written by Alexis de Lattre from Akretion
    'depends': [
        'account',
        'date_range',
-        # this uses some related fields on account.move.line
-#        'account_usability_akretion',
+        'report_xlsx',
        ],
    'data': [
        'security/ir.model.access.csv',
        'security/rule.xml',
+        'reports/report.xml',
        'data/decimal_precision.xml',
        'views/commission_profile.xml',
        'views/commission_rule.xml',
        'views/commission_result.xml',
        'views/account_move_line.xml',
-        'views/res_config_settings.xml',
        'wizards/commission_compute_view.xml',
        ],
-    'installable': False,
+    'installable': True,
 }
--- a/commission_simple/i18n/fr.po
+++ b/commission_simple/i18n/fr.po
@@ -6,15 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-29 23:38+0000\n"
-"PO-Revision-Date: 2024-11-29 23:38+0000\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2025-09-02 11:22+0000\n"
+"PO-Revision-Date: 2025-09-02 11:23+0000\n"
+"Last-Translator: Alexis de Lattre <alexis.delattre@akretion.com>\n"
 "Language-Team: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"

+#. module: commission_simple
+#: model:ir.actions.report,print_report_name:commission_simple.commission_result_xlsx_report
+msgid ""
+"'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object."
+"partner_id.name.replace(' ', '_'))"
+msgstr ""
+"'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object."
+"partner_id.name.replace(' ', '_'))"
+
 #. module: commission_simple
 #: model:ir.model.constraint,message:commission_simple.constraint_commission_result_salesman_period_company_unique
 msgid ""
@@ -33,6 +43,13 @@ msgstr ""
 "Un vendeur doit être sélectionné lorsque le type d'affectation est "
 "\"Vendeur\"."

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/models/commission_rule.py:0
+#, python-format
+msgid "AND"
+msgstr "ET"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_needaction
 msgid "Action Needed"
@@ -108,13 +125,24 @@ msgid "Cancel"
 msgstr "Annuler"

 #. module: commission_simple
+#: model_terms:ir.ui.view,arch_db:commission_simple.view_move_line_form
+msgid "Commission"
+msgstr "Commission"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
 #: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_amount
+#, python-format
 msgid "Commission Amount"
 msgstr "Montant de la commission"

 #. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
 #: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_base
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__base
+#, python-format
 msgid "Commission Base"
 msgstr "Base de la commission"

@@ -122,14 +150,14 @@ msgstr "Base de la commission"
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__line_ids
 #: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
 msgid "Commission Lines"
-msgstr "Lignes commission"
+msgstr "Lignes de commission"

 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_compute__date_range_type_id
 #: model:ir.model.fields,field_description:commission_simple.field_res_company__commission_date_range_type_id
 #: model:ir.model.fields,field_description:commission_simple.field_res_config_settings__commission_date_range_type_id
 msgid "Commission Periodicity"
-msgstr "Périodicité de commission"
+msgstr "Périodicité des commissions"

 #. module: commission_simple
 #: model:ir.model,name:commission_simple.model_commission_profile
@@ -140,7 +168,7 @@ msgstr "Profil de commission"
 #. module: commission_simple
 #: model:ir.model,name:commission_simple.model_commission_profile_assignment
 msgid "Commission Profile Assignment"
-msgstr "Affectation du profil de commission"
+msgstr "Affectation des profils de commission"

 #. module: commission_simple
 #: model:ir.actions.act_window,name:commission_simple.commission_profile_action
@@ -149,8 +177,11 @@ msgid "Commission Profiles"
 msgstr "Profils de commission"

 #. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
 #: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_rate
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__rate
+#, python-format
 msgid "Commission Rate"
 msgstr "Taux de commission"

@@ -160,6 +191,11 @@ msgstr "Taux de commission"
 msgid "Commission Result"
 msgstr "État des commissions"

+#. module: commission_simple
+#: model:ir.model,name:commission_simple.model_report_commission_simple_report_xlsx
+msgid "Commission Result XLSX"
+msgstr "État des commission XLSX"
+
 #. module: commission_simple
 #: model:ir.model,name:commission_simple.model_commission_rule
 msgid "Commission Rule"
@@ -184,7 +220,7 @@ msgstr "Total des commissions"
 #: model:ir.ui.menu,name:commission_simple.commission_root
 #: model_terms:ir.ui.view,arch_db:commission_simple.res_config_settings_view_form
 msgid "Commissions"
-msgstr ""
+msgstr "Commissions"

 #. module: commission_simple
 #. odoo-python
@@ -194,6 +230,13 @@ msgid "Commissions already exist for %(period)s in company %(company)s."
 msgstr ""
 "Des commissions existent déjà pour %(period)s dans la société %(company)s."

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Commissions of %(partner)s for period %(period)s"
+msgstr "Commissions de %(partner)s pour la période %(period)s"
+
 #. module: commission_simple
 #: model:ir.model,name:commission_simple.model_res_company
 msgid "Companies"
@@ -254,11 +297,37 @@ msgstr "Créé par"
 msgid "Created on"
 msgstr "Créé le"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Currency"
+msgstr "Devise"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Customer"
+msgstr "Client"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__partner_ids
 msgid "Customers"
 msgstr "Clients"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/models/commission_rule.py:0
+#, python-format
+msgid "Customers:"
+msgstr "Clients :"
+
+#. module: commission_simple
+#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
+msgid "Disc.%"
+msgstr "Rem.%"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_compute__display_name
 #: model:ir.model.fields,field_description:commission_simple.field_commission_profile__display_name
@@ -272,7 +341,7 @@ msgstr "Nom affiché"
 #: model:ir.model.fields.selection,name:commission_simple.selection__commission_result__state__done
 #: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
 msgid "Done"
-msgstr "Validé"
+msgstr "Terminé"

 #. module: commission_simple
 #: model:ir.model.fields.selection,name:commission_simple.selection__commission_result__state__draft
@@ -281,7 +350,15 @@ msgid "Draft"
 msgstr "Brouillon"

 #. module: commission_simple
+#: model:ir.actions.report,name:commission_simple.commission_result_xlsx_report
+msgid "Détails Excel"
+msgstr "Détails Excel"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__date_end
+#, python-format
 msgid "End Date"
 msgstr "Date de fin"

@@ -291,6 +368,11 @@ msgstr "Date de fin"
 msgid "End date"
 msgstr "Date de fin"

+#. module: commission_simple
+#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
+msgid "Excel Export"
+msgstr "Export Excel"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_follower_ids
 msgid "Followers"
@@ -307,9 +389,19 @@ msgid "Font awesome icon e.g. fa-tasks"
 msgstr "Îcone font-awesome, par exemple fa-task"

 #. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Generated from Odoo on %s by %s"
+msgstr "Généré à partir d'Odoo le %s par %s"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/models/commission_rule.py:0
 #: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__4_global
+#, python-format
 msgid "Global"
-msgstr ""
+msgstr "Global"

 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__has_message
@@ -323,7 +415,7 @@ msgstr "A un message"
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__id
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__id
 msgid "ID"
-msgstr ""
+msgstr "ID"

 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_exception_icon
@@ -350,6 +442,20 @@ msgstr "Si activé, des messages ont une erreur d'envoi."
 msgid "In Payment and Paid"
 msgstr "En paiement et payé"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Invoice Date"
+msgstr "Date de facture"
+
 #. module: commission_simple
 #: model:ir.model.fields.selection,name:commission_simple.selection__commission_profile__trigger_type__invoice
 msgid "Invoiced"
@@ -411,7 +517,12 @@ msgstr "Marge"
 #. module: commission_simple
 #: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_form
 msgid "Match"
-msgstr ""
+msgstr "Correspondance"
+
+#. module: commission_simple
+#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__apply_description
+msgid "Match Criteria"
+msgstr "Critères de correspondance"

 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_rule_id
@@ -426,7 +537,7 @@ msgstr "Erreur d'envoi du message"
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_ids
 msgid "Messages"
-msgstr ""
+msgstr "Messages"

 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__my_activity_date_deadline
@@ -497,6 +608,18 @@ msgstr "Payé"
 msgid "Period"
 msgstr "Période"

+#. module: commission_simple
+#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
+msgid "Price"
+msgstr "Prix"
+
+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Product"
+msgstr "Produit"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__product_categ_ids
 #: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__3_product_category
@@ -508,6 +631,13 @@ msgstr "Catégories de produits"
 msgid "Product Categories and Customers"
 msgstr "Catégories de produits et clients"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/models/commission_rule.py:0
+#, python-format
+msgid "Product Categories:"
+msgstr "Catégories de produits :"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_account_move_line__product_categ_id
 msgid "Product Category"
@@ -524,6 +654,13 @@ msgstr "Produits"
 msgid "Products and Customers"
 msgstr "Produits et clients"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/models/commission_rule.py:0
+#, python-format
+msgid "Products:"
+msgstr "Produits :"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__profile_id
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__profile_id
@@ -531,6 +668,13 @@ msgstr "Produits et clients"
 msgid "Profile"
 msgstr "Profil"

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Quantity"
+msgstr "Quantité"
+
 #. module: commission_simple
 #: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
 #: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_tree
@@ -572,7 +716,10 @@ msgid "Sequence"
 msgstr "Séquence"

 #. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
 #: model:ir.model.fields,field_description:commission_simple.field_commission_rule__date_start
+#, python-format
 msgid "Start Date"
 msgstr "Date de début"

@@ -605,6 +752,13 @@ msgstr ""
 msgid "This salesman already has an assignment in this company."
 msgstr "Ce vendeur a déjà une assignation dans cette société."

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Total Amount"
+msgstr "Montant total"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_profile__trigger_type
 msgid "Trigger"
@@ -613,13 +767,20 @@ msgstr "Déclencheur"
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__assign_type
 msgid "Type"
-msgstr ""
+msgstr "Type"

 #. module: commission_simple
 #: model:ir.model.fields,help:commission_simple.field_commission_result__activity_exception_decoration
 msgid "Type of the exception activity on record."
 msgstr "Type de l'activité-alerte sur l'enregistrement."

+#. module: commission_simple
+#. odoo-python
+#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
+#, python-format
+msgid "Unit"
+msgstr "Unité"
+
 #. module: commission_simple
 #: model:ir.model.fields,field_description:commission_simple.field_commission_result__website_message_ids
 msgid "Website Messages"
@@ -636,5 +797,5 @@ msgstr "Historique des échanges sur le site Web"
 #, python-format
 msgid "You cannot delete commission result %s because it is in done state."
 msgstr ""
-"Vous ne pouvez pas supprimer l'état de commission %s parce qu'il est à "
-"l'état \"validé\"."
+"Vous ne pouvez pas supprimer l'état de commission %s parce qu'il est "
+"à l'état \"terminé\"."
--- a/commission_simple/models/init.py
+++ b/commission_simple/models/init.py
@@ -1,5 +1,5 @@
 from . import commission_profile
 from . import commission_rule
 from . import commission_result
-from . import res_company
 from . import account_move_line
+from . import account_invoice_report
--- a/commission_simple/models/account_invoice_report.py
+++ b/commission_simple/models/account_invoice_report.py
@@ -0,0 +1,16 @@
+# Copyright 2018-2019 Akretion France (http://www.akretion.com)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+from odoo.tools import SQL
+
+
+class AccountInvoiceReport(models.Model):
+    _inherit = 'account.invoice.report'
+
+    commission_amount = fields.Float(readonly=True)
+
+    @api.model
+    def _select(self) -> SQL:
+        return SQL("%s, line.commission_amount * account_currency_table.rate AS commission_amount", super()._select())
--- a/commission_simple/models/account_move_line.py
+++ b/commission_simple/models/account_move_line.py
@@ -11,7 +11,7 @@ class AccountMoveLine(models.Model):
    _inherit = 'account.move.line'

    commission_result_id = fields.Many2one(
-        'commission.result', string='Commission Result', check_company=True)
+        'commission.result', string='Commission Result', check_company=True, index=True)
    commission_rule_id = fields.Many2one(
        'commission.rule', 'Matched Commission Rule', ondelete='restrict', check_company=True)
    commission_base = fields.Monetary('Commission Base', currency_field='company_currency_id')
@@ -88,3 +88,18 @@ class AccountMoveLine(models.Model):
        if float_is_zero(lvals['commission_rate'], precision_digits=rate_prec) or self.company_currency_id.is_zero(lvals['commission_base']):
            return False
        return lvals
+
+    def _prepare_commission_xlsx(self):
+        self.ensure_one()
+        vals = {
+            "inv.name": self.move_id.name,
+            "inv.date": self.move_id.invoice_date,
+            "inv.partner": self.move_id.commercial_partner_id.display_name,
+            "product": self.product_id and self.product_id.display_name or self.name,
+            "qty": self.quantity,
+            "uom": self.product_uom_id.name,
+            "commission_base": self.commission_base,
+            "commission_rate": self.commission_rate / 100,
+            "commission_amount": self.commission_amount,
+        }
+        return vals
--- a/commission_simple/models/commission_profile.py
+++ b/commission_simple/models/commission_profile.py
@@ -27,6 +27,9 @@ class CommissionProfile(models.Model):
        ('paid', 'Paid'),
        ('in_payment', 'In Payment and Paid'),
        ], default='paid', string='Trigger', required=True)
+    date_range_type_id = fields.Many2one(
+        'date.range.type', string='Commission Periodicity', ondelete='restrict',
+        domain="[('company_id', 'in', (False, company_id))]")


 class CommissionProfileAssignment(models.Model):
@@ -100,6 +103,7 @@ class CommissionProfileAssignment(models.Model):
            'profile_id': self.profile_id.id,
            'date_range_id': date_range.id,
            'assign_type': self.assign_type,
+            'assignment_id': self.id,
            'company_id': self.company_id.id,
            }
        return vals
--- a/commission_simple/models/commission_result.py
+++ b/commission_simple/models/commission_result.py
@@ -17,6 +17,8 @@ class CommissionResult(models.Model):
        readonly=True, tracking=True)
    profile_id = fields.Many2one(
        'commission.profile', string='Commission Profile', readonly=True, tracking=True)
+    assignment_id = fields.Many2one(
+        'commission.profile.assignment', string="Commission Profile Assignment", readonly=True)
    assign_type = fields.Selection('_assign_type_selection', readonly=True, tracking=True)
    company_id = fields.Many2one(
        'res.company', string='Company', ondelete='cascade',
@@ -32,7 +34,10 @@ class CommissionResult(models.Model):
        states={'done': [('readonly', True)]})
    amount_total = fields.Monetary(
        string='Commission Total', currency_field='company_currency_id',
-        compute='_compute_amount_total', store=True, tracking=True)
+        compute='_compute_totals', store=True, tracking=True)
+    base_total = fields.Monetary(
+        string="Commission Base Total", currency_field='company_currency_id',
+        compute='_compute_totals', store=True, tracking=True)
    state = fields.Selection([
        ('draft', 'Draft'),
        ('done', 'Done'),
@@ -44,12 +49,13 @@ class CommissionResult(models.Model):
    def _assign_type_selection(self):
        return self.env['commission.profile.assignment']._assign_type_selection()

-    @api.depends('line_ids.commission_amount')
-    def _compute_amount_total(self):
-        rg_res = self.env['account.move.line'].read_group([('commission_result_id', 'in', self.ids)], ['commission_result_id', 'commission_amount:sum'], ['commission_result_id'])
-        mapped_data = dict([(x['commission_result_id'][0], x['commission_amount']) for x in rg_res])
+    @api.depends('line_ids.commission_amount', 'line_ids.commission_base')
+    def _compute_totals(self):
+        rg_res = self.env['account.move.line'].read_group([('commission_result_id', 'in', self.ids)], ['commission_result_id', 'commission_amount:sum', 'commission_base:sum'], ['commission_result_id'])
+        mapped_data = dict([(x['commission_result_id'][0], {'amount': x['commission_amount'], 'base': x['commission_base']}) for x in rg_res])
        for rec in self:
-            rec.amount_total = mapped_data.get(rec.id, 0)
+            rec.amount_total = mapped_data.get(rec.id, {}).get('amount')
+            rec.base_total = mapped_data.get(rec.id, {}).get('base')

    def unlink(self):
        for result in self:
@@ -59,7 +65,7 @@ class CommissionResult(models.Model):
        return super().unlink()

    def draft2done(self):
-        self.write({'state': 'done'})
+        self.filtered(lambda x: x.state == 'draft').write({'state': 'done'})

    def backtodraft(self):
        self.write({'state': 'draft'})
@@ -75,3 +81,7 @@ class CommissionResult(models.Model):
        'salesman_period_company_unique',
        'unique(company_id, partner_id, date_range_id)',
        'A commission result already exists for this salesman/agent for the same period.')]
+
+    def _prepare_xlsx_lines(self):
+        self.ensure_one()
+        return self.line_ids.sorted(key=lambda x: x.move_id.invoice_date)
--- a/commission_simple/models/commission_rule.py
+++ b/commission_simple/models/commission_rule.py
@@ -3,13 +3,13 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).


-from odoo import fields, models, api
+from odoo import fields, models, api, _


 class CommissionRule(models.Model):
    _name = 'commission.rule'
    _description = 'Commission Rule'
-    _order = 'profile_id, applied_on'
+    _order = 'profile_id, applied_on, rate desc'

    partner_ids = fields.Many2many(
        'res.partner', string='Customers', domain=[('parent_id', '=', False)])
@@ -34,6 +34,31 @@ class CommissionRule(models.Model):
        ('4_global', 'Global')],
        string='Apply On', default='4_global', required=True)
    active = fields.Boolean(string='Active', default=True)
+    apply_description = fields.Html(compute='_compute_apply_description', string="Match Criteria")
+
+    _sql_constraints = [(
+        'rate_positive',
+        'CHECK(rate >= 0)',
+        'Rate must be positive !')]
+
+    def _compute_apply_description(self):
+        customer_label = "<strong>" + _("Customers:") + "</strong>"
+        product_label = "<strong>" + _("Products:") + "</strong>"
+        product_categ_label = "<strong>" + _("Product Categories:") + "</strong>"
+        and_label = "<strong>" + _('AND') + "</strong>"
+        for rule in self:
+            desc = False
+            if rule.applied_on == '0_customer_product':
+                desc = f"{customer_label} {', '.join([part.ref or part.name for part in rule.partner_ids])} {and_label} {product_label} {', '.join([pp.default_code or pp.name for pp in rule.product_ids])}"
+            elif rule.applied_on == '1_customer_product_category':
+                desc = f"{customer_label} {', '.join([part.ref or part.name for part in rule.partner_ids])} {and_label} {product_categ_label} {', '.join([categ.display_name for categ in rule.product_categ_ids])}"
+            elif rule.applied_on == '2_product':
+                desc = f"{product_label} {', '.join([pp.default_code or pp.name for pp in rule.product_ids])}"
+            elif rule.applied_on == '3_product_category':
+                desc = f"{product_categ_label} {', '.join([categ.display_name for categ in rule.product_categ_ids])}"
+            elif rule.applied_on == '4_global':
+                desc = _('Global')
+            rule.apply_description = desc

    @api.model
    def load_all_rules(self):
@@ -45,8 +70,3 @@ class CommissionRule(models.Model):
            else:
                res[rule['profile_id'][0]].append(rule)
        return res
-
-    _sql_constraints = [(
-        'rate_positive',
-        'CHECK(rate >= 0)',
-        'Rate must be positive !')]
--- a/commission_simple/models/res_company.py
+++ b/commission_simple/models/res_company.py
@@ -1,13 +0,0 @@
-# Copyright 2019-2024 Akretion France (https://www.akretion.com/)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-from odoo import fields, models
-
-
-class ResCompany(models.Model):
-    _inherit = 'res.company'
-
-    commission_date_range_type_id = fields.Many2one(
-        'date.range.type', string='Commission Periodicity', ondelete='restrict')
--- a/commission_simple/models/res_users.py
+++ b/commission_simple/models/res_users.py
@@ -1,20 +0,0 @@
-# Copyright 2019-2024 Akretion France (https://www.akretion.com/)
-# @author Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-
-from odoo import fields, models
-
-
-class ResUsers(models.Model):
-    _inherit = 'res.users'
-
-    # TODO mon idée : déplacer ça dans une table dédiée
-    # company_id oblig
-    # partner_id (filtré... sur lien vers user ou agent petit difficulté)
-    # profile_id
-    # type agent ou user => ça donne le champ de recherche
-
-    commission_profile_id = fields.Many2one(
-        'commission.profile', string='Commission Profile',
-        company_dependent=True)
--- a/commission_simple/reports/init.py
+++ b/commission_simple/reports/init.py
@@ -0,0 +1 @@
+from . import commission_result_xlsx
--- a/commission_simple/reports/commission_result_xlsx.py
+++ b/commission_simple/reports/commission_result_xlsx.py
@@ -0,0 +1,112 @@
+# Copyright 2025 Akretion France (https://www.akretion.com/)
+# @author: Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models, tools, Command, _
+from odoo.exceptions import UserError
+from datetime import datetime
+from odoo.tools.misc import format_datetime
+
+
+class CommissionResultXlsx(models.AbstractModel):
+    _name = "report.commission_simple.report_xlsx"
+    _inherit = "report.report_xlsx.abstract"
+    _description = "Commission Result XLSX"
+
+    def generate_xlsx_report(self, workbook, data, objects):
+        # for some strange reasons, lang is not kept in context
+        self = self.with_context(lang=self.env.user.lang)
+        result = objects[0]
+        sheet = workbook.add_worksheet(result.date_range_id.name)
+        styles = self._prepare_styles(workbook, result.company_id)
+        title = _("Commissions of %(partner)s for period %(period)s", partner=result.partner_id.name, period=result.date_range_id.name)
+        now_str = format_datetime(self.env, datetime.now())
+        i = 0
+        sheet.write(i, 0, title, styles['title'])
+        sheet.write(i, 5, _('Generated from Odoo on %s by %s') % (now_str, self.env.user.name), styles['regular_small'])
+        i += 1
+        sheet.write(i, 0, _('Start Date'), styles['subtitle'])
+        sheet.write(i, 1, result.date_start, styles['subtitle_date'])
+        i += 1
+        sheet.write(i, 0, _('End Date'), styles['subtitle'])
+        sheet.write(i, 1, result.date_end, styles['subtitle_date'])
+        i += 1
+        sheet.write(i, 0, _('Currency'), styles['subtitle'])
+        sheet.write(i, 1, result.company_id.currency_id.name, styles['subtitle'])
+        i += 1
+        sheet.write(i, 0, _('Base Total'), styles['subtitle'])
+        sheet.write(i, 1, result.base_total, styles['subtitle_amount'])
+        i += 1
+        sheet.write(i, 0, _('Amount Total'), styles['subtitle'])
+        sheet.write(i, 1, result.amount_total, styles['subtitle_amount'])
+        i += 3
+        cols = self._prepare_xlsx_cols()
+        coldict = {}
+        pos = 0
+        for key, label, width, style_suffix in cols:
+            coldict[key] = {
+                "label": label,
+                "width": width,
+                "pos": pos,
+                "style": style_suffix and f"regular_{style_suffix}" or "regular",
+            }
+            pos += 1
+        # header
+        for col_key, col_vals in coldict.items():
+            sheet.write(i, col_vals['pos'], col_vals['label'], styles['col_title'])
+            sheet.set_column(col_vals['pos'], col_vals['pos'], col_vals['width'])
+        # table content
+        for line in result._prepare_xlsx_lines():
+            i += 1
+            for col_key, value in line._prepare_commission_xlsx().items():
+                sheet.write(i, coldict[col_key]["pos"], value, styles[coldict[col_key]["style"]])
+
+    def _prepare_xlsx_cols(self):
+        cols = [  # key, label, width, style_suffix
+            ("inv.name", _("Invoice"), 14, False),
+            ("inv.date", _("Invoice Date"), 11, "date"),
+            ("inv.partner", _("Customer"), 50, False),
+            ("product", _("Product"), 35, False),
+            ("qty", _("Quantity"), 8, "qty"),
+            ("uom", _("Unit"), 8, False),
+            ("commission_base", _("Commission Base"), 14, "amount"),
+            ("commission_rate", _("Commission Rate"), 10, "rate"),
+            ("commission_amount", _("Commission Amount"), 14, "amount"),
+            ]
+        return cols
+
+    def _prepare_styles(self, workbook, company):
+        col_title_bg_color = '#eeeeee'
+        prec_qty = self.env['decimal.precision'].precision_get('Product Unit of Measure')
+        prec_rate = self.env['decimal.precision'].precision_get('Commission Rate')
+        prec_price = self.env['decimal.precision'].precision_get('Product Price')
+        regular_font_size = 10
+        date_format = "dd/mm/yyyy"  # TODO depend on lang
+        num_format_amount = f"# ##0.{'0' * company.currency_id.decimal_places}"
+        num_format_qty = f"# ##0.{'0' * prec_qty}"
+        num_format_rate = f"""0.{'0' * prec_rate} " "%"""
+        num_format_price = f"# ##0.{'0' * prec_price}"
+        styles = {
+            'title': workbook.add_format({
+                'bold': True, 'font_size': regular_font_size + 10,
+                'font_color': '#003b6f'}),
+            'subtitle': workbook.add_format({
+                'bold': True, 'font_size': regular_font_size}),
+            'subtitle_date': workbook.add_format({
+                'bold': True, 'font_size': regular_font_size, 'num_format': date_format}),
+            'subtitle_amount': workbook.add_format({
+                'bold': True, 'font_size': regular_font_size, 'num_format': num_format_amount}),
+            'col_title': workbook.add_format({
+                'bold': True, 'bg_color': col_title_bg_color,
+                'text_wrap': True, 'font_size': regular_font_size,
+                'align': 'center',
+                }),
+            'regular_date': workbook.add_format({'num_format': date_format}),
+            'regular_amount': workbook.add_format({'num_format': num_format_amount}),
+            'regular_rate': workbook.add_format({'num_format': num_format_rate}),
+            'regular_qty': workbook.add_format({'num_format': num_format_qty}),
+            'regular_price': workbook.add_format({'num_format': num_format_price}),
+            'regular': workbook.add_format({}),
+            'regular_small': workbook.add_format({'font_size': regular_font_size - 2}),
+            }
+        return styles
--- a/commission_simple/reports/report.xml
+++ b/commission_simple/reports/report.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2025 Akretion France (https://www.akretion.com/)
+  @author: Alexis de Lattre <alexis.delattre@akretion.com>
+  The licence is in the file __manifest__.py
+-->
+
+<odoo>
+
+<record id="commission_result_xlsx_report" model="ir.actions.report">
+    <field name="name">Détails Excel</field>
+    <field name="model">commission.result</field>
+    <field name="report_type">xlsx</field>
+    <field name="report_name">commission_simple.report_xlsx</field>
+    <field name="report_file">commission_simple.report_xlsx</field>
+    <field name="print_report_name">'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object.partner_id.name.replace(' ', '_'))</field>
+    <field name="binding_model_id" ref="model_commission_result" />
+</record>
+
+</odoo>
--- a/commission_simple/security/ir.model.access.csv
+++ b/commission_simple/security/ir.model.access.csv
@@ -8,4 +8,4 @@ access_commission_rule_audit,Read access on commission.rule for viewer group,mod
 access_commission_result_full,Full access on commission.result to accountant,model_commission_result,account.group_account_user,1,1,1,1
 access_commission_result_read,Read access on commission.result to invoicing grp,model_commission_result,account.group_account_invoice,1,0,0,0
 access_commission_result_audit,Read access on commission.result to viewer grp,model_commission_result,account.group_account_readonly,1,0,0,0
-access_commission_compute_full,Full access to wizard commission.compute,model_commission_compute,account.group_account_manager,1,1,1,1
+access_commission_compute_full,Full access to wizard commission.compute to Accountant,model_commission_compute,account.group_account_user,1,1,1,1
--- a/commission_simple/views/account_move_line.xml
+++ b/commission_simple/views/account_move_line.xml
@@ -13,7 +13,7 @@
    <field name="inherit_id" ref="account.view_move_line_form"/>
    <field name="arch" type="xml">
        <notebook position="inside">
-            <page name="commission" string="Commission" attrs="{'invisible': [('display_type', '!=', 'product')]}">
+            <page name="commission" string="Commission" invisible="display_type != 'product'">
                <group name="commission_grp">
                    <field name="commission_base"/>
                    <label for="commission_rate"/>
--- a/commission_simple/views/commission.xml
+++ b/commission_simple/views/commission.xml
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2019 Akretion France (http://www.akretion.com)
-  @author Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-->
-
-<odoo>
-
-<menuitem id="commission_root" name="Commissions" parent="account.menu_finance" sequence="11"/>
-<menuitem id="commission_config_root" name="Commissions" parent="account.menu_finance_configuration" sequence="110"/>
-
-<!-- PROFILE -->
-<record id="commission_profile_form" model="ir.ui.view">
-    <field name="name">commission.profile.form</field>
-    <field name="model">commission.profile</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
-                <group name="main">
-                    <field name="name"/>
-                    <field name="active" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="trigger_type"/>
-                </group>
-                <group name="lines" string="Rules">
-                    <field name="line_ids" nolabel="1" colspan="2"/>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="commission_profile_tree" model="ir.ui.view">
-    <field name="name">commission.profile.tree</field>
-    <field name="model">commission.profile</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="sequence" widget="handle"/>
-            <field name="name" decoration-bf="1"/>
-            <field name="trigger_type" optional="show"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
-    </field>
-</record>
-
-<record id="commission_profile_action" model="ir.actions.act_window">
-    <field name="name">Commission Profiles</field>
-    <field name="res_model">commission.profile</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<menuitem id="commission_profile_menu" action="commission_profile_action" parent="commission_config_root" sequence="18"/>
-
-
-<!-- RULE -->
-<record id="commission_rule_form" model="ir.ui.view">
-    <field name="name">commission.rule.form</field>
-    <field name="model">commission.rule</field>
-    <field name="arch" type="xml">
-        <form>
-            <sheet>
-                <group name="main">
-                    <field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="applied_on" widget="radio"/>
-                </group>
-                <group name="match" string="Match">
-                    <field name="partner_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '1_customer_product_category'))], 'required': [('applied_on', 'in', ('0_customer_product', '1_customer_product_category'))]}"/>
-                    <field name="product_categ_ids" attrs="{'invisible': [('applied_on', 'not in', ('1_customer_product_category', '3_product_category'))], 'required': [('applied_on', 'in', ('1_customer_product_category', '3_product_category'))]}"/>
-                    <field name="product_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '2_product'))], 'required': [('applied_on', 'in', ('0_customer_product', '2_product'))]}"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                </group>
-                <group name="compute" string="Compute">
-                    <label for="rate"/>
-                    <div name="rate">
-                        <field name="rate" class="oe_inline"/> %
-                    </div>
-                </group>
-            </sheet>
-        </form>
-    </field>
-</record>
-
-<record id="commission_rule_tree" model="ir.ui.view">
-    <field name="name">commission.rule.tree</field>
-    <field name="model">commission.rule</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
-            <field name="applied_on"/>
-            <field name="date_start"/>
-            <field name="date_end"/>
-            <field name="rate" string="Rate (%)"/>
-        </tree>
-    </field>
-</record>
-
-<record id="commission_rule_search" model="ir.ui.view">
-    <field name="name">commission.rule.search</field>
-    <field name="model">commission.rule</field>
-    <field name="arch" type="xml">
-        <search>
-            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-            <group name="groupby">
-                <filter name="profile_groupby" string="Profile" context="{'group_by': 'profile_id'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-
-<record id="commission_rule_action" model="ir.actions.act_window">
-    <field name="name">Commission Rules</field>
-    <field name="res_model">commission.rule</field>
-    <field name="view_mode">tree,form</field>
-    <field name="context">{'commission_rule_main_view': True}</field>
-</record>
-
-
-<menuitem id="commission_rule_menu" action="commission_rule_action" parent="commission_config_root" sequence="20"/>
-
-<!-- RESULT -->
-<record id="commission_result_form" model="ir.ui.view">
-    <field name="name">commission.result.form</field>
-    <field name="model">commission.result</field>
-    <field name="arch" type="xml">
-        <form>
-            <group name="main">
-                <group name="main-left">
-                    <field name="partner_id"/>
-                    <field name="profile_id" groups="account.group_account_manager"/>
-                    <field name="company_currency_id" invisible="1"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="amount_total"/>
-                </group>
-                <group name="main-right">
-                    <field name="date_range_id"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                </group>
-            </group>
-            <group name="lines" string="Commission Lines">
-                <field nolabel="1" name="line_ids" colspan="2">
-                    <tree>
-                        <field name="move_id"/>
-                        <field name="move_line_id"/>
-                        <field name="base"/>
-                        <field name="rate" string="Rate (%)"/>
-                        <field name="amount" sum="1"/>
-                        <field name="rule_id"/>
-                        <field name="company_currency_id" invisible="1"/>
-                    </tree>
-                </field>
-            </group>
-        </form>
-    </field>
-</record>
-
-<record id="commission_result_tree" model="ir.ui.view">
-    <field name="name">commission.result.tree</field>
-    <field name="model">commission.result</field>
-    <field name="arch" type="xml">
-        <tree>
-            <field name="date_range_id" optional="show"/>
-            <field name="date_start" optional="hide"/>
-            <field name="date_end" optional="hide"/>
-            <field name="partner_id"/>
-            <field name="profile_id" groups="account.group_account_manager"/>
-            <field name="company_currency_id" invisible="1"/>
-            <field name="company_id" groups="base.group_multi_company"/>
-            <field name="amount_total" sum="1" optional="show"/>
-        </tree>
-    </field>
-</record>
-
-<record id="commission_result_search" model="ir.ui.view">
-    <field name="name">commission.result.search</field>
-    <field name="model">commission.result</field>
-    <field name="arch" type="xml">
-        <search>
-            <field name="partner_id"/>
-            <field name="date_range_id"/>
-            <group name="groupby">
-                <filter name="partner_groupby" string="Salesman" context="{'group_by': 'partner_id'}"/>
-                <filter name="date_range_groupby" string="Period" context="{'group_by': 'date_range_id'}"/>
-            </group>
-        </search>
-    </field>
-</record>
-
-<record id="commission_result_action" model="ir.actions.act_window">
-    <field name="name">Commissions</field>
-    <field name="res_model">commission.result</field>
-    <field name="view_mode">tree,form</field>
-</record>
-
-<menuitem id="commission_result_menu" action="commission_result_action" parent="commission_root" sequence="10"/>
-
-
-</odoo>
--- a/commission_simple/views/commission_profile.xml
+++ b/commission_simple/views/commission_profile.xml
@@ -16,12 +16,13 @@
    <field name="arch" type="xml">
        <form>
            <sheet>
-                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
+                <widget name="web_ribbon" title="Archived" bg_color="bg-danger" invisible="active"/>
                <group name="main">
                    <group name="main-left">
                        <field name="name"/>
                        <field name="active" invisible="1"/>
                        <field name="trigger_type" widget="radio"/>
+                        <field name="date_range_type_id"/>
                    </group>
                    <group name="main-right">
                        <field name="company_id" invisible="1"/>
@@ -31,12 +32,12 @@
                <notebook>
                    <page name="assignments" string="Assignments">
                        <field name="assign_ids">
-                            <tree editable="bottom">
+                            <list editable="bottom">
                                <field name="assign_type"/>
-                                <field name="user_id" attrs="{'required': [('assign_type', '=', 'user')], 'readonly': [('assign_type', '!=', 'user')]}"/>
+                                <field name="user_id" required="assign_type == 'user'" readonly="assign_type != 'user'"/>
                                <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="company_id" invisible="1"/>
-                            </tree>
+                                <field name="company_id" column_invisible="1"/>
+                            </list>
                        </field>
                    </page>
                    <page name="rules" string="Rules">
@@ -48,23 +49,43 @@
    </field>
 </record>

-<record id="commission_profile_tree" model="ir.ui.view">
-    <field name="name">commission.profile.tree</field>
+<record id="commission_profile_list" model="ir.ui.view">
+    <field name="name">commission.profile.list</field>
    <field name="model">commission.profile</field>
    <field name="arch" type="xml">
-        <tree>
+        <list>
            <field name="sequence" widget="handle"/>
            <field name="name" decoration-bf="1"/>
-            <field name="trigger_type" optional="show"/>
+            <field name="trigger_type" optional="show" widget="badge" decoration-info="trigger_type == 'invoice'" decoration-success="trigger_type == 'paid'" decoration-warning="trigger_type == 'in_payment'"/>
+            <field name="date_range_type_id" optional="show"/>
            <field name="company_id" groups="base.group_multi_company"/>
-        </tree>
+        </list>
+    </field>
+</record>
+
+<record id="commission_profile_search" model="ir.ui.view">
+    <field name="model">commission.profile</field>
+    <field name="arch" type="xml">
+        <search>
+            <field name="name"/>
+            <filter string="Invoiced" name="invoice" domain="[('trigger_type', '=', 'invoice')]"/>
+            <filter string="Paid" name="paid" domain="[('trigger_type', '=', 'paid')]"/>
+            <filter string="In Payment and Paid" name="in_payment" domain="[('trigger_type', '=', 'in_payment')]"/>
+            <separator/>
+            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            <separator/>
+            <group name="groupby">
+                <filter name="date_range_type_groupby" string="Commission Periodicity" context="{'group_by': 'date_range_type_id'}"/>
+            </group>
+        </search>
    </field>
 </record>

 <record id="commission_profile_action" model="ir.actions.act_window">
    <field name="name">Commission Profiles</field>
+    <field name="path">commission-profile</field>
    <field name="res_model">commission.profile</field>
-    <field name="view_mode">tree,form</field>
+    <field name="view_mode">list,form</field>
 </record>

 <menuitem id="commission_profile_menu" action="commission_profile_action" parent="commission_config_root" sequence="18"/>
--- a/commission_simple/views/commission_result.xml
+++ b/commission_simple/views/commission_result.xml
@@ -13,8 +13,9 @@
    <field name="arch" type="xml">
        <form>
            <header>
-                <button name="draft2done" type="object" states="draft" string="Confirm" class="btn-primary"/>
-                <button name="backtodraft" type="object" states="done" string="Back to Draft" confirm="Are you sure you want to go back to draft?"/>
+                <button name="draft2done" type="object" invisible="state != 'draft'" string="Confirm" class="btn-primary"/>
+                <button name="backtodraft" type="object" invisible="state != 'done'" string="Back to Draft" confirm="Are you sure you want to go back to draft?"/>
+                <button name="%(commission_simple.commission_result_xlsx_report)d" type="action" string="Excel Export"/>
                <field name="state" widget="statusbar"/>
            </header>
            <group name="main">
@@ -23,6 +24,7 @@
                    <field name="date_range_id"/>
                    <field name="date_start"/>
                    <field name="date_end"/>
+                    <field name="base_total"/>
                    <field name="amount_total"/>
                    <field name="company_currency_id" invisible="1"/>
                    <field name="company_id" invisible="1"/>
@@ -34,38 +36,45 @@
                </group>
            </group>
            <group name="lines" string="Commission Lines">
-                <field nolabel="1" name="line_ids" colspan="2">
-                    <tree>
+                <field nolabel="1" name="line_ids" colspan="2" widget="many2many">
+                    <list>
                        <field name="move_id"/>
                        <field name="date" optional="hide"/>
                        <field name="partner_id"/>
                        <field name="product_id"/>
                        <field name="product_categ_id" optional="hide"/>
                        <field name="name" optional="hide"/>
+                        <field name="quantity" optional="hide"/>
+                        <field name="product_uom_id" optional="hide" groups="uom.group_uom"/>
+                        <field name="price_unit" string="Price" optional="hide"/>
+                        <field name="discount" string="Disc.%" optional="hide"/>
                        <field name="price_subtotal" optional="hide" string="Invoiced Amount"/>
-                        <field name="commission_base"/>
+                        <field name="commission_base" sum="1"/>
                        <field name="commission_rate" string="Rate (%)"/>
                        <field name="commission_amount" sum="1"/>
                        <field name="commission_rule_id" optional="hide"/>
                        <field name="company_currency_id" invisible="1"/>
                        <field name="currency_id" invisible="1"/>
-                    </tree>
+                    </list>
                </field>
            </group>
-            <div class="oe_chatter">
-                <field name="message_follower_ids" widget="mail_followers"/>
-                <field name="activity_ids" widget="mail_activity"/>
-                <field name="message_ids" widget="mail_thread"/>
-            </div>
+            <chatter />
        </form>
    </field>
 </record>

-<record id="commission_result_tree" model="ir.ui.view">
-    <field name="name">commission.result.tree</field>
+<record id="commission_result_list" model="ir.ui.view">
+    <field name="name">commission.result.list</field>
    <field name="model">commission.result</field>
    <field name="arch" type="xml">
-        <tree>
+        <list decoration-info="state == 'draft'">
+            <header>
+                <button
+                    name="draft2done"
+                    type="object"
+                    string="Validate"
+                />
+            </header>
            <field name="date_range_id" optional="show"/>
            <field name="date_start" optional="hide"/>
            <field name="date_end" optional="hide"/>
@@ -74,9 +83,10 @@
            <field name="assign_type" optional="hide" widget="badge" decoration-warning="assign_type == 'user'"/>
            <field name="company_currency_id" invisible="1"/>
            <field name="company_id" groups="base.group_multi_company"/>
+            <field name="base_total" sum="1" optional="hide"/>
            <field name="amount_total" sum="1" optional="show"/>
            <field name="state" decoration-info="state == 'draft'" decoration-success="state == 'done'" widget="badge"/>
-        </tree>
+        </list>
    </field>
 </record>

@@ -103,8 +113,9 @@

 <record id="commission_result_action" model="ir.actions.act_window">
    <field name="name">Commissions</field>
+    <field name="path">commission-result</field>
    <field name="res_model">commission.result</field>
-    <field name="view_mode">tree,form</field>
+    <field name="view_mode">list,form</field>
 </record>

 <menuitem id="commission_result_menu" action="commission_result_action" parent="commission_root" sequence="10"/>
--- a/commission_simple/views/commission_rule.xml
+++ b/commission_simple/views/commission_rule.xml
@@ -19,9 +19,9 @@
                    <field name="company_id" invisible="1"/>
                </group>
                <group name="match" string="Match">
-                    <field name="partner_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '1_customer_product_category'))], 'required': [('applied_on', 'in', ('0_customer_product', '1_customer_product_category'))]}"/>
-                    <field name="product_categ_ids" attrs="{'invisible': [('applied_on', 'not in', ('1_customer_product_category', '3_product_category'))], 'required': [('applied_on', 'in', ('1_customer_product_category', '3_product_category'))]}"/>
-                    <field name="product_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '2_product'))], 'required': [('applied_on', 'in', ('0_customer_product', '2_product'))]}"/>
+                    <field name="partner_ids" invisible="applied_on not in ('0_customer_product', '1_customer_product_category')" required="applied_on in ('0_customer_product', '1_customer_product_category')"/>
+                    <field name="product_categ_ids" invisible="applied_on not in ('1_customer_product_category', '3_product_category')" required="applied_on in ('1_customer_product_category', '3_product_category')"/>
+                    <field name="product_ids" invisible="applied_on not in ('0_customer_product', '2_product')" required="applied_on in ('0_customer_product', '2_product')"/>
                    <field name="date_start"/>
                    <field name="date_end"/>
                </group>
@@ -37,18 +37,19 @@
    </field>
 </record>

-<record id="commission_rule_tree" model="ir.ui.view">
-    <field name="name">commission.rule.tree</field>
+<record id="commission_rule_list" model="ir.ui.view">
+    <field name="name">commission.rule.list</field>
    <field name="model">commission.rule</field>
    <field name="arch" type="xml">
-        <tree>
+        <list>
            <field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
-            <field name="applied_on"/>
-            <field name="date_start"/>
-            <field name="date_end"/>
+            <field name="applied_on" widget="badge" decoration-danger="applied_on == '0_customer_product'" decoration-warning="applied_on == '1_customer_product_category'" decoration-info="applied_on == '2_product'" decoration-success="applied_on == '3_product_category'"/>
+            <field name="apply_description"/>
+            <field name="date_start" optional="show"/>
+            <field name="date_end" optional="show"/>
            <field name="rate" string="Rate (%)"/>
-            <field name="base"/>
-        </tree>
+            <field name="base" widget="badge" decoration-success="base == 'invoiced'" decoration-warning="base == 'margin'"/>
+        </list>
    </field>
 </record>

@@ -68,8 +69,9 @@

 <record id="commission_rule_action" model="ir.actions.act_window">
    <field name="name">Commission Rules</field>
+    <field name="path">commission-rule</field>
    <field name="res_model">commission.rule</field>
-    <field name="view_mode">tree,form</field>
+    <field name="view_mode">list,form</field>
    <field name="context">{'commission_rule_main_view': True}</field>
 </record>

--- a/commission_simple/views/res_config_settings.xml
+++ b/commission_simple/views/res_config_settings.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2019-2024 Akretion France (https://www.akretion.com)
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
-
-<odoo>
-
-
-<record id="res_config_settings_view_form" model="ir.ui.view">
-    <field name="name">commission.res.config.settings.form</field>
-    <field name="model">res.config.settings</field>
-    <field name="inherit_id" ref="account.res_config_settings_view_form" />
-    <field name="arch" type="xml">
-        <xpath expr="//div[@id='storno']" position="after">
-            <h2>Commissions</h2>
-            <div class="row mt16 o_settings_container" id="commission_simple">
-                <div class="col-12 col-lg-12 o_setting_box" id="commission_simple-settings">
-                    <div class="o_setting_left_pane" />
-                    <div class="o_setting_right_pane">
-                        <div class="row" id="commission_date_range_type_id">
-                            <label
-                                for="commission_date_range_type_id"
-                                class="col-md-5"
-                            />
-                            <field name="commission_date_range_type_id" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </xpath>
-    </field>
-</record>
-
-
-</odoo>
--- a/commission_simple/views/res_users.xml
+++ b/commission_simple/views/res_users.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2019-2024 Akretion France (https://www.akretion.com)
-  @author Alexis de Lattre <alexis.delattre@akretion.com>
-  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
-->
-
-<odoo>
-
-
-<record id="view_users_form" model="ir.ui.view">
-    <field name="name">commission.res.users.form</field>
-    <field name="model">res.users</field>
-    <field name="inherit_id" ref="base.view_users_form"/>
-    <field name="arch" type="xml">
-        <group name="preferences" position="after">
-            <group name="commission" string="Commission" groups="account.group_account_manager">
-                <field name="commission_profile_id"/>
-            </group>
-        </group>
-    </field>
-</record>
-
-<record id="view_users_tree" model="ir.ui.view">
-    <field name="name">commission.res.users.tree</field>
-    <field name="model">res.users</field>
-    <field name="inherit_id" ref="base.view_users_tree"/>
-    <field name="arch" type="xml">
-        <field name="login_date" position="after">
-            <field name="commission_profile_id" optional="hide" groups="account.group_account_manager"/>
-        </field>
-    </field>
-</record>
-
-
-</odoo>
--- a/commission_simple/wizards/init.py
+++ b/commission_simple/wizards/init.py
@@ -1,2 +1 @@
 from . import commission_compute
-from . import res_config_settings
--- a/commission_simple/wizards/commission_compute.py
+++ b/commission_simple/wizards/commission_compute.py
@@ -3,8 +3,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from odoo import api, fields, models, _
-from dateutil.relativedelta import relativedelta
+from datetime import datetime, timedelta
 from odoo.exceptions import UserError
+from odoo.tools.misc import format_date
 import logging
 logger = logging.getLogger(__name__)

@@ -13,47 +14,44 @@ class CommissionCompute(models.TransientModel):
    _name = 'commission.compute'
    _description = 'Compute Commissions'

-    company_id = fields.Many2one('res.company', required=True, default=lambda self: self.env.company)
-    date_range_type_id = fields.Many2one(related='company_id.commission_date_range_type_id')
-    date_range_id = fields.Many2one(
-        'date.range', required=True, string='Period',
-        compute='_compute_date_range_id', store=True, precompute=True, readonly=False,
-        domain="[('type_id', '=', date_range_type_id)]")
-    date_start = fields.Date(related='date_range_id.date_start')
-    date_end = fields.Date(related='date_range_id.date_end')
+    company_id = fields.Many2one('res.company', required=True)
+    date_start = fields.Date(string="Period Start Date", required=True)

-    @api.depends('company_id')
-    def _compute_date_range_id(self):
-        for wiz in self:
-            date_range_id = False
-            company = wiz.company_id
-            if company and company.commission_date_range_type_id:
-                type_id = company.commission_date_range_type_id.id
-                last_commission_result = self.env['commission.result'].search([
-                    ('company_id', '=', company.id),
-                    ], order='date_end desc', limit=1)
-                limit_date = last_commission_result and last_commission_result.date_end or (fields.Date.context_today(self) + relativedelta(months=-2, day=31))
-                date_range = self.env['date.range'].search([
-                    ('company_id', 'in', (company.id, False)),
-                    ('type_id', '=', type_id),
-                    ('date_start', '>', limit_date)
-                    ], order='date_start', limit=1)
-                date_range_id = date_range and date_range.id or False
-            wiz.date_range_id = date_range_id
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        company = self.env.company
+        last_commission_result = self.env['commission.result'].search([
+            ('company_id', '=', company.id),
+            ], order='date_start desc', limit=1)
+        if last_commission_result:
+            last_start_date = last_commission_result.date_start
+            commissions_last_start_date = self.env['commission.result'].search([
+                ('date_start', '=', last_start_date),
+                ('company_id', '=', company.id),
+                ], order="date_end asc", limit=1)
+            min_end_date = commissions_last_start_date.date_end
+            date_start = min_end_date + timedelta(1)
+        else:
+            today = fields.Date.context_today(self)
+            date_start = datetime(today.year, today.month, 1)
+        res.update({
+            'company_id': company.id,
+            'date_start': date_start,
+            })
+        return res

    def run(self):
        self.ensure_one()
+        if not self.date_start:
+            raise UserError(_("Missing Period Start Date."))
        creso = self.env['commission.result']
-        date_range = self.date_range_id
-        existing_commissions = creso.search([
-            ('date_range_id', '=', date_range.id),
+        existing_commissions = creso.search_read([
+            ('date_start', '=', self.date_start),
            ('company_id', '=', self.company_id.id),
-            ])
-        if existing_commissions:
-            raise UserError(_(
-                'Commissions already exist for %(period)s in company %(company)s.',
-                period=date_range.display_name, company=self.company_id.display_name))
-        com_result_ids = self._core_compute()
+            ], ['assignment_id'])
+        exclude_assignment_ids = [x['assignment_id'][0] for x in existing_commissions if x['assignment_id']]
+        com_result_ids = self._core_compute(exclude_assignment_ids)
        if not com_result_ids:
            raise UserError(_('No commissions generated.'))
        action = self.env['ir.actions.actions']._for_xml_id(
@@ -64,12 +62,32 @@ class CommissionCompute(models.TransientModel):
            })
        return action

-    def _core_compute(self):
+    def _core_compute(self, exclude_assignment_ids):
        rules = self.env['commission.rule'].load_all_rules()
        com_result_ids = []
-        assignments = self.env['commission.profile.assignment'].search([('company_id', '=', self.company_id.id)])
+        assignments = self.env['commission.profile.assignment'].search(
+            [('company_id', '=', self.company_id.id), ('id', 'not in', exclude_assignment_ids)])
+        date_range_type2date_range = {}
        for assignment in assignments:
-            com_result = assignment._generate_commission_result(self.date_range_id, rules)
+            profile = assignment.profile_id
+            date_range_type = profile.date_range_type_id
+            if not date_range_type:
+                raise UserError(_("Missing commission periodicity on commission profile '%s'.") % profile.display_name)
+            if date_range_type not in date_range_type2date_range:
+                domain = [
+                    ('date_start', '=', self.date_start),
+                    ('type_id', '=', date_range_type.id),
+                    ]
+                date_range = self.env['date.range'].search(
+                    domain + [('company_id', '=', self.company_id.id)], limit=1)
+                if not date_range:
+                    date_range = self.env['date.range'].search(
+                        domain + [('company_id', '=', False)], limit=1)
+                if not date_range:
+                    logger.info('There is no date range with type %s starting on %s. Skipping commission generation for assignment ID %s', date_range_type.name, self.date_start, assignment.id)
+                    continue
+                date_range_type2date_range[date_range_type] = date_range
+            com_result = assignment._generate_commission_result(date_range_type2date_range[date_range_type], rules)
            if com_result:
                com_result_ids.append(com_result.id)
            else:
--- a/commission_simple/wizards/commission_compute_view.xml
+++ b/commission_simple/wizards/commission_compute_view.xml
@@ -15,10 +15,7 @@
            <group name="main">
                <field name="company_id" groups="base.group_multi_company"/>
                <field name="company_id" invisible="1"/>
-                <field name="date_range_type_id" invisible="1"/>
-                <field name="date_range_id"/>
                <field name="date_start"/>
-                <field name="date_end"/>
            </group>
            <footer>
                <button name="run" type="object" string="Compute"
@@ -36,6 +33,6 @@
    <field name="target">new</field>
 </record>

-<menuitem id="commission_compute_menu" action="commission_compute_action" parent="commission_root" sequence="15" groups="account.group_account_user"/>
+<menuitem id="commission_compute_menu" action="commission_compute_action" parent="commission_root" sequence="15"/>

 </odoo>
--- a/commission_simple/wizards/res_config_settings.py
+++ b/commission_simple/wizards/res_config_settings.py
@@ -1,12 +0,0 @@
-# Copyright 2019-2024 Akretion France (https://www.akretion.com/)
-# @author: Alexis de Lattre <alexis.delattre@akretion.com>
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    commission_date_range_type_id = fields.Many2one(
-        related='company_id.commission_date_range_type_id', readonly=False)
--- a/commission_simple_agent/manifest.py
+++ b/commission_simple_agent/manifest.py
@@ -4,7 +4,7 @@

 {
    'name': 'Commission Simple Agent',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
    'category': 'Sales',
    'license': 'AGPL-3',
    'summary': 'Glue module between commission_simple and sale_agent',
@@ -18,5 +18,5 @@
        'views/commission_profile.xml',
        'views/commission_result.xml',
        ],
-    'installable': False,
+    'installable': True,
 }
--- a/commission_simple_agent/views/commission_profile.xml
+++ b/commission_simple_agent/views/commission_profile.xml
@@ -11,8 +11,8 @@
    <field name="model">commission.profile</field>
    <field name="inherit_id" ref="commission_simple.commission_profile_form"/>
    <field name="arch" type="xml">
-        <xpath expr="//field[@name='assign_ids']/tree/field[@name='user_id']" position="after">
-            <field name="agent_id" attrs="{'required': [('assign_type', '=', 'agent')], 'readonly': [('assign_type', '!=', 'agent')]}"/>
+        <xpath expr="//field[@name='assign_ids']/list/field[@name='user_id']" position="after">
+            <field name="agent_id" required="assign_type == 'agent'" readonly="assign_type != 'agent'" context="{'default_agent': True}"/>
        </xpath>
    </field>
 </record>
--- a/commission_simple_agent/views/commission_result.xml
+++ b/commission_simple_agent/views/commission_result.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2024 Akretion France (http://www.akretion.com)
+  Copyright 2024 Akretion France (https://www.akretion.com)
  @author Alexis de Lattre <alexis.delattre@akretion.com>
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 -->

 <odoo>

-<record id="commission_result_tree" model="ir.ui.view">
+<record id="commission_result_list" model="ir.ui.view">
    <field name="model">commission.result</field>
-    <field name="inherit_id" ref="commission_simple.commission_result_tree"/>
+    <field name="inherit_id" ref="commission_simple.commission_result_list"/>
    <field name="arch" type="xml">
        <field name="assign_type" position="attributes">
-                <attribute name="decoration-danger">assign_type == 'agent'</attribute>
+            <attribute name="decoration-danger">assign_type == 'agent'</attribute>
        </field>
    </field>
 </record>
--- a/commission_simple_agent_purchase/manifest.py
+++ b/commission_simple_agent_purchase/manifest.py
@@ -4,7 +4,7 @@

 {
    'name': 'Commission Simple Agent Purchase',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
    'category': 'Sales',
    'license': 'AGPL-3',
    'summary': 'Glue module between commission_simple_agent and purchase',
@@ -16,7 +16,8 @@
        ],
    'data': [
        'views/commission_result.xml',
+        'views/commission_profile.xml',
        'wizards/res_config_settings.xml',
        ],
-    'installable': False,
+    'installable': True,
 }
--- a/commission_simple_agent_purchase/models/init.py
+++ b/commission_simple_agent_purchase/models/init.py
@@ -1,2 +1,3 @@
 from . import commission_result
+from . import commission_profile
 from . import res_company
--- a/commission_simple_agent_purchase/models/commission_profile.py
+++ b/commission_simple_agent_purchase/models/commission_profile.py
@@ -0,0 +1,20 @@
+# Copyright Akretion France (http://www.akretion.com/)
+# @author Alexis de Lattre <alexis.delattre@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+from odoo import fields, models, api, _
+from odoo.exceptions import ValidationError
+
+
+class CommissionProfile(models.Model):
+    _inherit = 'commission.profile'
+
+    commission_product_id = fields.Many2one(
+        'product.product', string='Specific Commission Product', ondelete='restrict',
+        check_company=True,
+        domain=[('type', '=', 'service')],
+        help="If not set, Odoo will use the commission product configured on the accounting "
+        "configuration page."
+        )
+
--- a/commission_simple_agent_purchase/models/commission_result.py
+++ b/commission_simple_agent_purchase/models/commission_result.py
@@ -5,6 +5,7 @@
 from odoo import fields, models, _
 from odoo.exceptions import UserError
 from odoo.tools.misc import format_amount, formatLang
+from markupsafe import Markup


 class CommissionResult(models.Model):
@@ -14,26 +15,34 @@ class CommissionResult(models.Model):

    def draft2done(self):
        for result in self:
-            if result.assign_type == 'agent':
+            if result.state == "draft" and result.assign_type == 'agent':
                if not result.purchase_id:
                    vals = result._prepare_purchase_order()
                    po = self.env['purchase.order'].create(vals)
+                    po.message_post(body=Markup(_("Generated from commission <a href=# data-oe-model=commission.result data-oe-id=%d>%s</a>.") % (result.id, result.display_name)))
                    result.write({'purchase_id': po.id})
                else:
                    po = self.purchase_id
                    if po.state in ('draft', 'sent', 'cancel'):
                        po.order_line.unlink()
+                        po.message_post(body=Markup(_("Purchase order lines re-generated from commission <a href=# data-oe-model=commission.result data-oe-id=%d>%s</a>.") % (result.id, result.display_name)))
                    else:
                        raise UserError(_("Purchase Order %s has already been confirmed. You should cancel it first.") % po.display_name)
                    if po.state == 'cancel':
                        po.button_draft()
                assert not po.order_line
                # create lines
-                if not result.company_id.commission_product_id:
-                    raise UserError(_("Commission product is not set on company %s.") % result.company_id.display_name)
                line_vals = []
-                for move_line in result.line_ids:
-                    line_vals.append(result._prepare_purchase_order_line(move_line, po))
+                if not result.company_id.commission_po_config:
+                    raise UserError(_(
+                        "Purchase order configuration for commission is not set on "
+                        "the accounting configuration page of company '%s'.")
+                        % result.company_id.display_name)
+                if result.company_id.commission_po_config == 'single_line':
+                    line_vals.append(result._prepare_purchase_order_line_single_line(po))
+                else:
+                    for move_line in result.line_ids:
+                        line_vals.append(result._prepare_purchase_order_line(move_line, po))
                po_lines = self.env['purchase.order.line'].create(line_vals)
                po_lines._compute_tax_id()
        return super().draft2done()
@@ -57,7 +66,13 @@ class CommissionResult(models.Model):
        company_currency = move_line.company_id.currency_id
        lang = self.partner_id.lang or self.env.lang
        env = self.with_context(lang=lang).env
-        product = self.company_id.commission_product_id
+        product = self.profile_id.commission_product_id or self.company_id.commission_product_id
+        if not product:
+            raise UserError(_(
+                "Commission product is not set on profile '%(profile)s' "
+                "nor on company '%(company)s'.",
+                profile=self.profile_id.display_name,
+                company=self.company_id.display_name))
        vals = {
            'order_id': order.id,
            'product_id': product.id,
@@ -68,6 +83,24 @@ class CommissionResult(models.Model):
            }
        return vals

+    def _prepare_purchase_order_line_single_line(self, order):
+        product = self.profile_id.commission_product_id or self.company_id.commission_product_id
+        if not product:
+            raise UserError(_(
+                "Commission product is not set on profile '%(profile)s' "
+                "nor on company '%(company)s'.",
+                profile=self.profile_id.display_name,
+                company=self.company_id.display_name))
+        vals = {
+            'order_id': order.id,
+            'product_id': product.id,
+            'name': _("Commissions for period %(period)s", period=self.date_range_id.name),
+            'product_qty': 1,
+            'product_uom': product.uom_id.id,
+            'price_unit': self.amount_total,
+            }
+        return vals
+
    def unlink(self):
        for result in self:
            if result.purchase_id:
--- a/commission_simple_agent_purchase/models/res_company.py
+++ b/commission_simple_agent_purchase/models/res_company.py
@@ -12,3 +12,7 @@ class ResCompany(models.Model):
    commission_product_id = fields.Many2one(
        'product.product', string='Commission Product', ondelete='restrict', check_company=True,
        domain=[('type', '=', 'service')])
+    commission_po_config = fields.Selection([
+        ('single_line', 'Single Line'),
+        ('details', 'One line per commission line'),
+        ], default='details', string="Purchase Order Configuration")
--- a/commission_simple_agent_purchase/views/commission_profile.xml
+++ b/commission_simple_agent_purchase/views/commission_profile.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2025 Akretion France (https://www.akretion.com)
+  @author Alexis de Lattre <alexis.delattre@akretion.com>
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+-->
+
+<odoo>
+
+<record id="commission_profile_form" model="ir.ui.view">
+    <field name="model">commission.profile</field>
+    <field name="inherit_id" ref="commission_simple_agent.commission_profile_form"/>
+    <field name="arch" type="xml">
+        <group name="main-right" position="inside">
+            <field name="commission_product_id"/>
+        </group>
+    </field>
+</record>
+
+
+</odoo>
+
--- a/commission_simple_agent_purchase/views/commission_result.xml
+++ b/commission_simple_agent_purchase/views/commission_result.xml
@@ -12,7 +12,7 @@
    <field name="inherit_id" ref="commission_simple.commission_result_form"/>
    <field name="arch" type="xml">
        <group name="main-right" position="inside">
-                <field name="purchase_id" attrs="{'invisible': [('assign_type', '!=', 'agent')]}"/>
+                <field name="purchase_id" invisible="assign_type != 'agent'"/>
        </group>
    </field>
 </record>
--- a/commission_simple_agent_purchase/wizards/res_config_settings.py
+++ b/commission_simple_agent_purchase/wizards/res_config_settings.py
@@ -10,3 +10,4 @@ class ResConfigSettings(models.TransientModel):

    commission_product_id = fields.Many2one(
        related='company_id.commission_product_id', readonly=False)
+    commission_po_config = fields.Selection(related="company_id.commission_po_config", readonly=False)
--- a/commission_simple_agent_purchase/wizards/res_config_settings.xml
+++ b/commission_simple_agent_purchase/wizards/res_config_settings.xml
@@ -11,13 +11,17 @@
 <record id="res_config_settings_view_form" model="ir.ui.view">
    <field name="name">commission.res.config.settings.form</field>
    <field name="model">res.config.settings</field>
-    <field name="inherit_id" ref="commission_simple.res_config_settings_view_form" />
+    <field name="inherit_id" ref="account.res_config_settings_view_form" />
    <field name="arch" type="xml">
-        <xpath expr="//div[@id='commission_simple-settings']/div[hasclass('o_setting_right_pane')]" position="inside">
-            <div class="row" id="commission_product_id">
-                <label for="commission_product_id" class="col-md-5" />
-                <field name="commission_product_id" context="{'default_detailed_type': 'service', 'default_purchase_ok': True, 'default_sale_ok': False, 'default_available_in_pos': False, 'default_purchase_method': 'purchase'}"/>
-            </div>
+        <xpath expr="//block[@id='analytic']" position="after">
+            <block title="Commissions" id="commission_simple">
+                <setting id="commission_product" title="Commission Product">
+                    <field name="commission_product_id" context="{'default_type': 'service', 'default_purchase_ok': True, 'default_sale_ok': False, 'default_available_in_pos': False, 'default_purchase_method': 'purchase'}"/>
+                </setting>
+                <setting id="commission_po_config" title="Purchase Order">
+                    <field name="commission_po_config" />
+                </setting>
+            </block>
        </xpath>
    </field>
 </record>
--- a/sale_agent/manifest.py
+++ b/sale_agent/manifest.py
@@ -4,7 +4,7 @@

 {
    'name': 'Sale Agent',
-    'version': '16.0.1.0.0',
+    'version': '18.0.1.0.0',
    'category': 'Sales',
    'license': 'AGPL-3',
    'summary': 'Add agent on partner, sale order and customer invoice/refund',
@@ -19,5 +19,5 @@
        "views/account_invoice_report.xml",
        ],
    'demo': ['demo/demo.xml'],
-    'installable': False,
+    'installable': True,
 }
--- a/sale_agent/demo/demo.xml
+++ b/sale_agent/demo/demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2020 Akretion France (http://www.akretion.com/)
+  Copyright 2024-2025 Akretion France (https://www.akretion.com/)
  @author: Alexis de Lattre <alexis.delattre@akretion.com>
  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
--- a/sale_agent/models/account_invoice_report.py
+++ b/sale_agent/models/account_invoice_report.py
@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from odoo import fields, models
+from odoo.tools import SQL


 class AccountInvoiceReport(models.Model):
@@ -11,5 +12,4 @@ class AccountInvoiceReport(models.Model):
    invoice_agent_id = fields.Many2one("res.partner", string="Agent", readonly=True)

    def _select(self):
-        select_str = super()._select()
-        return f"{select_str}, move.invoice_agent_id AS invoice_agent_id"
+        return SQL("%s, move.invoice_agent_id AS invoice_agent_id", super()._select())
--- a/sale_agent/views/res_partner.xml
+++ b/sale_agent/views/res_partner.xml
@@ -14,7 +14,7 @@
    <field name="inherit_id" ref="base.view_partner_form"/>
    <field name="arch" type="xml">
        <xpath expr="//page[@name='sales_purchases']//group[@name='sale']/field[@name='user_id']" name="user_id" position="after">
-            <field name="agent_id" attrs="{'invisible': [('parent_id', '!=', False)]}"/>
+            <field name="agent_id" invisible="parent_id"/>
        </xpath>
        <group name="misc" position="inside">
            <field name="agent"/>
Author	SHA1	Message	Date
Florian da Costa	b4efcdb2d7	[FIX] commission module installable	2025-11-13 15:46:58 +01:00
Florian da Costa	4b5385f391	[IMP] Add default agent boolean when creating an agent from the commission profile view	2025-11-13 11:29:33 +01:00
Florian da Costa	2f712cb05d	[FIX] chatter in commission result view + add action name for all commission related new actions	2025-11-13 11:29:24 +01:00
Florian da Costa	ee3546c2c1	[MIG] commission_simple_agent_purchase to 18	2025-11-13 11:29:20 +01:00
Benoît	7041ae1274	fix missing import	2025-11-13 11:29:13 +01:00
Benoît	6960d52220	mig report	2025-11-13 11:28:57 +01:00
Florian da Costa	faea568a6d	[MIG] commission_simple_agent : technical migration to 18	2025-11-13 11:28:51 +01:00
Florian da Costa	e0e3b601e5	[MIG] commission_simple to 18	2025-11-13 11:28:44 +01:00
Florian da Costa	5bd5f117e2	[MIG] sale_agent to v18	2025-11-13 11:28:38 +01:00
Alexis de Lattre	9c7505110b	[IMP] commission_simple: allow removal of commission lines	2025-11-13 11:28:13 +01:00
Alexis de Lattre	e39edc14c3	[IMP] commission_simple: allow to restart commission computation on the same period without deleting all commission results	2025-11-13 11:28:06 +01:00
Alexis de Lattre	ffcaff5ab0	[IMP] commission_simple: add index=True on the M2O of account.move.line This speeds-up the opening of commission results	2025-11-13 11:27:55 +01:00
Alexis de Lattre	b146d14485	[IMP] commission_simple: add commission_amount to account.invoice.report	2025-11-13 11:27:38 +01:00
Alexis de Lattre	635078f205	[IMP] commission_simple: fine-tune access rights	2025-11-13 11:24:03 +01:00
Alexis de Lattre	fadabd66b8	[IMP] commission_simple: periodicity moved from company to profile Update commission_simple_agent_purchase to adapt config page form view accordingly	2025-11-13 11:23:56 +01:00
Alexis de Lattre	988d63fac0	[IMP] commission_simple: validation from list view	2025-11-13 11:23:50 +01:00
Alexis de Lattre	b02ff59054	[IMP] commission_simple: add total base amount in view and XLSX report	2025-11-13 11:23:45 +01:00
Alexis de Lattre	7531143b45	[IMP] commission_simple: update fr translation	2025-11-13 11:23:36 +01:00
Alexis de Lattre	c530ea0e9a	[IMP] commission_simple: allow use of lambda in inherit of commission result lines	2025-11-13 11:23:28 +01:00
Alexis de Lattre	1060dd60f6	[IMP] commission_simple: XSLX report sorted by date (inheritable)	2025-11-13 11:23:16 +01:00
Alexis de Lattre	232cb24fd9	[IMP] commission_simple*: add XLSX report + improve PO generation Add message un chatter of PO	2025-11-13 11:23:09 +01:00
Alexis de Lattre	827119df6e	[IMP] commission_simple: improve views and add description for rule list views	2025-11-13 11:23:02 +01:00
Alexis de Lattre	a9a2ee5ec4	[IMP] agent: headers	2025-11-13 11:22:55 +01:00
Alexis de Lattre	f296a3edb8	[IMP] commission_simple: code cleanup and minor improvements	2025-11-13 11:22:47 +01:00