From 6b40f52190256edbd5207b0a045e068bf52f37cd Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 4 Jul 2023 17:53:59 +0200
Subject: [PATCH 1/5] edi: refactor model rules w/ specific model

Long awaited improvement.
Allows to decouple rules by model giving much more flexibility.
Migration steps included.
---
 edi_oca/__manifest__.py                       |   1 +
 .../migrations/14.0.1.19.0/post-migrate.py    |  34 +++++
 edi_oca/migrations/14.0.1.19.0/pre-migrate.py |  42 ++++++
 edi_oca/models/__init__.py                    |   1 +
 edi_oca/models/edi_exchange_consumer_mixin.py |  32 +++--
 edi_oca/models/edi_exchange_type.py           |  22 +---
 edi_oca/models/edi_exchange_type_rule.py      |  54 ++++++++
 edi_oca/readme/CONFIGURE.rst                  |  21 +++
 edi_oca/security/ir_model_access.xml          |  18 +++
 edi_oca/static/src/xml/widget_edi.xml         |  10 +-
 edi_oca/tests/test_consumer_mixin.py          |  73 +++++++----
 .../views/edi_exchange_type_rule_views.xml    | 121 ++++++++++++++++++
 edi_oca/views/edi_exchange_type_views.xml     |  21 +--
 edi_oca/views/menuitems.xml                   |   7 +
 14 files changed, 385 insertions(+), 72 deletions(-)
 create mode 100644 edi_oca/migrations/14.0.1.19.0/post-migrate.py
 create mode 100644 edi_oca/migrations/14.0.1.19.0/pre-migrate.py
 create mode 100644 edi_oca/models/edi_exchange_type_rule.py
 create mode 100644 edi_oca/views/edi_exchange_type_rule_views.xml

diff --git a/edi_oca/__manifest__.py b/edi_oca/__manifest__.py
index 124eb84d80..ac6fcaac18 100644
--- a/edi_oca/__manifest__.py
+++ b/edi_oca/__manifest__.py
@@ -35,6 +35,7 @@
         "views/edi_backend_type_views.xml",
         "views/edi_exchange_record_views.xml",
         "views/edi_exchange_type_views.xml",
+        "views/edi_exchange_type_rule_views.xml",
         "views/menuitems.xml",
         "templates/exchange_chatter_msg.xml",
         "templates/exchange_mixin_buttons.xml",
diff --git a/edi_oca/migrations/14.0.1.19.0/post-migrate.py b/edi_oca/migrations/14.0.1.19.0/post-migrate.py
new file mode 100644
index 0000000000..95a944823d
--- /dev/null
+++ b/edi_oca/migrations/14.0.1.19.0/post-migrate.py
@@ -0,0 +1,34 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# @author Simone Orsi <simahawk@gmail.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+import logging
+
+from odoo import SUPERUSER_ID, api, tools
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    bkp_table = "exc_type_model_rel_bkp"
+    if not tools.sql.table_exists(cr, bkp_table):
+        return
+
+    # Use backup table (created by pre-migrate step) to create type rules
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    query = """
+        SELECT * FROM exc_type_model_rel_bkp
+    """
+    cr.execute(query)
+    res = cr.dictfetchall()
+    model = env["edi.exchange.type.rule"]
+    for item in res:
+        kind = "form_btn" if item.pop("form_btn", False) else "custom"
+        vals = dict(item, name="Default", kind=kind)
+        model.create(vals)
+
+    cr.execute("DROP TABLE exc_type_model_rel_bkp")
+    _logger.info("edi.exchange.type.rule created")
diff --git a/edi_oca/migrations/14.0.1.19.0/pre-migrate.py b/edi_oca/migrations/14.0.1.19.0/pre-migrate.py
new file mode 100644
index 0000000000..61419f1d88
--- /dev/null
+++ b/edi_oca/migrations/14.0.1.19.0/pre-migrate.py
@@ -0,0 +1,42 @@
+# Copyright 2023 Camptocamp SA (http://www.camptocamp.com)
+# @author Simone Orsi <simahawk@gmail.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+import logging
+
+from odoo import tools
+
+_logger = logging.getLogger(__name__)
+
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    # Backup old style rules to be used later on post migrate
+    old_table = "edi_exchange_type_ir_model_rel"
+    if not tools.sql.table_exists(cr, old_table):
+        return
+    bkp_table = "exc_type_model_rel_bkp"
+    if tools.sql.table_exists(cr, bkp_table):
+        return
+
+    bkp_query = """
+    CREATE TABLE IF NOT EXISTS
+        exc_type_model_rel_bkp
+    AS
+        SELECT
+            rel.ir_model_id as model_id,
+            type.id as type_id,
+            type.enable_domain as enable_domain,
+            type.enable_snippet as enable_snippet,
+            type.model_manual_btn as form_btn
+        FROM
+            edi_exchange_type type,
+            edi_exchange_type_ir_model_rel rel
+        WHERE
+            rel.edi_exchange_type_id = type.id;
+    """
+    cr.execute(bkp_query)
+
+    _logger.info("edi.exchange.type old style rules backed up")
diff --git a/edi_oca/models/__init__.py b/edi_oca/models/__init__.py
index b3961f232f..f40b0abe1e 100644
--- a/edi_oca/models/__init__.py
+++ b/edi_oca/models/__init__.py
@@ -3,4 +3,5 @@
 from . import edi_exchange_record
 from . import edi_exchange_consumer_mixin
 from . import edi_exchange_type
+from . import edi_exchange_type_rule
 from . import edi_id_mixin
diff --git a/edi_oca/models/edi_exchange_consumer_mixin.py b/edi_oca/models/edi_exchange_consumer_mixin.py
index a5430e635b..7085d29d9b 100644
--- a/edi_oca/models/edi_exchange_consumer_mixin.py
+++ b/edi_oca/models/edi_exchange_consumer_mixin.py
@@ -58,34 +58,42 @@ def _compute_edi_config(self):
             record.edi_has_form_config = any([x.get("form") for x in config.values()])
 
     def _edi_get_exchange_type_config(self):
-        exchange_types = (
-            self.env["edi.exchange.type"]
+        # TODO: move this machinery to the rule model
+        rules = (
+            self.env["edi.exchange.type.rule"]
             .sudo()
-            .search([("model_ids.model", "=", self._name)])
+            .search([("model_id.model", "=", self._name)])
         )
         result = {}
-        for exchange_type in exchange_types:
+        for rule in rules:
+            exchange_type = rule.type_id
             eval_ctx = dict(
                 self._get_eval_context(), record=self, exchange_type=exchange_type
             )
-            domain = safe_eval.safe_eval(exchange_type.enable_domain or "[]", eval_ctx)
+            domain = safe_eval.safe_eval(rule.enable_domain or "[]", eval_ctx)
             if not self.filtered_domain(domain):
                 continue
-            if exchange_type.enable_snippet:
+            if rule.enable_snippet:
                 safe_eval.safe_eval(
-                    exchange_type.enable_snippet, eval_ctx, mode="exec", nocopy=True
+                    rule.enable_snippet, eval_ctx, mode="exec", nocopy=True
                 )
                 if not eval_ctx.get("result", False):
                     continue
 
-            result[exchange_type.id] = self._edi_get_exchange_type_conf(exchange_type)
+            result[rule.id] = self._edi_get_exchange_type_rule_conf(rule)
         return result
 
     @api.model
-    def _edi_get_exchange_type_conf(self, exchange_type):
-        conf = {"form": {}}
-        if exchange_type.model_manual_btn:
-            conf.update({"form": {"btn": {"label": exchange_type.name}}})
+    def _edi_get_exchange_type_rule_conf(self, rule):
+        conf = {
+            "form": {},
+            "type": {
+                "id": rule.type_id.id,
+                "name": rule.type_id.name,
+            },
+        }
+        if rule.kind == "form_btn":
+            conf.update({"form": {"btn": {"label": rule.type_id.name}}})
         return conf
 
     def _get_eval_context(self):
diff --git a/edi_oca/models/edi_exchange_type.py b/edi_oca/models/edi_exchange_type.py
index f5a8af86bc..aeaef7ed5a 100644
--- a/edi_oca/models/edi_exchange_type.py
+++ b/edi_oca/models/edi_exchange_type.py
@@ -111,24 +111,10 @@ class EDIExchangeType(models.Model):
         """,
     )
     advanced_settings = Serialized(default={}, compute="_compute_advanced_settings")
-    model_ids = fields.Many2many(
-        "ir.model",
-        help="""Modules to be checked for manual EDI generation""",
-    )
-    enable_domain = fields.Char(
-        string="Enable on domain", help="""Filter domain to be checked on Models"""
-    )
-    enable_snippet = fields.Char(
-        string="Enable on snippet",
-        help="""Snippet of code to be checked on Models,
-        You can use `record` and `exchange_type` here.
-        It will be executed if variable result has been defined as True
-        """,
-    )
-    model_manual_btn = fields.Boolean(
-        string="Manual button on form",
-        help="Automatically display a button on related models' form."
-        # TODO: "Button settings can be configured via advanced settings."
+    rule_ids = fields.One2many(
+        comodel_name="edi.exchange.type.rule",
+        inverse_name="type_id",
+        help="Rules to handle exchanges and UI automatically",
     )
     quick_exec = fields.Boolean(
         string="Quick execution",
diff --git a/edi_oca/models/edi_exchange_type_rule.py b/edi_oca/models/edi_exchange_type_rule.py
new file mode 100644
index 0000000000..8f65b77729
--- /dev/null
+++ b/edi_oca/models/edi_exchange_type_rule.py
@@ -0,0 +1,54 @@
+# Copyright 2023 Camptocamp SA
+# @author Simone Orsi <simahawk@gmail.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import fields, models
+
+KIND_HELP = """
+* Form button: show a button on the related model form
+  when conditions from domain and snippet are satisfied
+
+* Custom: let devs handle a custom behavior with specific developments
+"""
+
+
+class EDIExchangeTypeRule(models.Model):
+    """
+    Define rules for exchange types.
+    """
+
+    _name = "edi.exchange.type.rule"
+    _description = "EDI Exchange type rule"
+
+    active = fields.Boolean(default=True)
+    name = fields.Char(required=True)
+    type_id = fields.Many2one(
+        comodel_name="edi.exchange.type",
+        required=True,
+        ondelete="cascade",
+    )
+    model_id = fields.Many2one(
+        comodel_name="ir.model",
+        help="Apply to this model",
+        ondelete="cascade",
+    )
+    model = fields.Char(related="model_id.model")  # Tech field
+    enable_domain = fields.Char(
+        string="Enable on domain", help="Filter domain to be checked on Models"
+    )
+    enable_snippet = fields.Char(
+        string="Enable on snippet",
+        help="""Snippet of code to be checked on Models,
+        You can use `record` and `exchange_type` here.
+        It will be executed if variable result has been defined as True
+        """,
+    )
+    kind = fields.Selection(
+        selection=[
+            ("form_btn", "Form button"),
+            ("custom", "Custom"),
+        ],
+        required=True,
+        default="form_btn",
+        help=KIND_HELP,
+    )
diff --git a/edi_oca/readme/CONFIGURE.rst b/edi_oca/readme/CONFIGURE.rst
index c65c8e743b..acf6a0d286 100644
--- a/edi_oca/readme/CONFIGURE.rst
+++ b/edi_oca/readme/CONFIGURE.rst
@@ -27,3 +27,24 @@ snippet of code.
 After defining this fields, we will automatically see buttons on the view to generate
 the exchange records.
 This configuration is useful to define a way of generation managed by user.
+
+
+Exchange type rules configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Exchange types can be further configured with rules.
+You can use rules to:
+
+1. make buttons automatically appear in forms
+2. define your own custom logic
+
+Go to an exchange type and go to the tab "Model rules".
+There you can add one or more rule, one per model.
+On each rule you can define a domain or a snippet to activate it.
+In case of a "Form button" kind, if the domain and/ the snippet is/are satisfied,
+a form btn will appear on the top of the form.
+This button can be used by the end user to manually generate an exchange.
+If there's more than a backend and the exchange type has not a backend set,
+a wizard will appear asking to select a backend to be used for the exchange.
+
+In case of "Custom" kind, you'll have to define your own logic to do something.
diff --git a/edi_oca/security/ir_model_access.xml b/edi_oca/security/ir_model_access.xml
index 19dfacd511..83970fb3c5 100644
--- a/edi_oca/security/ir_model_access.xml
+++ b/edi_oca/security/ir_model_access.xml
@@ -27,6 +27,15 @@
         <field name="perm_write" eval="1" />
         <field name="perm_unlink" eval="1" />
     </record>
+    <record model="ir.model.access" id="access_edi_exchange_type_rule_manager">
+        <field name="name">access_edi_exchange_type_rule manager</field>
+        <field name="model_id" ref="model_edi_exchange_type_rule" />
+        <field name="group_id" ref="base_edi.group_edi_manager" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="1" />
+        <field name="perm_write" eval="1" />
+        <field name="perm_unlink" eval="1" />
+    </record>
     <record model="ir.model.access" id="access_edi_exchange_record_manager">
         <field name="name">access_edi_exchange_record manager</field>
         <field name="model_id" ref="model_edi_exchange_record" />
@@ -63,6 +72,15 @@
         <field name="perm_write" eval="0" />
         <field name="perm_unlink" eval="0" />
     </record>
+    <record model="ir.model.access" id="access_edi_exchange_type_rule_user">
+        <field name="name">access_edi_exchange_type_rule user</field>
+        <field name="model_id" ref="model_edi_exchange_type_rule" />
+        <field name="group_id" ref="base.group_user" />
+        <field name="perm_read" eval="1" />
+        <field name="perm_create" eval="0" />
+        <field name="perm_write" eval="0" />
+        <field name="perm_unlink" eval="0" />
+    </record>
     <record model="ir.model.access" id="access_edi_exchange_record_user">
         <field name="name">access_edi_exchange_record user</field>
         <field name="model_id" ref="model_edi_exchange_record" />
diff --git a/edi_oca/static/src/xml/widget_edi.xml b/edi_oca/static/src/xml/widget_edi.xml
index ebcf9ad3ff..5840c31ed0 100644
--- a/edi_oca/static/src/xml/widget_edi.xml
+++ b/edi_oca/static/src/xml/widget_edi.xml
@@ -2,13 +2,13 @@
 <templates id="template" xml:space="preserve">
     <t t-name="edi_oca.FieldEdiConfiguration">
         <div>
-            <t t-foreach="widget.value" t-as="key">
-                <t t-set="data" t-value="widget.value[key]" />
-                <t t-if="!_.isEmpty(data.form)">
-                    <t t-set="btn" t-value="data.form.btn" />
+            <t t-foreach="widget.value" t-as="rule_id">
+                <t t-set="rule" t-value="widget.value[rule_id]" />
+                <t t-if="!_.isEmpty(rule.form)">
+                    <t t-set="btn" t-value="rule.form.btn" />
                     <button
                         t-if="btn"
-                        t-att-data-type-id="key"
+                        t-att-data-type-id="rule.type.id"
                         t-attf-class="o_edi_create_exchange_record btn #{btn.class != null ? btn.class : 'btn-sm btn-secondary'}"
                         type="object"
                     >
diff --git a/edi_oca/tests/test_consumer_mixin.py b/edi_oca/tests/test_consumer_mixin.py
index c500eca3e5..4041adf900 100644
--- a/edi_oca/tests/test_consumer_mixin.py
+++ b/edi_oca/tests/test_consumer_mixin.py
@@ -1,5 +1,7 @@
 # Copyright 2020 Creu Blanca
 # @author: Enric Tobella
+# Copyright 2020 Camptocamp SA
+# @author: Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 import os
@@ -30,6 +32,16 @@ def _setup_records(cls):
             {"name": "Test Consumer"}
         )
         cls.exchange_type_out.exchange_filename_pattern = "{record.id}"
+
+        rule_vals = {
+            "name": "Test",
+            "model_id": cls.env["ir.model"]._get_id(cls.consumer_record._name),
+            "kind": "custom",
+            "enable_domain": "[]",
+            "enable_snippet": """
+result = not record._has_exchange_record(exchange_type)
+""",
+        }
         cls.exchange_type_new = cls._create_exchange_type(
             name="Test CSV output",
             code="test_csv_new_output",
@@ -37,26 +49,18 @@ def _setup_records(cls):
             exchange_file_ext="csv",
             backend_id=False,
             exchange_filename_pattern="{record.ref}-{type.code}-{dt}",
-            model_ids=[(4, cls.env["ir.model"]._get_id(cls.consumer_record._name))],
-            enable_domain="[]",
-            enable_snippet="""
-result = not record._has_exchange_record(exchange_type)
-""",
-        )
-        cls.exchange_type_out.write(
-            {
-                "model_ids": [
-                    (
-                        4,
-                        cls.env["ir.model"]._get_id(cls.consumer_record._name),
-                    )
-                ],
-                "enable_domain": "[]",
-                "enable_snippet": """
+            rule_ids=[(0, 0, rule_vals)],
+        )
+        rule_vals = {
+            "name": "Test",
+            "model_id": cls.env["ir.model"]._get_id(cls.consumer_record._name),
+            "kind": "custom",
+            "enable_domain": "[]",
+            "enable_snippet": """
 result = not record._has_exchange_record(exchange_type, exchange_type.backend_id)
 """,
-            }
-        )
+        }
+        cls.exchange_type_out.write({"rule_ids": [(0, 0, rule_vals)]})
         cls.backend_02 = cls.backend.copy()
 
     @classmethod
@@ -98,17 +102,30 @@ def test_origin(self):
 
     def test_expected_configuration(self):
         # no btn enabled
+
+        def make_config_data(**kw):
+            data = {
+                "form": {},
+                "type": {
+                    "id": self.exchange_type_out.id,
+                    "name": self.exchange_type_out.name,
+                },
+            }
+            data.update(kw)
+            return data
+
+        rule = self.exchange_type_out.rule_ids[0]
         self.assertFalse(self.consumer_record.edi_has_form_config)
         self.assertEqual(
-            self.consumer_record.edi_config[str(self.exchange_type_out.id)],
-            {"form": {}},
+            self.consumer_record.edi_config[str(rule.id)],
+            make_config_data(),
         )
         # enable it
-        self.exchange_type_out.model_manual_btn = True
+        self.exchange_type_out.rule_ids.kind = "form_btn"
         self.consumer_record.invalidate_cache(["edi_has_form_config", "edi_config"])
         self.assertEqual(
-            self.consumer_record.edi_config[str(self.exchange_type_out.id)],
-            {"form": {"btn": {"label": self.exchange_type_out.name}}},
+            self.consumer_record.edi_config[str(rule.id)],
+            make_config_data(form={"btn": {"label": self.exchange_type_out.name}}),
         )
         action = self.consumer_record.edi_create_exchange_record(
             self.exchange_type_out.id
@@ -116,7 +133,7 @@ def test_expected_configuration(self):
         self.assertEqual(action["res_model"], "edi.exchange.record")
         self.consumer_record.refresh()
         self.assertNotIn(
-            str(self.exchange_type_out.id),
+            str(rule.id),
             self.consumer_record.edi_config,
         )
         self.assertTrue(self.consumer_record.exchange_record_ids)
@@ -125,8 +142,9 @@ def test_expected_configuration(self):
         )
 
     def test_multiple_backend(self):
+        rule = self.exchange_type_new.rule_ids[0]
         self.assertIn(
-            str(self.exchange_type_new.id),
+            str(rule.id),
             self.consumer_record.edi_config,
         )
         action = self.consumer_record.edi_create_exchange_record(
@@ -142,7 +160,7 @@ def test_multiple_backend(self):
         wizard.create_edi()
         self.consumer_record.refresh()
         self.assertNotIn(
-            str(self.exchange_type_new.id),
+            str(rule.id),
             self.consumer_record.edi_config,
         )
         self.assertTrue(self.consumer_record.exchange_record_ids)
@@ -151,7 +169,8 @@ def test_multiple_backend(self):
         )
 
     def test_form(self):
-        """Testing that the form has inherited the fields and inserted them
+        """Testing that the form has inherited the fields and inserted them.
+
         Unfortunately we are unable to test the buttons here
         """
         with Form(self.consumer_record) as f:
diff --git a/edi_oca/views/edi_exchange_type_rule_views.xml b/edi_oca/views/edi_exchange_type_rule_views.xml
new file mode 100644
index 0000000000..7dcbe166ee
--- /dev/null
+++ b/edi_oca/views/edi_exchange_type_rule_views.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="edi_exchange_type_rule_view_tree" model="ir.ui.view">
+        <field name="model">edi.exchange.type.rule</field>
+        <field name="arch" type="xml">
+            <tree decoration-muted="(not active)">
+                <field name="active" invisible="1" />
+                <field name="type_id" />
+                <field name="model_id" />
+                <field name="name" />
+                <field name="kind" />
+            </tree>
+        </field>
+    </record>
+    <record id="edi_exchange_type_rule_view_form" model="ir.ui.view">
+        <field name="model">edi.exchange.type.rule</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="active" invisible="1" />
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group name="wrapper">
+                        <group name="config">
+                            <field
+                                name="type_id"
+                                invisible="context.get('default_type_id')"
+                            />
+                            <field name="model_id" />
+                            <field name="model" invisible="1" />
+                            <field name="kind" />
+                        </group>
+                            <field name="enable_snippet" />
+                    </group>
+                    <notebook>
+                        <page
+                            name="domain"
+                            string="Domain"
+                            groups="edi_oca.group_edi_advanced_settings_manager"
+                        >
+                            <field
+                                name="enable_domain"
+                                widget="domain"
+                                options="{'model': 'model', 'in_dialog': true}"
+                            />
+                        </page>
+                        <page
+                            name="snippet"
+                            string="Snippet"
+                            groups="edi_oca.group_edi_advanced_settings_manager"
+                        >
+                            <field name="enable_snippet" />
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="edi_exchange_type_rule_view_search" model="ir.ui.view">
+        <field name="model">edi.exchange.type.rule</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" />
+                <field name="type_id" />
+                <field name="model_id" />
+                <field name="kind" />
+                <filter
+                    name="filter_all"
+                    string="All"
+                    domain="['|', ('active', '=', True), ('active', '=', False)]"
+                />
+                <filter
+                    name="filter_active"
+                    string="Active"
+                    domain="[('active', '=', True)]"
+                />
+                <filter
+                    name="filter_archived"
+                    string="Archived"
+                    domain="[('active', '=', False)]"
+                />
+                <group expand="0" string="Group By">
+                    <filter
+                        name="group_by_type_id"
+                        string="Exchange type"
+                        context="{'group_by': 'type_id'}"
+                    />
+                    <filter
+                        name="group_by_model_id"
+                        string="Model"
+                        context="{'group_by': 'model_id'}"
+                    />
+                    <filter
+                        name="group_by_kind"
+                        string="Kind"
+                        context="{'group_by': 'kind'}"
+                    />
+                </group>
+            </search>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="act_open_edi_exchange_type_rule_view">
+        <field name="name">EDI Exchange Type Rule</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">edi.exchange.type.rule</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="edi_exchange_type_rule_view_search" />
+        <field name="domain">[]</field>
+        <field name="context">{'search_default_filter_all': 1}</field>
+    </record>
+</odoo>
diff --git a/edi_oca/views/edi_exchange_type_views.xml b/edi_oca/views/edi_exchange_type_views.xml
index 0a358df2ac..c3ed3abe4d 100644
--- a/edi_oca/views/edi_exchange_type_views.xml
+++ b/edi_oca/views/edi_exchange_type_views.xml
@@ -67,16 +67,17 @@
                             string="Model rules"
                             groups="edi_oca.group_edi_advanced_settings_manager"
                         >
-                            <group>
-                                <field name="model_ids" widget="many2many_tags" />
-                                <field name="enable_domain" />
-                                <field
-                                    name="enable_snippet"
-                                    widget="ace"
-                                    options="{'mode': 'python'}"
-                                />
-                                <field name="model_manual_btn" />
-                            </group>
+                            <field
+                                name="rule_ids"
+                                context="{'default_type_id': active_id}"
+                            >
+                                <tree decoration-muted="(not active)">
+                                    <field name="active" invisible="1" />
+                                    <field name="name" />
+                                    <field name="model_id" />
+                                    <field name="kind" />
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/edi_oca/views/menuitems.xml b/edi_oca/views/menuitems.xml
index bcc77776b9..7421f7ab0f 100644
--- a/edi_oca/views/menuitems.xml
+++ b/edi_oca/views/menuitems.xml
@@ -73,4 +73,11 @@
         sequence="30"
         action="act_open_edi_exchange_type_view"
     />
+    <menuitem
+        id="menu_edi_exchange_type_rule"
+        parent="menu_edi_config"
+        name="Exchange type rules"
+        sequence="40"
+        action="act_open_edi_exchange_type_rule_view"
+    />
 </odoo>

From f0e5616eaf06cd50b7ac8798e016cdcde3b0bb1a Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 4 Jul 2023 17:54:15 +0200
Subject: [PATCH 2/5] edi: unify menu item labels

---
 edi_oca/views/menuitems.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/edi_oca/views/menuitems.xml b/edi_oca/views/menuitems.xml
index 7421f7ab0f..3842809d31 100644
--- a/edi_oca/views/menuitems.xml
+++ b/edi_oca/views/menuitems.xml
@@ -64,12 +64,14 @@
     <menuitem
         id="menu_edi_backend_type"
         parent="menu_edi_config"
+        name="Backend types"
         sequence="20"
         action="act_open_edi_backend_type_view"
     />
     <menuitem
         id="menu_edi_exchange_type"
         parent="menu_edi_config"
+        name="Exchange types"
         sequence="30"
         action="act_open_edi_exchange_type_view"
     />

From cfb5e0ec9029fb49ad5b23cdb68a4be718cc4c3c Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 4 Jul 2023 17:55:14 +0200
Subject: [PATCH 3/5] edi: allow form btn actions customization

You can now customize and translate labels and tooltips for EDI automatic buttons.
---
 edi_oca/models/edi_exchange_consumer_mixin.py  | 5 ++++-
 edi_oca/models/edi_exchange_type_rule.py       | 8 ++++++++
 edi_oca/static/src/xml/widget_edi.xml          | 1 +
 edi_oca/templates/exchange_mixin_buttons.xml   | 2 +-
 edi_oca/tests/test_consumer_mixin.py           | 4 +++-
 edi_oca/views/edi_exchange_type_rule_views.xml | 9 ++++++++-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/edi_oca/models/edi_exchange_consumer_mixin.py b/edi_oca/models/edi_exchange_consumer_mixin.py
index 7085d29d9b..d8e3538683 100644
--- a/edi_oca/models/edi_exchange_consumer_mixin.py
+++ b/edi_oca/models/edi_exchange_consumer_mixin.py
@@ -93,7 +93,10 @@ def _edi_get_exchange_type_rule_conf(self, rule):
             },
         }
         if rule.kind == "form_btn":
-            conf.update({"form": {"btn": {"label": rule.type_id.name}}})
+            label = rule.form_btn_label or rule.type_id.name
+            conf.update(
+                {"form": {"btn": {"label": label, "tooltip": rule.form_btn_tooltip}}}
+            )
         return conf
 
     def _get_eval_context(self):
diff --git a/edi_oca/models/edi_exchange_type_rule.py b/edi_oca/models/edi_exchange_type_rule.py
index 8f65b77729..8098493721 100644
--- a/edi_oca/models/edi_exchange_type_rule.py
+++ b/edi_oca/models/edi_exchange_type_rule.py
@@ -52,3 +52,11 @@ class EDIExchangeTypeRule(models.Model):
         default="form_btn",
         help=KIND_HELP,
     )
+    form_btn_label = fields.Char(
+        string="Form button label", translate=True, help="Type name used by default"
+    )
+    form_btn_tooltip = fields.Text(
+        string="Form button tooltip",
+        translate=True,
+        help="Help message visible as tooltip on button h-over",
+    )
diff --git a/edi_oca/static/src/xml/widget_edi.xml b/edi_oca/static/src/xml/widget_edi.xml
index 5840c31ed0..278610eca4 100644
--- a/edi_oca/static/src/xml/widget_edi.xml
+++ b/edi_oca/static/src/xml/widget_edi.xml
@@ -9,6 +9,7 @@
                     <button
                         t-if="btn"
                         t-att-data-type-id="rule.type.id"
+                        t-att-title="btn.tooltip"
                         t-attf-class="o_edi_create_exchange_record btn #{btn.class != null ? btn.class : 'btn-sm btn-secondary'}"
                         type="object"
                     >
diff --git a/edi_oca/templates/exchange_mixin_buttons.xml b/edi_oca/templates/exchange_mixin_buttons.xml
index 1fb9f1fb7f..fc2dc0efa7 100644
--- a/edi_oca/templates/exchange_mixin_buttons.xml
+++ b/edi_oca/templates/exchange_mixin_buttons.xml
@@ -9,7 +9,7 @@
             attrs="{'invisible': [('edi_has_form_config', '=', False)]}"
         >
             <div>
-                <i class="fa fa-retweet" />This record has EDI exchanges to handle
+                <span class="pr-4"><i class="fa fa-retweet" /> EDI actions</span>
                 <field name="edi_config" widget="edi_configuration" />
                 <field name="edi_has_form_config" invisible="1" />
             </div>
diff --git a/edi_oca/tests/test_consumer_mixin.py b/edi_oca/tests/test_consumer_mixin.py
index 4041adf900..931c239fa6 100644
--- a/edi_oca/tests/test_consumer_mixin.py
+++ b/edi_oca/tests/test_consumer_mixin.py
@@ -125,7 +125,9 @@ def make_config_data(**kw):
         self.consumer_record.invalidate_cache(["edi_has_form_config", "edi_config"])
         self.assertEqual(
             self.consumer_record.edi_config[str(rule.id)],
-            make_config_data(form={"btn": {"label": self.exchange_type_out.name}}),
+            make_config_data(
+                form={"btn": {"label": self.exchange_type_out.name, "tooltip": False}}
+            ),
         )
         action = self.consumer_record.edi_create_exchange_record(
             self.exchange_type_out.id
diff --git a/edi_oca/views/edi_exchange_type_rule_views.xml b/edi_oca/views/edi_exchange_type_rule_views.xml
index 7dcbe166ee..a287205f8a 100644
--- a/edi_oca/views/edi_exchange_type_rule_views.xml
+++ b/edi_oca/views/edi_exchange_type_rule_views.xml
@@ -40,7 +40,14 @@
                             <field name="model" invisible="1" />
                             <field name="kind" />
                         </group>
-                            <field name="enable_snippet" />
+                        <group
+                            name="form"
+                            string="Form"
+                            attrs="{'invisible': [('kind', '!=', 'form_btn')]}"
+                        >
+                            <field name="form_btn_label" />
+                            <field name="form_btn_tooltip" />
+                        </group>
                     </group>
                     <notebook>
                         <page

From 72a732740a6e4108252166d728094c4518f24bdb Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 9 Aug 2023 17:37:46 +0200
Subject: [PATCH 4/5] edi: refactor model rules backward compat

---
 .../migrations/14.0.1.19.0/post-migrate.py    |   3 +-
 edi_oca/models/edi_exchange_type.py           | 134 ++++++++++++++++++
 edi_oca/tests/__init__.py                     |   1 +
 .../test_exchange_type_deprecated_fields.py   |  43 ++++++
 edi_oca/views/edi_exchange_type_views.xml     |  33 +++++
 5 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 edi_oca/tests/test_exchange_type_deprecated_fields.py

diff --git a/edi_oca/migrations/14.0.1.19.0/post-migrate.py b/edi_oca/migrations/14.0.1.19.0/post-migrate.py
index 95a944823d..8c8b6a8b91 100644
--- a/edi_oca/migrations/14.0.1.19.0/post-migrate.py
+++ b/edi_oca/migrations/14.0.1.19.0/post-migrate.py
@@ -28,7 +28,8 @@ def migrate(cr, version):
     for item in res:
         kind = "form_btn" if item.pop("form_btn", False) else "custom"
         vals = dict(item, name="Default", kind=kind)
-        model.create(vals)
+        rec = model.create(vals)
+        rec.type_id.button_wipe_deprecated_rule_fields()
 
     cr.execute("DROP TABLE exc_type_model_rel_bkp")
     _logger.info("edi.exchange.type.rule created")
diff --git a/edi_oca/models/edi_exchange_type.py b/edi_oca/models/edi_exchange_type.py
index aeaef7ed5a..db09a74198 100644
--- a/edi_oca/models/edi_exchange_type.py
+++ b/edi_oca/models/edi_exchange_type.py
@@ -116,6 +116,28 @@ class EDIExchangeType(models.Model):
         inverse_name="type_id",
         help="Rules to handle exchanges and UI automatically",
     )
+    # Deprecated fields for rules - begin
+    # These fields have been deprecated in
+    # https://github.com/OCA/edi/pull/797
+    # but are kept for backward compat.
+    # If you can stop using them now.
+    # Anyway, annoying warning messages will be logged.
+    # See inverse methods.
+    # NOTE: old configurations are migrated automatically on upgrade
+    # Yet, if you have data files they might be broken
+    # if we delete these fields.
+    model_ids = fields.Many2many(
+        "ir.model", inverse="_inverse_deprecated_rules_model_ids"
+    )
+    enable_domain = fields.Char(inverse="_inverse_deprecated_rules_enable_domain")
+    enable_snippet = fields.Char(inverse="_inverse_deprecated_rules_enable_snippet")
+    model_manual_btn = fields.Boolean(
+        inverse="_inverse_deprecated_rules_model_manual_btn"
+    )
+    deprecated_rule_fields_still_used = fields.Boolean(
+        compute="_compute_deprecated_rule_fields_still_used"
+    )
+    # Deprecated fields for rules - end
     quick_exec = fields.Boolean(
         string="Quick execution",
         help="When active, records of this type will be processed immediately "
@@ -226,3 +248,115 @@ def is_partner_enabled(self, partner):
         if exc_type.partner_ids:
             return partner.id in exc_type.partner_ids.ids
         return True
+
+    # API to support deprecated model rules fields - begin
+    def _inverse_deprecated_rules_warning(self):
+        _fields = ", ".join(
+            ["model_ids", "enable_domain", "enable_snippet", "model_manual_btn"]
+        )
+        _logger.warning(
+            "The fields %s are deprecated, "
+            "please stop using them in favor of edi.exchange.type.rule",
+            _fields,
+        )
+
+    def _inverse_deprecated_rules_model_ids(self):
+        if self.env.context.get("deprecated_rule_fields_bypass_inverse"):
+            return
+        self._inverse_deprecated_rules_warning()
+        for rec in self:
+            for model in rec.model_ids:
+                rule = rec._get_rule_by_model(model)
+                if not rule:
+                    _logger.warning(
+                        "New rule for %s created from deprecated `model_ids`",
+                        model.model,
+                    )
+                    rec.rule_ids += rec._inverse_deprecated_rules_create(model)
+            rules_to_delete = rec.rule_ids.browse()
+            for rule in rec.rule_ids:
+                if rule.model_id not in rec.model_ids:
+                    _logger.warning(
+                        "Rule for %s deleted from deprecated `model_ids`",
+                        rule.model_id.model,
+                    )
+                    rules_to_delete |= rule
+            rules_to_delete.unlink()
+
+    def _inverse_deprecated_rules_enable_domain(self):
+        if self.env.context.get("deprecated_rule_fields_bypass_inverse"):
+            return
+        self._inverse_deprecated_rules_warning()
+        for rec in self:
+            for model in rec.model_ids:
+                rule = rec._get_rule_by_model(model)
+                if rule:
+                    _logger.warning(
+                        "Rule for %s domain updated from deprecated `enable_domain`",
+                        model.model,
+                    )
+                    rule.enable_domain = rec.enable_domain
+
+    def _inverse_deprecated_rules_enable_snippet(self):
+        if self.env.context.get("deprecated_rule_fields_bypass_inverse"):
+            return
+        self._inverse_deprecated_rules_warning()
+        for rec in self:
+            for model in rec.model_ids:
+                rule = rec._get_rule_by_model(model)
+                if rule:
+                    _logger.warning(
+                        "Rule for %s snippet updated from deprecated `enable_snippet`",
+                        model.model,
+                    )
+                    rule.enable_snippet = rec.enable_snippet
+
+    def _inverse_deprecated_rules_model_manual_btn(self):
+        if self.env.context.get("deprecated_rule_fields_bypass_inverse"):
+            return
+        self._inverse_deprecated_rules_warning()
+        for rec in self:
+            for model in rec.model_ids:
+                rule = rec._get_rule_by_model(model)
+                if rule:
+                    _logger.warning(
+                        "Rule for %s btn updated from deprecated `model_manual_btn`",
+                        model.model,
+                    )
+                    rule.kind = "form_btn" if self.model_manual_btn else "custom"
+
+    def _get_rule_by_model(self, model):
+        return self.rule_ids.filtered(lambda x: x.model_id == model)
+
+    def _inverse_deprecated_rules_create(self, model):
+        kind = "form_btn" if self.model_manual_btn else "custom"
+        vals = {
+            "type_id": self.id,
+            "model_id": model.id,
+            "kind": kind,
+            "name": "Default",
+            "enable_snippet": self.enable_snippet,
+            "enable_domain": self.enable_domain,
+        }
+        return self.rule_ids.create(vals)
+
+    @api.depends("model_ids", "enable_domain", "enable_snippet", "model_manual_btn")
+    def _compute_deprecated_rule_fields_still_used(self):
+        for rec in self:
+            rec.deprecated_rule_fields_still_used = (
+                rec._deprecated_rule_fields_still_used()
+            )
+
+    def _deprecated_rule_fields_still_used(self):
+        for fname in ("model_ids", "enable_snippet", "enable_domain"):
+            if self[fname]:
+                return True
+
+    def button_wipe_deprecated_rule_fields(self):
+        _fields = ["model_ids", "enable_domain", "enable_snippet", "model_manual_btn"]
+        deprecated_vals = {}.fromkeys(_fields, None)
+        self.with_context(deprecated_rule_fields_bypass_inverse=True).write(
+            deprecated_vals
+        )
+
+    # API to support deprecated model rules fields - end
diff --git a/edi_oca/tests/__init__.py b/edi_oca/tests/__init__.py
index 3f4193ce03..30692700a2 100644
--- a/edi_oca/tests/__init__.py
+++ b/edi_oca/tests/__init__.py
@@ -12,3 +12,4 @@
 from . import test_edi_backend_cron
 from . import test_security
 from . import test_quick_exec
+from . import test_exchange_type_deprecated_fields
diff --git a/edi_oca/tests/test_exchange_type_deprecated_fields.py b/edi_oca/tests/test_exchange_type_deprecated_fields.py
new file mode 100644
index 0000000000..dee571bd94
--- /dev/null
+++ b/edi_oca/tests/test_exchange_type_deprecated_fields.py
@@ -0,0 +1,43 @@
+# Copyright 2023 Camptocamp SA (https://www.camptocamp.com).
+# @author: Simone Orsi <simahawk@gmail.com>
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+
+from .common import EDIBackendCommonTestCase
+
+
+class EDIExchangeTypeDeprecatedFieldsTestCase(EDIBackendCommonTestCase):
+    def test_inverse(self):
+        typ = self.exchange_type_out
+        self.assertFalse(typ.rule_ids)
+        self.assertFalse(typ.deprecated_rule_fields_still_used)
+        typ.model_ids += self.env["ir.model"]._get("res.partner")
+        self.assertTrue(typ.deprecated_rule_fields_still_used)
+        self.assertEqual(typ.rule_ids.mapped("model_id.model"), ["res.partner"])
+        typ.model_ids += self.env["ir.model"]._get("res.groups")
+        self.assertEqual(
+            typ.rule_ids.mapped("model_id.model"), ["res.partner", "res.groups"]
+        )
+        typ.enable_domain = "[(1, '=', 1)]"
+        self.assertRecordValues(
+            typ.rule_ids, [{"enable_domain": typ.enable_domain, "kind": "custom"}] * 2
+        )
+        typ.model_manual_btn = True
+        self.assertRecordValues(
+            typ.rule_ids, [{"enable_domain": typ.enable_domain, "kind": "form_btn"}] * 2
+        )
+        typ.model_ids -= self.env["ir.model"]._get("res.groups")
+        self.assertEqual(typ.rule_ids.mapped("model_id.model"), ["res.partner"])
+        typ.model_ids = False
+        self.assertFalse(typ.rule_ids)
+
+    def test_btn(self):
+        typ = self.exchange_type_out
+        typ.model_ids += self.env["ir.model"]._get("res.partner")
+        typ.enable_domain = "[(1, '=', 1)]"
+        typ.button_wipe_deprecated_rule_fields()
+        self.assertFalse(typ.model_ids)
+        self.assertFalse(typ.enable_domain)
+        self.assertFalse(typ.enable_snippet)
+        # Rules are kept
+        self.assertEqual(typ.rule_ids.mapped("model_id.model"), ["res.partner"])
diff --git a/edi_oca/views/edi_exchange_type_views.xml b/edi_oca/views/edi_exchange_type_views.xml
index c3ed3abe4d..a210c935cd 100644
--- a/edi_oca/views/edi_exchange_type_views.xml
+++ b/edi_oca/views/edi_exchange_type_views.xml
@@ -50,6 +50,7 @@
                             <field name="quick_exec" />
                         </group>
                     </group>
+                    <field name="deprecated_rule_fields_still_used" invisible="1" />
                     <notebook>
                         <page
                             name="adv_settings"
@@ -79,6 +80,38 @@
                                 </tree>
                             </field>
                         </page>
+                        <page
+                            name="deprecated_model_rules"
+                            string="DEPRECATED Model rules"
+                            groups="edi_oca.group_edi_advanced_settings_manager"
+                            attrs="{'invisible': [('deprecated_rule_fields_still_used', '=', False)]}"
+                        >
+                            <div class="alert alert-warning" role="alert">
+                              Warning: these fields are deprecated.
+                              If you rely on them for configuring rules via data files,
+                              it's strongly recommended to rework such files
+                              to use `edi.exchange.type.rule` records.
+                              Please note that, due to backward compat,
+                              removing a model from here will cause deletion
+                              of any existing rule for the model.
+                              You can use the button "Wipe" to clean them properly.
+                            </div>
+                            <group>
+                              <field name="model_ids" widget="many2many_tags" />
+                              <field name="enable_domain" />
+                              <field
+                                    name="enable_snippet"
+                                    widget="ace"
+                                    options="{'mode': 'python'}"
+                                />
+                              <field name="model_manual_btn" />
+                            </group>
+                            <button
+                                type="object"
+                                name="button_wipe_deprecated_rule_fields"
+                                string="Wipe"
+                            />
+                        </page>
                     </notebook>
                 </sheet>
             </form>

From ee7a7e80e73f4883e65318bbc99f82a5c6a5da90 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Sat, 12 Aug 2023 12:28:04 +0200
Subject: [PATCH 5/5] edi_oca: bump 14.0.1.20.0

---
 edi_oca/__manifest__.py                                         | 2 +-
 edi_oca/migrations/{14.0.1.19.0 => 14.0.1.20.0}/post-migrate.py | 0
 edi_oca/migrations/{14.0.1.19.0 => 14.0.1.20.0}/pre-migrate.py  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename edi_oca/migrations/{14.0.1.19.0 => 14.0.1.20.0}/post-migrate.py (100%)
 rename edi_oca/migrations/{14.0.1.19.0 => 14.0.1.20.0}/pre-migrate.py (100%)

diff --git a/edi_oca/__manifest__.py b/edi_oca/__manifest__.py
index ac6fcaac18..137567c55c 100644
--- a/edi_oca/__manifest__.py
+++ b/edi_oca/__manifest__.py
@@ -9,7 +9,7 @@
     Define backends, exchange types, exchange records,
     basic automation and views for handling EDI exchanges.
     """,
-    "version": "14.0.1.19.0",
+    "version": "14.0.1.20.0",
     "website": "https://github.com/OCA/edi",
     "development_status": "Beta",
     "license": "LGPL-3",
diff --git a/edi_oca/migrations/14.0.1.19.0/post-migrate.py b/edi_oca/migrations/14.0.1.20.0/post-migrate.py
similarity index 100%
rename from edi_oca/migrations/14.0.1.19.0/post-migrate.py
rename to edi_oca/migrations/14.0.1.20.0/post-migrate.py
diff --git a/edi_oca/migrations/14.0.1.19.0/pre-migrate.py b/edi_oca/migrations/14.0.1.20.0/pre-migrate.py
similarity index 100%
rename from edi_oca/migrations/14.0.1.19.0/pre-migrate.py
rename to edi_oca/migrations/14.0.1.20.0/pre-migrate.py