diff --git a/base_changeset/__manifest__.py b/base_changeset/__manifest__.py
index 527cbca46..59816920a 100644
--- a/base_changeset/__manifest__.py
+++ b/base_changeset/__manifest__.py
@@ -4,7 +4,7 @@
{
"name": "Track record changesets",
- "version": "14.0.2.0.1",
+ "version": "15.0.1.0.0",
"development_status": "Alpha",
"author": "Onestein, Camptocamp, Odoo Community Association (OCA)",
"maintainers": ["astirpe"],
@@ -16,13 +16,18 @@
"security/groups.xml",
"security/ir.model.access.csv",
"security/rules.xml",
- "templates/assets.xml",
"views/record_changeset_views.xml",
"views/record_changeset_change_views.xml",
"views/changeset_field_rule_views.xml",
"views/menu.xml",
],
+ "assets": {
+ "web.assets_backend": [
+ "base_changeset/static/src/js/backend.js",
+ "base_changeset/static/src/scss/backend.scss",
+ ],
+ "web.assets_qweb": ["base_changeset/static/src/xml/backend.xml"],
+ },
"demo": ["demo/changeset_field_rule.xml"],
- "qweb": ["static/src/xml/backend.xml"],
"installable": True,
}
diff --git a/base_changeset/models/changeset_field_rule.py b/base_changeset/models/changeset_field_rule.py
index 87b224213..b79293cda 100644
--- a/base_changeset/models/changeset_field_rule.py
+++ b/base_changeset/models/changeset_field_rule.py
@@ -17,7 +17,6 @@ class ChangesetFieldRule(models.Model):
)
action = fields.Selection(
selection="_selection_action",
- string="Action",
required=True,
help="Auto: always apply a change.\n"
"Validate: manually applied by an administrator.\n"
diff --git a/base_changeset/models/record_changeset_change.py b/base_changeset/models/record_changeset_change.py
index fe082c8f1..da20dc496 100644
--- a/base_changeset/models/record_changeset_change.py
+++ b/base_changeset/models/record_changeset_change.py
@@ -140,7 +140,7 @@ class RecordChangesetChange(models.Model):
"float": ("float",),
"monetary": ("monetary",),
"integer": ("integer",),
- "text": ("text",),
+ "text": ("text", "html"),
"boolean": ("boolean",),
"reference": ("many2one",),
}
diff --git a/base_changeset/security/ir.model.access.csv b/base_changeset/security/ir.model.access.csv
index 313916c63..66f86d42a 100644
--- a/base_changeset/security/ir.model.access.csv
+++ b/base_changeset/security/ir.model.access.csv
@@ -6,3 +6,5 @@ access_view_record_changeset_user,changeset for changeset users,model_record_cha
access_view_record_changeset_change_user,changeset change for changeset users,model_record_changeset_change,group_changeset_user,1,1,1,0
access_view_record_changeset_manager,changeset for changeset managers,model_record_changeset,group_changeset_manager,1,1,1,1
access_view_record_changeset_change_manager,changeset change for changeset managers,model_record_changeset_change,group_changeset_manager,1,1,1,1
+access_ir_model_fields_changeset,ir_model_fields changeset,base.model_ir_model_fields,group_changeset_user,1,0,0,0
+access_ir_model_changeset,ir_model_changeset,base.model_ir_model,group_changeset_user,1,0,0,0
diff --git a/base_changeset/templates/assets.xml b/base_changeset/templates/assets.xml
deleted file mode 100644
index c7b9015c2..000000000
--- a/base_changeset/templates/assets.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/base_changeset/tests/test_changeset_field_type.py b/base_changeset/tests/test_changeset_field_type.py
index 75df21ff4..6c025e632 100644
--- a/base_changeset/tests/test_changeset_field_type.py
+++ b/base_changeset/tests/test_changeset_field_type.py
@@ -2,6 +2,8 @@
# Copyright 2020 Onestein ()
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from markupsafe import Markup
+
from odoo import fields
from odoo.tests.common import TransactionCase
@@ -203,7 +205,9 @@ class TestChangesetFieldType(ChangesetTestCommon, TransactionCase):
changes = [(self.field_text, "New comment\non 2 lines", "draft")]
changeset = self._create_changeset(self.partner, changes)
changeset.change_ids.apply()
- self.assertEqual(self.partner[self.field_text.name], "New comment\non 2 lines")
+ self.assertEqual(
+ self.partner[self.field_text.name], Markup("New comment\non 2 lines
")
+ )
def test_apply_boolean(self):
"""Apply a change on a Boolean field"""