From fcf2c9f8d82a58720f34759bf6e34f52b7458f13 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 11 Jul 2023 07:52:58 +0200
Subject: [PATCH 01/69] cms_form: apply pre-commit

---
 cms_form/controllers/main.py                  |   9 +-
 cms_form/models/cms_form.py                   |   5 +-
 cms_form/models/cms_form_mixin.py             |   9 +-
 cms_form/static/src/js/ajax.js                |  16 +--
 cms_form/static/src/js/date_widget.js         |  16 +--
 cms_form/static/src/js/lock_copy_paste.js     |  10 +-
 cms_form/static/src/js/master_slave.js        |  28 ++---
 cms_form/static/src/js/select2widgets.js      |  20 ++--
 cms_form/static/src/js/textarea_widget.js     |   6 +-
 cms_form/templates/form.xml                   |   3 +-
 cms_form/tests/test_controllers.py            |   8 +-
 cms_form/tests/test_form_base.py              |  12 ++-
 cms_form/tests/test_form_cms.py               |  13 ++-
 cms_form/tests/test_form_permission.py        |   9 +-
 cms_form/tests/test_form_search.py            |  31 ++++--
 cms_form/tests/widgets/test_widget_base.py    |   4 +-
 cms_form/tests/widgets/test_widget_binary.py  | 101 ++++++++++++++----
 cms_form/tests/widgets/test_widget_boolean.py |   5 +-
 cms_form/tests/widgets/test_widget_date.py    |  16 ++-
 cms_form/tests/widgets/test_widget_float.py   |   5 +-
 cms_form/tests/widgets/test_widget_hidden.py  |  43 ++++++--
 cms_form/tests/widgets/test_widget_integer.py |   5 +-
 .../tests/widgets/test_widget_many2one.py     |  44 ++++++--
 cms_form/tests/widgets/test_widget_radio.py   |  18 +++-
 .../tests/widgets/test_widget_selection.py    |  46 ++++++--
 cms_form/tests/widgets/test_widget_text.py    |  29 +++--
 cms_form/tests/widgets/test_widget_x2many.py  |  50 +++++++--
 27 files changed, 398 insertions(+), 163 deletions(-)

diff --git a/cms_form/controllers/main.py b/cms_form/controllers/main.py
index 0f57ffd9..6d8feb65 100644
--- a/cms_form/controllers/main.py
+++ b/cms_form/controllers/main.py
@@ -136,8 +136,7 @@ class CMSFormController(http.Controller, FormControllerMixin):
         website=True,
     )
     def cms_form(self, model, model_id=None, **kw):
-        """Handle a `form` route.
-        """
+        """Handle a `form` route."""
         return self.make_response(model, model_id=model_id, **kw)
 
 
@@ -171,8 +170,7 @@ class CMSWizardFormController(http.Controller, WizardFormControllerMixin):
         website=True,
     )
     def cms_wiz(self, wiz_model, model_id=None, **kw):
-        """Handle a wizard route.
-        """
+        """Handle a wizard route."""
         return self.make_response(wiz_model, model_id=model_id, **kw)
 
 
@@ -199,8 +197,7 @@ class CMSSearchFormController(http.Controller, SearchFormControllerMixin):
         website=True,
     )
     def cms_form(self, model, **kw):
-        """Handle a search `form` route.
-        """
+        """Handle a search `form` route."""
         response = self.make_response(model, **kw)
         return response
 
diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index 9d322b57..adaa79f1 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -138,11 +138,9 @@ def form_get_validator(self, fname, field):
 
     def form_before_create_or_update(self, values, extra_values):
         """Pre create/update hook."""
-        pass
 
     def form_after_create_or_update(self, values, extra_values):
         """Post create/update hook."""
-        pass
 
     def _form_purge_non_model_fields(self, values):
         """Purge fields that are not in `form_model` schema and return them."""
@@ -151,7 +149,8 @@ def _form_purge_non_model_fields(self, values):
             return extra_values
         _model_fields = list(
             self.form_model.fields_get(
-                self._form_model_fields, attributes=self._form_fields_attributes,
+                self._form_model_fields,
+                attributes=self._form_fields_attributes,
             ).keys()
         )
         submitted_keys = list(values.keys())
diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 57a58df1..cf0a1c79 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -262,7 +262,8 @@ def _form_fields(self):
         _model_fields = {}
         if self._form_model:
             _model_fields = self.form_model.fields_get(
-                self._form_model_fields, attributes=self._form_fields_attributes,
+                self._form_model_fields,
+                attributes=self._form_fields_attributes,
             )
             # inject defaults
             defaults = self.form_model.default_get(self._form_model_fields)
@@ -588,7 +589,11 @@ def _form_json_info(self):
             {
                 "master_slave": self._form_master_slave_info(),
                 "model": self._form_model,
-                "form_content_selector": getattr(self, "_form_content_selector", None,),
+                "form_content_selector": getattr(
+                    self,
+                    "_form_content_selector",
+                    None,
+                ),
             }
         )
         return info
diff --git a/cms_form/static/src/js/ajax.js b/cms_form/static/src/js/ajax.js
index c9ea0f57..d390fb61 100644
--- a/cms_form/static/src/js/ajax.js
+++ b/cms_form/static/src/js/ajax.js
@@ -1,4 +1,4 @@
-odoo.define("cms_form.ajax", function(require) {
+odoo.define("cms_form.ajax", function (require) {
     "use strict";
 
     var core = require("web.core"),
@@ -9,7 +9,7 @@ odoo.define("cms_form.ajax", function(require) {
         events: {
             submit: "submit_form",
         },
-        start: function() {
+        start: function () {
             this.data = this.$el.data("form");
             if (this.$el.data("ajax-onchange")) {
                 this.$el.on("change", this.proxy("submit_form"));
@@ -20,7 +20,7 @@ odoo.define("cms_form.ajax", function(require) {
                 .find(".pagination a[href]")
                 .on("click", this.proxy("pager"));
         },
-        ajax_submit: function(additional_data) {
+        ajax_submit: function (additional_data) {
             return jQuery.ajax(_.str.sprintf("/cms/ajax/search/%s", this.data.model), {
                 data:
                     this.$el.serialize() +
@@ -32,7 +32,7 @@ odoo.define("cms_form.ajax", function(require) {
                 error: this.proxy("error"),
             });
         },
-        submit_form: function(ev) {
+        submit_form: function (ev) {
             var $container = this.$container();
 
             jQuery.blockUI();
@@ -41,17 +41,17 @@ odoo.define("cms_form.ajax", function(require) {
 
             return this.ajax_submit();
         },
-        success: function(data) {
+        success: function (data) {
             jQuery.unblockUI();
             var $container = this.$container();
 
             $container.html(data.content);
             $container.find(".pagination a[href]").on("click", this.proxy("pager"));
         },
-        error: function() {
+        error: function () {
             jQuery.unblockUI();
         },
-        pager: function(ev) {
+        pager: function (ev) {
             var $a = jQuery(ev.currentTarget);
 
             jQuery.blockUI();
@@ -59,7 +59,7 @@ odoo.define("cms_form.ajax", function(require) {
 
             return this.ajax_submit("&page=" + $a.data("page"));
         },
-        $container: function() {
+        $container: function () {
             return this.$el
                 .parents(".cms_form_wrapper")
                 .find(this.data.form_content_selector);
diff --git a/cms_form/static/src/js/date_widget.js b/cms_form/static/src/js/date_widget.js
index 0057e6c7..c1bf0d23 100644
--- a/cms_form/static/src/js/date_widget.js
+++ b/cms_form/static/src/js/date_widget.js
@@ -1,4 +1,4 @@
-odoo.define("cms_form.date_widget", function(require) {
+odoo.define("cms_form.date_widget", function (require) {
     "use strict";
 
     var sAnimation = require("website.content.snippets.animation");
@@ -6,7 +6,7 @@ odoo.define("cms_form.date_widget", function(require) {
 
     sAnimation.registry.CMSDateWidget = sAnimation.Class.extend({
         selector: ".cms_form_wrapper form input.js_datepicker",
-        start: function() {
+        start: function () {
             // The datepicker is attached to $fname_display field.
             // The real value is held by the real field input (hidden).
             this.$realField = this.$el.next(
@@ -15,7 +15,7 @@ odoo.define("cms_form.date_widget", function(require) {
             this.load_options();
             this.setup_datepicker();
         },
-        load_options: function() {
+        load_options: function () {
             // global options
             this.options = _.omit(this.$el.data("params"), "dp");
             // Datepicker specific ones
@@ -37,7 +37,7 @@ odoo.define("cms_form.date_widget", function(require) {
                 }
             );
         },
-        setup_datepicker: function() {
+        setup_datepicker: function () {
             var self = this;
             var placeholder = this.$el.attr("placeholder");
             // Placeholder empty: set default via lang format
@@ -56,7 +56,7 @@ odoo.define("cms_form.date_widget", function(require) {
             // Init bootstrap-datetimepicker
             this.$el.datetimepicker(this.picker_options);
             this.picker = this.$el.data("DateTimePicker");
-            this.$el.on("dp.change", function(e) {
+            this.$el.on("dp.change", function (e) {
                 // Update real value field.
                 // WARNING: this format should not be touched, it matches server side.
                 var real_val = "";
@@ -71,11 +71,11 @@ odoo.define("cms_form.date_widget", function(require) {
             this.$el
                 .closest(".input-group")
                 .find(".js_datepicker_trigger")
-                .click(function() {
+                .click(function () {
                     self.picker.show();
                 });
         },
-        _init_date: function() {
+        _init_date: function () {
             var self = this;
             // Retrieve current date from real field
             var defaultDate = self.$realField.val();
@@ -88,7 +88,7 @@ odoo.define("cms_form.date_widget", function(require) {
                 this.picker.date(defaultDate);
             }
         },
-        destroy: function() {
+        destroy: function () {
             this.picker.destroy();
             this._super.apply(this, arguments);
         },
diff --git a/cms_form/static/src/js/lock_copy_paste.js b/cms_form/static/src/js/lock_copy_paste.js
index 512a9c97..6973716b 100644
--- a/cms_form/static/src/js/lock_copy_paste.js
+++ b/cms_form/static/src/js/lock_copy_paste.js
@@ -1,18 +1,18 @@
-odoo.define("cms_form.lock_copy_paste", function(require) {
+odoo.define("cms_form.lock_copy_paste", function (require) {
     "use strict";
 
     var sAnimation = require("website.content.snippets.animation");
 
     sAnimation.registry.CMSFormLockCopyPaste = sAnimation.Class.extend({
         selector: ".cms_form_wrapper form .lock_copy_paste",
-        start: function() {
+        start: function () {
             this.setup_handlers();
         },
-        setup_handlers: function() {
-            this.$el.bind("cut copy paste", function(e) {
+        setup_handlers: function () {
+            this.$el.bind("cut copy paste", function (e) {
                 e.preventDefault();
             });
-            this.$el.on("contextmenu", function() {
+            this.$el.on("contextmenu", function () {
                 return false;
             });
         },
diff --git a/cms_form/static/src/js/master_slave.js b/cms_form/static/src/js/master_slave.js
index dde4cc00..76313464 100644
--- a/cms_form/static/src/js/master_slave.js
+++ b/cms_form/static/src/js/master_slave.js
@@ -1,4 +1,4 @@
-odoo.define("cms_form.master_slave", function(require) {
+odoo.define("cms_form.master_slave", function (require) {
     "use strict";
     /*
     Handle master / slave fields automatically.
@@ -11,12 +11,12 @@ odoo.define("cms_form.master_slave", function(require) {
 
     sAnimation.registry.CMSFormMasterSlave = sAnimation.Class.extend({
         selector: ".cms_form_wrapper form",
-        start: function() {
+        start: function () {
             this.data = this.$el.data("form");
             this.setup_handlers();
             this.load_master_slave();
         },
-        setup_handlers: function() {
+        setup_handlers: function () {
             this.handlers = {
                 hide: $.proxy(this.handle_hide, this),
                 show: $.proxy(this.handle_show, this),
@@ -26,22 +26,22 @@ odoo.define("cms_form.master_slave", function(require) {
                 no_required: $.proxy(this.handle_no_required, this),
             };
         },
-        load_master_slave: function() {
+        load_master_slave: function () {
             var self = this;
-            $.each(this.data.master_slave, function(master, slaves) {
+            $.each(this.data.master_slave, function (master, slaves) {
                 var $master_input = $('[name="' + master + '"]');
-                $.each(slaves, function(action, mapping) {
+                $.each(slaves, function (action, mapping) {
                     var handler = self.handlers[action];
                     if (handler) {
                         $master_input
-                            .on("change", function() {
+                            .on("change", function () {
                                 var $input = $(this),
                                     val = $input.val();
                                 if ($input.is(":checkbox")) {
                                     // Value == 'on' => true/false
                                     val = $input.is(":checked");
                                 }
-                                $.each(mapping, function(slave_fname, values) {
+                                $.each(mapping, function (slave_fname, values) {
                                     if (_.contains(values, val)) {
                                         handler(slave_fname);
                                     }
@@ -56,32 +56,32 @@ odoo.define("cms_form.master_slave", function(require) {
                 });
             });
         },
-        handle_hide: function(slave_fname) {
+        handle_hide: function (slave_fname) {
             $('[name="' + slave_fname + '"]')
                 .closest(".form-group")
                 .hide();
         },
-        handle_show: function(slave_fname) {
+        handle_show: function (slave_fname) {
             $('[name="' + slave_fname + '"]')
                 .closest(".form-group")
                 .show();
         },
-        handle_readonly: function(slave_fname) {
+        handle_readonly: function (slave_fname) {
             $('[name="' + slave_fname + '"]')
                 .attr("disabled", "disabled")
                 .closest(".form-group")
                 .addClass("disabled");
         },
-        handle_no_readonly: function(slave_fname) {
+        handle_no_readonly: function (slave_fname) {
             $('[name="' + slave_fname + '"]')
                 .attr("disabled", null)
                 .closest(".form-group")
                 .removeClass("disabled");
         },
-        handle_required: function(slave_fname) {
+        handle_required: function (slave_fname) {
             $('[name="' + slave_fname + '"]').attr("required", "required");
         },
-        handle_no_required: function(slave_fname) {
+        handle_no_required: function (slave_fname) {
             $('[name="' + slave_fname + '"]').attr("required", null);
         },
     });
diff --git a/cms_form/static/src/js/select2widgets.js b/cms_form/static/src/js/select2widgets.js
index 3a1c0f30..caf30bbf 100644
--- a/cms_form/static/src/js/select2widgets.js
+++ b/cms_form/static/src/js/select2widgets.js
@@ -1,4 +1,4 @@
-odoo.define("cms_form.select2widgets", function(require) {
+odoo.define("cms_form.select2widgets", function (require) {
     "use strict";
 
     var ajax = require("web.ajax");
@@ -10,14 +10,14 @@ odoo.define("cms_form.select2widgets", function(require) {
         return $.Deferred().reject("DOM doesn't contain '.js_select2_m2m_widget'");
     }
 
-    $(document).ready(function() {
-        $("input.js_select2_m2m_widget").each(function() {
+    $(document).ready(function () {
+        $("input.js_select2_m2m_widget").each(function () {
             var $input = $(this);
             $input.select2({
                 multiple: true,
                 tags: true,
                 tokenSeparators: [",", " ", "_"],
-                formatResult: function(term) {
+                formatResult: function (term) {
                     var formatted = _.escape(term.text);
                     if (term.isNew) {
                         formatted =
@@ -25,7 +25,7 @@ odoo.define("cms_form.select2widgets", function(require) {
                     }
                     return formatted;
                 },
-                query: function(options) {
+                query: function (options) {
                     var domain = [];
                     if (options.term) {
                         domain.push([
@@ -46,15 +46,15 @@ odoo.define("cms_form.select2widgets", function(require) {
                             fields: $input.data("fields"),
                             context: weContext.get(),
                         },
-                    }).then(function(data) {
+                    }).then(function (data) {
                         var display_name = $input.data("display_name");
-                        data.sort(function(a, b) {
+                        data.sort(function (a, b) {
                             return a[display_name].localeCompare(b[display_name]);
                         });
                         var res = {
                             results: [],
                         };
-                        _.each(data, function(x) {
+                        _.each(data, function (x) {
                             res.results.push({
                                 id: x.id,
                                 text: x[display_name],
@@ -65,9 +65,9 @@ odoo.define("cms_form.select2widgets", function(require) {
                     });
                 },
                 // Default tags from the input value
-                initSelection: function(element, callback) {
+                initSelection: function (element, callback) {
                     var data = [];
-                    _.each(element.data("init-value"), function(x) {
+                    _.each(element.data("init-value"), function (x) {
                         data.push({
                             id: x.id,
                             text: x.name,
diff --git a/cms_form/static/src/js/textarea_widget.js b/cms_form/static/src/js/textarea_widget.js
index 92424201..c3b6e075 100644
--- a/cms_form/static/src/js/textarea_widget.js
+++ b/cms_form/static/src/js/textarea_widget.js
@@ -1,11 +1,11 @@
-odoo.define("cms_form.textarea_widget", function(require) {
+odoo.define("cms_form.textarea_widget", function (require) {
     "use strict";
 
     require("web.dom_ready");
 
-    $(document).ready(function() {
+    $(document).ready(function () {
         $("textarea[maxlength]")
-            .bind("input propertychange", function() {
+            .bind("input propertychange", function () {
                 var $self = $(this),
                     maxlength = parseInt($self.attr("maxlength"), 10),
                     length = $self.val().length,
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 4ae67d3e..ce16e366 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -126,7 +126,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         <ul class="nav nav-tabs" role="tablist">
             <t t-foreach="form_fieldsets" t-as="fset">
                 <li role="presentation">
-                    <a  t-attf-class="nav-link #{'active' if fset_first else ''}"
+                    <a
+                        t-attf-class="nav-link #{'active' if fset_first else ''}"
                         t-attf-href="#tab-#{fset['id']}"
                         t-attf-aria-controls="tab-#{fset['id']}"
                         role="tab"
diff --git a/cms_form/tests/test_controllers.py b/cms_form/tests/test_controllers.py
index 2e94873e..dd958a4b 100644
--- a/cms_form/tests/test_controllers.py
+++ b/cms_form/tests/test_controllers.py
@@ -48,7 +48,8 @@ def test_get_template(self):
             form = self.form_controller.get_form("res.partner")
             # default
             self.assertEqual(
-                self.form_controller.get_template(form), "cms_form.form_wrapper",
+                self.form_controller.get_template(form),
+                "cms_form.form_wrapper",
             )
             # custom on form
             form.form_wrapper_template = "foo.baz"
@@ -139,7 +140,10 @@ def test_get_wizard_form(self):
             self.assertEqual(form.form_mode, "create")
 
     def test_redirect_after_success(self):
-        req = fake_request(form_data={"name": "John"}, method="POST",)
+        req = fake_request(
+            form_data={"name": "John"},
+            method="POST",
+        )
         with self.mock_assets(req=req):
             partner = self.env.ref("base.res_partner_12")
             response = self.form_controller.make_response(
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index 2d039dfe..eae3eb2f 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -18,6 +18,7 @@ def _get_test_models():
         from .fake_models.fake_partner_form_protected_fields import (
             FakePartnerFormProtectedFields,
         )
+
         return (FakeFieldsForm, FakePartnerForm, FakePartnerFormProtectedFields)
 
     def test_form_init(self):
@@ -31,7 +32,10 @@ def test_form_init_overrides(self):
             mode="foo",
             fields_whitelist=("name",),
             fields_blacklist=("country_id",),
-            fields_attributes=("string", "type",),
+            fields_attributes=(
+                "string",
+                "type",
+            ),
             wrapper_extra_css_klass="foo",
             extra_css_klass="baz",
         )
@@ -73,7 +77,8 @@ def test_fields_load(self):
 
     def test_fields_order(self):
         form = self.get_form(
-            "cms.form.res.partner", fields_order=["name", "custom", "country_id"],
+            "cms.form.res.partner",
+            fields_order=["name", "custom", "country_id"],
         )
         fields = form.form_fields()
         self.assertEqual(list(fields.keys())[0], "name")
@@ -82,7 +87,8 @@ def test_fields_order(self):
 
         # change order
         form = self.get_form(
-            "cms.form.res.partner", fields_order=["country_id", "name", "custom"],
+            "cms.form.res.partner",
+            fields_order=["country_id", "name", "custom"],
         )
         fields = form.form_fields()
         self.assertEqual(list(fields.keys())[0], "country_id")
diff --git a/cms_form/tests/test_form_cms.py b/cms_form/tests/test_form_cms.py
index b9fe23ed..b5c71101 100644
--- a/cms_form/tests/test_form_cms.py
+++ b/cms_form/tests/test_form_cms.py
@@ -14,10 +14,9 @@ class TestCMSForm(FormTestCase):
     @staticmethod
     def _get_test_models():
         from .fake_models.fake_fields_form import FakeFieldsForm
-        from .fake_models.fake_partner_form import FakePartnerForm
         from .fake_models.fake_partner_channel_form import FakePartnerChannelForm
-        from .fake_models.fake_pub_model_form import FakePubModel
-        from .fake_models.fake_pub_model_form import FakePubModelForm
+        from .fake_models.fake_partner_form import FakePartnerForm
+        from .fake_models.fake_pub_model_form import FakePubModel, FakePubModelForm
 
         return (
             FakePartnerForm,
@@ -77,7 +76,9 @@ def test_next_url(self):
         # edit a record that has an URL but got redirect in request
         request = fake_request(query_string="redirect=/sorry/go/here")
         form = self.get_form(
-            "cms.form.fake.publishable", req=request, main_object=record,
+            "cms.form.fake.publishable",
+            req=request,
+            main_object=record,
         )
         self.assertEqual(form.form_next_url(), "/sorry/go/here")
 
@@ -96,7 +97,9 @@ def test_cancel_url(self):
         # edit a record that has an URL but got redirect in request
         request = fake_request(query_string="redirect=/sorry/go/here")
         form = self.get_form(
-            "cms.form.fake.publishable", req=request, main_object=record,
+            "cms.form.fake.publishable",
+            req=request,
+            main_object=record,
         )
         self.assertEqual(form.form_cancel_url(), "/sorry/go/here")
 
diff --git a/cms_form/tests/test_form_permission.py b/cms_form/tests/test_form_permission.py
index 6c35bd96..56cd1012 100644
--- a/cms_form/tests/test_form_permission.py
+++ b/cms_form/tests/test_form_permission.py
@@ -11,11 +11,12 @@
 class TestFormPermCheck(FormTestCase):
     @staticmethod
     def _get_test_models():
+        from .fake_models.fake_nonpub_model_form import (
+            FakeNonPubModel,
+            FakeNonPubModelForm,
+        )
         from .fake_models.fake_partner_form import FakePartnerForm
-        from .fake_models.fake_pub_model_form import FakePubModel
-        from .fake_models.fake_pub_model_form import FakePubModelForm
-        from .fake_models.fake_nonpub_model_form import FakeNonPubModel
-        from .fake_models.fake_nonpub_model_form import FakeNonPubModelForm
+        from .fake_models.fake_pub_model_form import FakePubModel, FakePubModelForm
 
         return (
             FakeNonPubModel,
diff --git a/cms_form/tests/test_form_search.py b/cms_form/tests/test_form_search.py
index 13f51951..db17d608 100644
--- a/cms_form/tests/test_form_search.py
+++ b/cms_form/tests/test_form_search.py
@@ -34,11 +34,26 @@ def _setup_records(cls):
         cls.expected_partners = []
         cls.expected_partners_ids = []
         cls._expected_partners = (
-            ("Salmo", cls.env.ref("base.it").id,),
-            ("Marracash", cls.env.ref("base.it").id,),
-            ("Notorious BIG", cls.env.ref("base.us").id,),
-            ("Dr. Dre", cls.env.ref("base.us").id,),
-            ("NTM", cls.env.ref("base.fr").id,),
+            (
+                "Salmo",
+                cls.env.ref("base.it").id,
+            ),
+            (
+                "Marracash",
+                cls.env.ref("base.it").id,
+            ),
+            (
+                "Notorious BIG",
+                cls.env.ref("base.us").id,
+            ),
+            (
+                "Dr. Dre",
+                cls.env.ref("base.us").id,
+            ),
+            (
+                "NTM",
+                cls.env.ref("base.fr").id,
+            ),
         )
 
         for name, country_id in cls._expected_partners:
@@ -118,7 +133,8 @@ def mock_fields(form):
                 ("o2m_field", "in", [1, 2, 3]),
             ]
             self.assertEqual(
-                sorted(form.form_search_domain(search_values)), sorted(expected),
+                sorted(form.form_search_domain(search_values)),
+                sorted(expected),
             )
 
     def test_search(self):
@@ -230,7 +246,8 @@ def test_search_custom_rules(self):
             "country_id": "Italy",
         }
         form = self.get_search_form(
-            data, search_domain_rules={"country_id": ("country_id.name", "ilike", "")},
+            data,
+            search_domain_rules={"country_id": ("country_id.name", "ilike", "")},
         )
         form.form_process()
         self.assert_results(form, 2, self.expected_partners[:2])
diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index eabbabb2..dd4223c0 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -5,7 +5,6 @@
 
 
 class TestWidgetBase(TestWidgetCase, FakeModelMixin):
-
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -69,7 +68,8 @@ def test_w_ids_from_input(self):
         self.assertEqual(widget.w_ids_from_input(""), [])
         # not valid values are skipped
         self.assertEqual(
-            widget.w_ids_from_input("1,2,3,#4, 70, 1XX, 200"), [1, 2, 3, 70, 200],
+            widget.w_ids_from_input("1,2,3,#4, 70, 1XX, 200"),
+            [1, 2, 3, 70, 200],
         )
 
     def test_subfields_get(self):
diff --git a/cms_form/tests/widgets/test_widget_binary.py b/cms_form/tests/widgets/test_widget_binary.py
index e759bf43..9211e9df 100644
--- a/cms_form/tests/widgets/test_widget_binary.py
+++ b/cms_form/tests/widgets/test_widget_binary.py
@@ -47,9 +47,15 @@ def setUpClass(cls):
 
     # TODO: we have only an image widget ATM -> add a file widget and test it
     def test_widget_binary_base(self):
-        w_name, w_field = fake_field("image", type="binary",)
+        w_name, w_field = fake_field(
+            "image",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
         node_items = self.to_xml_node(widget.render())
         self.assertEqual(len(node_items), 1)
@@ -58,7 +64,9 @@ def test_widget_binary_base(self):
             "class": "image-widget-wrapper",
         }
         self._test_element_attributes(
-            node_wrapper, "div", expected_attrs,
+            node_wrapper,
+            "div",
+            expected_attrs,
         )
         # no existing value so we get only the input
         self.assertEqual(len(node_wrapper.getchildren()), 1)
@@ -72,13 +80,21 @@ def test_widget_binary_base(self):
             "accept": "image/*",
         }
         self._test_element_attributes(
-            node_input, "input", expected_attrs,
+            node_input,
+            "input",
+            expected_attrs,
         )
 
     def test_widget_binary_load_from_record(self):
-        w_name, w_field = fake_field("image_1024", type="binary",)
+        w_name, w_field = fake_field(
+            "image_1024",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
         # test conversion
         self.assertEqual(widget.w_load(image_1024=False), {})
@@ -95,9 +111,15 @@ def test_widget_binary_load_from_record(self):
         )
 
     def test_widget_binary_load_from_request(self):
-        w_name, w_field = fake_field("image_1024", type="binary",)
+        w_name, w_field = fake_field(
+            "image_1024",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
         # test conversion
         self.assertEqual(widget.w_load(image_1024=False), {})
@@ -120,9 +142,15 @@ def test_widget_binary_load_from_request(self):
             )
 
     def test_widget_binary_extract_string(self):
-        w_name, w_field = fake_field("image", type="binary",)
+        w_name, w_field = fake_field(
+            "image",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
 
         # no value in request -> None
@@ -135,28 +163,45 @@ def test_widget_binary_extract_string(self):
         self.assertEqual(widget.w_extract(image=req_val, image_keepcheck="yes"), None)
         # value in request but keep flag is ON -> None
         self.assertEqual(
-            widget.w_extract(image=req_val, image_keepcheck="no"), TEST_IMAGE_JPG,
+            widget.w_extract(image=req_val, image_keepcheck="no"),
+            TEST_IMAGE_JPG,
         )
 
     def test_widget_binary_extract_filestorage(self):
-        w_name, w_field = fake_field("image", type="binary",)
+        w_name, w_field = fake_field(
+            "image",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
 
         # value in request but no check flag -> None
         with b64_as_stream(TEST_IMAGE_JPG) as stream:
             req_val = fake_file_from_request(
-                "image", stream=stream, filename="foo.jpg", content_type="image/jpeg",
+                "image",
+                stream=stream,
+                filename="foo.jpg",
+                content_type="image/jpeg",
             )
             self.assertEqual(
-                widget.w_extract(image=req_val, image_keepcheck="no"), TEST_IMAGE_JPG,
+                widget.w_extract(image=req_val, image_keepcheck="no"),
+                TEST_IMAGE_JPG,
             )
 
     def test_widget_binary_check_empty(self):
-        w_name, w_field = fake_field("image", type="binary",)
+        w_name, w_field = fake_field(
+            "image",
+            type="binary",
+        )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.image",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.image",
         )
 
         # no value at all -> empty
@@ -171,25 +216,35 @@ def test_widget_binary_check_empty(self):
             self.assertIs(widget.w_check_empty_value(req_val), True)
             # no filename and keep flag -> empty, since we want to preserve
             self.assertIs(
-                widget.w_check_empty_value(req_val, image_keepcheck="yes"), False,
+                widget.w_check_empty_value(req_val, image_keepcheck="yes"),
+                False,
             )
             req_val = fake_file_from_request(
-                "image", stream=stream, filename="foo.jpg", content_type="image/jpeg",
+                "image",
+                stream=stream,
+                filename="foo.jpg",
+                content_type="image/jpeg",
             )
             # got file w/ filename and no keep flag -> not empty
             self.assertIs(widget.w_check_empty_value(req_val), False)
             req_val = fake_file_from_request(
-                "image", stream=stream, filename="foo.jpg", content_type="image/jpeg",
+                "image",
+                stream=stream,
+                filename="foo.jpg",
+                content_type="image/jpeg",
             )
             # got file w/ filename and yes keep flag -> not empty
             self.assertIs(
-                widget.w_check_empty_value(req_val, image_keepcheck="yes"), False,
+                widget.w_check_empty_value(req_val, image_keepcheck="yes"),
+                False,
             )
             # got file w/ filename and no keep flag -> not empty
             self.assertIs(
-                widget.w_check_empty_value(req_val, image_keepcheck="no"), False,
+                widget.w_check_empty_value(req_val, image_keepcheck="no"),
+                False,
             )
             # got file w/ filename and yes keep flag -> not empty
             self.assertIs(
-                widget.w_check_empty_value(req_val, image_keepcheck="yes"), False,
+                widget.w_check_empty_value(req_val, image_keepcheck="yes"),
+                False,
             )
diff --git a/cms_form/tests/widgets/test_widget_boolean.py b/cms_form/tests/widgets/test_widget_boolean.py
index 75700764..d26567e1 100644
--- a/cms_form/tests/widgets/test_widget_boolean.py
+++ b/cms_form/tests/widgets/test_widget_boolean.py
@@ -7,7 +7,10 @@ class TestWidgetBoolean(TestWidgetCase):
     def _get_widget(self, field_value=False):
         """Initialize form w/ given value and return the widget."""
         form = fake_form(a_boolean_field=field_value)
-        w_name, w_field = fake_field("a_boolean_field", type="boolean",)
+        w_name, w_field = fake_field(
+            "a_boolean_field",
+            type="boolean",
+        )
         return self.get_widget(
             w_name, w_field, form=form, widget_model="cms.form.widget.boolean"
         )
diff --git a/cms_form/tests/widgets/test_widget_date.py b/cms_form/tests/widgets/test_widget_date.py
index 69dc2bc1..0ac9c4cf 100644
--- a/cms_form/tests/widgets/test_widget_date.py
+++ b/cms_form/tests/widgets/test_widget_date.py
@@ -12,7 +12,10 @@ def setUpClass(cls):
         cls.form = fake_form(a_date_field="2019-01-12", type="date")
         cls.w_name, cls.w_field = fake_field("a_date_field")
         cls.widget = cls.get_widget(
-            cls.w_name, cls.w_field, form=cls.form, widget_model="cms.form.widget.date",
+            cls.w_name,
+            cls.w_field,
+            form=cls.form,
+            widget_model="cms.form.widget.date",
         )
 
     def test_widget_date_input(self):
@@ -67,13 +70,16 @@ def test_widget_date_input_custom_dp_attrs(self):
         )
         self.assertEqual(widget.w_placeholder, "Custom")
         self.assertEqual(
-            widget.w_data_json(), '{"defaultToday": true, "dp": {"format": "%m.%Y"}}',
+            widget.w_data_json(),
+            '{"defaultToday": true, "dp": {"format": "%m.%Y"}}',
         )
 
     def test_widget_date_input_all_elems(self):
         node = self.to_xml_node(self.widget.render())[0]
         self._test_element_attributes(
-            node, "div", {"class": "input-group"},
+            node,
+            "div",
+            {"class": "input-group"},
         )
         self.assertEqual(len(node.getchildren()), 3)
         self._test_element_attributes(node.getchildren()[0], "input", {})
@@ -86,7 +92,9 @@ def test_widget_date_input_all_elems(self):
             {"class": "input-group-addon js_datepicker_trigger"},
         )
         self._test_element_attributes(
-            node.getchildren()[2].getchildren()[0], "span", {"class": "fa fa-calendar"},
+            node.getchildren()[2].getchildren()[0],
+            "span",
+            {"class": "fa fa-calendar"},
         )
 
     def test_widget_date_input_extract_default_format(self):
diff --git a/cms_form/tests/widgets/test_widget_float.py b/cms_form/tests/widgets/test_widget_float.py
index 3c7dd334..887a177c 100644
--- a/cms_form/tests/widgets/test_widget_float.py
+++ b/cms_form/tests/widgets/test_widget_float.py
@@ -10,7 +10,10 @@ def setUpClass(cls):
         form = fake_form(a_float_field=2.0)
         cls.w_name, cls.w_field = fake_field("a_float_field", type="float")
         cls.widget = cls.get_widget(
-            cls.w_name, cls.w_field, form=form, widget_model="cms.form.widget.float",
+            cls.w_name,
+            cls.w_field,
+            form=form,
+            widget_model="cms.form.widget.float",
         )
 
     def test_widget_float_input(self):
diff --git a/cms_form/tests/widgets/test_widget_hidden.py b/cms_form/tests/widgets/test_widget_hidden.py
index 30af5d94..36d3c7d7 100644
--- a/cms_form/tests/widgets/test_widget_hidden.py
+++ b/cms_form/tests/widgets/test_widget_hidden.py
@@ -22,7 +22,10 @@ def test_widget_char_input_hidden(self):
         """Test char field hidden."""
         w_name, w_field = fake_field("char_field")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -41,7 +44,10 @@ def test_widget_integer_input_hidden(self):
         """Test int field hidden."""
         w_name, w_field = fake_field("int_field", type="integer")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -55,7 +61,10 @@ def test_widget_float_input_hidden(self):
         """Test float field hidden."""
         w_name, w_field = fake_field("float_field", type="float")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -68,10 +77,15 @@ def test_widget_float_input_hidden(self):
     def test_widget_selection_string_input_hidden(self):
         """Test selection field hidden with string values."""
         w_name, w_field = fake_field(
-            "selection_str_field", type="selection", selection=[("1", "A"), ("2", "B")],
+            "selection_str_field",
+            type="selection",
+            selection=[("1", "A"), ("2", "B")],
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -84,10 +98,15 @@ def test_widget_selection_string_input_hidden(self):
     def test_widget_selection_integer_input_hidden(self):
         """Test selection field hidden with integer values."""
         w_name, w_field = fake_field(
-            "selection_integer_field", type="selection", selection=[(1, "A"), (2, "B")],
+            "selection_integer_field",
+            type="selection",
+            selection=[(1, "A"), (2, "B")],
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -105,7 +124,10 @@ def test_widget_selection_float_input_hidden(self):
             selection=[(4.0, "A"), (8.0, "B")],
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
@@ -119,7 +141,10 @@ def test_widget_many2one_input_hidden(self):
         """Test many2one field hidden."""
         w_name, w_field = fake_field("many2one_field", type="many2one")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.hidden",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.hidden",
         )
         expected_attrs = {
             "type": "hidden",
diff --git a/cms_form/tests/widgets/test_widget_integer.py b/cms_form/tests/widgets/test_widget_integer.py
index 7e746307..5eb7d176 100644
--- a/cms_form/tests/widgets/test_widget_integer.py
+++ b/cms_form/tests/widgets/test_widget_integer.py
@@ -16,7 +16,10 @@ def setUpClass(cls):
         form = fake_form(an_int_field=10)
         cls.w_name, cls.w_field = fake_field("an_int_field", type="integer")
         cls.widget = cls.get_widget(
-            cls.w_name, cls.w_field, form=form, widget_model="cms.form.widget.integer",
+            cls.w_name,
+            cls.w_field,
+            form=form,
+            widget_model="cms.form.widget.integer",
         )
 
     def test_widget_integer_input(self):
diff --git a/cms_form/tests/widgets/test_widget_many2one.py b/cms_form/tests/widgets/test_widget_many2one.py
index 08602aad..bd45a78f 100644
--- a/cms_form/tests/widgets/test_widget_many2one.py
+++ b/cms_form/tests/widgets/test_widget_many2one.py
@@ -23,7 +23,10 @@ def test_widget_many2one_base(self):
             domain=[("id", "in", self.partners.ids)],
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2one",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2one",
         )
         self.assertEqual(widget.w_comodel, self.env["res.partner"])
         self.assertEqual(widget.w_domain, [("id", "in", self.partners.ids)])
@@ -32,10 +35,15 @@ def test_widget_many2one_base(self):
     def test_widget_many2one_base_load(self):
         # TODO: test load value from form record
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2one",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2one",
         )
 
         self.assertEqual(widget.w_load(m2o_field="1"), 1)
@@ -49,10 +57,15 @@ def test_widget_many2one_base_load(self):
 
     def test_widget_many2one_base_extract(self):
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2one",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2one",
         )
 
         self.assertEqual(widget.w_extract(m2o_field="1"), 1)
@@ -70,10 +83,15 @@ def test_widget_many2one_base_extract(self):
 
     def test_widget_many2one_base_render(self):
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2one",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2one",
         )
         expected_attrs = {
             "id": "m2o_field",
@@ -86,7 +104,9 @@ def test_widget_many2one_base_render(self):
 
     def test_widget_many2one_multi(self):
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
             w_name,
@@ -108,7 +128,9 @@ def test_widget_many2one_multi(self):
 
     def test_widget_many2one_multi_load(self):
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
             w_name,
@@ -125,7 +147,9 @@ def test_widget_many2one_multi_load(self):
 
     def test_widget_many2one_multi_extract(self):
         w_name, w_field = fake_field(
-            "m2o_field", type="many2one", relation="res.partner",
+            "m2o_field",
+            type="many2one",
+            relation="res.partner",
         )
         widget = self.get_widget(
             w_name,
diff --git a/cms_form/tests/widgets/test_widget_radio.py b/cms_form/tests/widgets/test_widget_radio.py
index 3cef7d49..fd408786 100644
--- a/cms_form/tests/widgets/test_widget_radio.py
+++ b/cms_form/tests/widgets/test_widget_radio.py
@@ -19,10 +19,15 @@ def test_widget_radio_base(self):
             ("opt3", "Option 3"),
         ]
         w_name, w_field = fake_field(
-            "radio_field", type="selection", selection=select_options,
+            "radio_field",
+            type="selection",
+            selection=select_options,
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.radio",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.radio",
         )
         node = self.to_xml_node(widget.render())[0]
         self.assertIn("radio-select", node.attrib["class"])
@@ -50,9 +55,14 @@ def test_widget_radio_base(self):
             if i == 1:
                 expected_attrs["checked"] = "checked"
             self._test_element_attributes(
-                node_input, "input", expected_attrs,
+                node_input,
+                "input",
+                expected_attrs,
             )
             node_span = node_label.getchildren()[1]
             self._test_element_attributes(
-                node_span, "span", {}, text="Option %s" % (i + 1),
+                node_span,
+                "span",
+                {},
+                text="Option %s" % (i + 1),
             )
diff --git a/cms_form/tests/widgets/test_widget_selection.py b/cms_form/tests/widgets/test_widget_selection.py
index d634025e..a97a5737 100644
--- a/cms_form/tests/widgets/test_widget_selection.py
+++ b/cms_form/tests/widgets/test_widget_selection.py
@@ -19,10 +19,15 @@ def test_widget_selection_base(self):
             ("opt1", "Option 1"),
         ]
         w_name, w_field = fake_field(
-            "selection_char_field", type="selection", selection=select_options,
+            "selection_char_field",
+            type="selection",
+            selection=select_options,
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.selection",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.selection",
         )
         expected_attrs = {
             "id": "selection_char_field",
@@ -40,10 +45,15 @@ def test_widget_selection_char(self):
             ("opt3", "Option 3"),
         ]
         w_name, w_field = fake_field(
-            "selection_char_field", type="selection", selection=select_options,
+            "selection_char_field",
+            type="selection",
+            selection=select_options,
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.selection",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.selection",
         )
         expected_attrs = {
             "id": "selection_char_field",
@@ -72,10 +82,15 @@ def test_widget_selection_integer(self):
             (3, "Option 3"),
         ]
         w_name, w_field = fake_field(
-            "selection_integer_field", type="selection", selection=select_options,
+            "selection_integer_field",
+            type="selection",
+            selection=select_options,
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.selection",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.selection",
         )
         expected_attrs = {
             "id": "selection_integer_field",
@@ -104,10 +119,15 @@ def test_widget_selection_float(self):
             (3.0, "Option 3"),
         ]
         w_name, w_field = fake_field(
-            "selection_float_field", type="selection", selection=select_options,
+            "selection_float_field",
+            type="selection",
+            selection=select_options,
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.selection",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.selection",
         )
         expected_attrs = {
             "id": "selection_float_field",
@@ -127,7 +147,10 @@ def test_widget_selection_float(self):
             if i == 3:
                 expected_attrs["selected"] = "selected"
             self._test_element_attributes(
-                node_children[i], "option", expected_attrs, text="Option %s" % i,
+                node_children[i],
+                "option",
+                expected_attrs,
+                text="Option %s" % i,
             )
         # test conversion
         extracted = widget.w_extract(selection_float_field="3.0")
@@ -140,7 +163,10 @@ def test_widget_selection_non_selection_field(self):
             # do not pass `selection`
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.selection",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.selection",
         )
         # no selection found: should not fail and give back an empty list
         self.assertEqual(widget.w_option_items, [])
diff --git a/cms_form/tests/widgets/test_widget_text.py b/cms_form/tests/widgets/test_widget_text.py
index 42a6a3d4..ad36bedc 100644
--- a/cms_form/tests/widgets/test_widget_text.py
+++ b/cms_form/tests/widgets/test_widget_text.py
@@ -12,12 +12,18 @@ class TestWidgetTxt(TestWidgetCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.form = fake_form(a_char_field="Just a string", a_text_field=TXT,)
+        cls.form = fake_form(
+            a_char_field="Just a string",
+            a_text_field=TXT,
+        )
 
     def test_widget_char_input(self):
         w_name, w_field = fake_field("a_char_field")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.char",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.char",
         )
         expected_attrs = {
             "type": "text",
@@ -35,7 +41,10 @@ def test_widget_char_input(self):
     def test_widget_text_input(self):
         w_name, w_field = fake_field("a_text_field", type="text")
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.text",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.text",
         )
         expected_attrs = {
             "id": "a_text_field",
@@ -50,7 +59,10 @@ def test_widget_text_input(self):
     def test_widget_text_input_maxlength(self):
         w_name, w_field = fake_field("a_text_field", type="text", maxlength=100)
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.text",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.text",
         )
         node_items = self.to_xml_node(widget.render())
         self.assertEqual(len(node_items), 2)
@@ -62,7 +74,10 @@ def test_widget_text_input_maxlength(self):
             "maxlength": "100",
         }
         self._test_element_attributes(
-            node_textarea, "textarea", expected_attrs, text=TXT,
+            node_textarea,
+            "textarea",
+            expected_attrs,
+            text=TXT,
         )
         node_counter = node_items[1]
         expected_attrs = {
@@ -73,5 +88,7 @@ def test_widget_text_input_maxlength(self):
             "class": "form-control text-counter",
         }
         self._test_element_attributes(
-            node_counter, "input", expected_attrs,
+            node_counter,
+            "input",
+            expected_attrs,
         )
diff --git a/cms_form/tests/widgets/test_widget_x2many.py b/cms_form/tests/widgets/test_widget_x2many.py
index f5bedc6c..998bd5a5 100644
--- a/cms_form/tests/widgets/test_widget_x2many.py
+++ b/cms_form/tests/widgets/test_widget_x2many.py
@@ -24,17 +24,25 @@ def test_widget_x2many_base(self):
             domain=[("id", "in", self.partners.ids)],
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2many",
         )
         self.assertEqual(widget.w_comodel, self.env["res.partner"])
         self.assertEqual(widget.w_domain, [("id", "in", self.partners.ids)])
 
     def test_widget_x2many(self):
         w_name, w_field = fake_field(
-            "m2m_field", type="many2many", relation="res.partner",
+            "m2m_field",
+            type="many2many",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2many",
         )
         expected_attrs = {
             "id": "m2m_field",
@@ -50,10 +58,15 @@ def test_widget_x2many(self):
 
     def test_widget_x2many_base_load(self):
         w_name, w_field = fake_field(
-            "m2m_field", type="many2many", relation="res.partner",
+            "m2m_field",
+            type="many2many",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2many",
         )
         # test conversion
         self.assertEqual(widget.w_load(m2m_field=False), "[]")
@@ -70,10 +83,15 @@ def test_widget_x2many_base_load_from_record(self):
             main_object=partner,
         )
         w_name, w_field = fake_field(
-            "category_id", type="many2many", relation=categs._name,
+            "category_id",
+            type="many2many",
+            relation=categs._name,
         )
         widget = self.get_widget(
-            w_name, w_field, form=form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=form,
+            widget_model="cms.form.widget.many2many",
         )
         # flush categories if any
         partner.category_id = False
@@ -94,20 +112,30 @@ def test_widget_x2many_base_load_from_record(self):
 
     def test_widget_x2many_base_extract(self):
         w_name, w_field = fake_field(
-            "m2m_field", type="many2many", relation="res.partner",
+            "m2m_field",
+            type="many2many",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2many",
         )
         # test conversion
         self.assertEqual(widget.w_extract(m2m_field="1,2,3"), [1, 2, 3])
 
     def test_widget_x2many_load_no_value(self):
         w_name, w_field = fake_field(
-            "m2m_field", type="many2many", relation="res.partner",
+            "m2m_field",
+            type="many2many",
+            relation="res.partner",
         )
         widget = self.get_widget(
-            w_name, w_field, form=self.form, widget_model="cms.form.widget.many2many",
+            w_name,
+            w_field,
+            form=self.form,
+            widget_model="cms.form.widget.many2many",
         )
         self.assertEqual(widget.w_load(m2m_field=""), "[]")
         # empty value from default_get

From fae2a056319c2e7947eb4a04172308570201fe2b Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 11 Jul 2023 12:06:34 +0200
Subject: [PATCH 02/69] cms_form: prepare for v16 (and remove 'website')

---
 .pre-commit-config.yaml                       |   1 -
 cms_form/CHANGES.rst                          | 343 ------------------
 cms_form/README.rst                           |   4 +-
 cms_form/__manifest__.py                      |  28 +-
 cms_form/controllers/main.py                  |   6 +-
 cms_form/models/cms_form.py                   |  26 +-
 cms_form/models/cms_form_mixin.py             |  19 +-
 cms_form/models/cms_search_form.py            |   7 +-
 cms_form/static/src/js/ajax.js                |   1 +
 cms_form/static/src/js/date_widget.js         |   1 +
 cms_form/static/src/js/lock_copy_paste.js     |   1 +
 cms_form/static/src/js/master_slave.js        |   1 +
 cms_form/templates/assets.xml                 |  48 ---
 cms_form/templates/form.xml                   |  57 +--
 cms_form/templates/portal.xml                 |  24 ++
 cms_form/tests/common.py                      |   5 +-
 .../fake_models/fake_fields_form_fieldsets.py |   1 +
 .../fake_models/fake_nonpub_model_form.py     |   4 +-
 .../tests/fake_models/fake_pub_model_form.py  |  10 +-
 cms_form/tests/test_controllers.py            |   7 +-
 cms_form/tests/test_form_base.py              |   3 +-
 cms_form/tests/test_form_cms.py               |   2 +-
 cms_form/tests/test_form_permission.py        |   2 +-
 cms_form/tests/test_form_search.py            |   2 +-
 cms_form/tests/utils.py                       |  10 +-
 cms_form/tests/widgets/common.py              |   6 +-
 setup/cms_form/odoo/addons/cms_form           |   1 +
 setup/cms_form/setup.py                       |   6 +
 28 files changed, 156 insertions(+), 470 deletions(-)
 delete mode 100644 cms_form/CHANGES.rst
 delete mode 100644 cms_form/templates/assets.xml
 create mode 100644 cms_form/templates/portal.xml
 create mode 120000 setup/cms_form/odoo/addons/cms_form
 create mode 100644 setup/cms_form/setup.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a2e57182..f799c9e3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,6 @@
 exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
-  ^cms_form/|
   ^cms_form_example/|
   # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops
diff --git a/cms_form/CHANGES.rst b/cms_form/CHANGES.rst
deleted file mode 100644
index f484fdde..00000000
--- a/cms_form/CHANGES.rst
+++ /dev/null
@@ -1,343 +0,0 @@
-=========
-CHANGELOG
-=========
-
-11.0.1.6.3 (2019-01-18)
-=======================
-
-**Fixes**
-
-* binary widget test cov + fix value handling
-* x2many widget test cov + fix value handling
-* fix selection widget w/ non-Selection field
-* cms.form.mixin test cov 100%
-* utils test cov 100%
-* widgets test cov 100%
-
-
-11.0.1.6.2 (2018-08-21)
-=======================
-
-**Fixes**
-
-* Date widget JS datepicker default date regression
-
-  Make sure we use today date unless specified otherwise.
-
-
-11.0.1.6.1 (2018-08-07)
-=======================
-
-**Fixes**
-
-* Date widget JS datepicker options custom
-
-  You can now override all the options of the datepicker via `data`.
-  For instance::
-
-      def form_get_widget(self, fname, field, **kw):
-          """Customize datepicker."""
-          if fname == 'date':
-              kw['data'] = {
-                  'minDate': '2018-01-01'
-              }
-          return super().form_get_widget(fname, field, **kw)
-
-
-11.0.1.6.0 (2018-07-25)
-=======================
-
-**Improvements**
-
-* Add `:float` marshaller
-
-  You can now use `$foo:float` as field name to cast value to float.
-
-* Hidden input respect field type value
-
-  Hidden input values pass through requests as chars.
-  This means that any m2o or selection field with integer/float values
-  won't be really happy on create/write.
-
-  Now we rely on request marshallers to convert those values
-  to correct values based on field type.
-
-  NOTE: this is the preliminary step for adopting marshallers
-  for all field types/widgets when needed.
-
-
-**Fixes**
-
-* Fix `safe_to_date` to make form extractor happy
-
-  Form extractor ignores non required fields if their values is `None`.
-  In the case of the date field, the util was returning `False`
-  even if the value was not submitted, leading to an ORM error
-  whenever the missing field was required.
-
-  Now we return `None` and let the extractor deal with proper values
-  and validation.
-
-**Coverage**
-
-* Test field wrapper rendering
-* Test css klass methods
-* Test `get_widget`
-* Test conversion of no value
-* Test fieldsets rendering
-
-  Make sure fieldsets are not rendered if they have no fields.
-
-* Allow to skip HttpCase on demand
-
-  Super-useful when you use pytest which does not support them.
-
-* Add basic tests for widget
-* Add test for hidden widget
-* Add test for char widget
-
-
-11.0.1.5.2 (2018-07-12)
-=======================
-
-**Fixes**
-
-* Fix ordering w/ `groups` protected fields
-
-  If `groups` attribute was assigned to a field
-  it made fields ordering crash as the field is not there
-  when groups are not satisfied
-
-* Fix selection widget to handle integer values
-
-  `fields.Selection` can hold both strings and integer values.
-  Till the value was not converted automatically
-  and using selection fields w/ integer values was a bit complex
-  as you had to convert it yourself or use a str selection field.
-
-  Now the widget inspects selection options
-  and converts request value accordingly.
-
-
-11.0.1.5.1 (2018-07-09)
-=======================
-
-**Fixes**
-
-* Fix regression fields ordering + hidden
-
-  When calling `form_fields` w/ hidden=True/False
-  the order of the fields was not respected anymore.
-
-  This a regression from commit 56b37ca
-
-
-11.0.1.5.0 (2018-07-06)
-=======================
-
-**Improvements**
-
-* Handle hidden input automatically
-
-  You can now specify `_form_fields_hidden = ('foo', )`
-  to get hidden inputs. All fields declared here
-  will be rendered as `<input type="hidden" />`.
-
-
-11.0.1.4.4 (2018-07-04)
-=======================
-
-**Fixes**
-
-* Search form: fix default URL py3 compat
-
-
-11.0.1.4.3 (2018-07-04)
-=======================
-
-**Fixes**
-
-* Be defensive on error block render (do not fail if none)
-* Widgets: fix missing `required` attribute
-* Search form: discard empty strings in search domain
-* Cleanup controller render values
-
-  When you submit a form and there's an error Odoo will give you back
-  all submitted values into `kw` but:
-
-  1. we don't need them since all values are encapsulated
-     into form.form_render_values
-     and are already accessible on each widget
-
-  2. this can break website rendering because you might have fields
-     w/ a name that overrides a rendering value not related to a form.
-     Most common example: field named `website` will override
-     odoo record for current website.
-
-
-11.0.1.4.2 (2018-05-31)
-=======================
-
-**Improvements**
-
-* Search form: use safe default for pager url
-* Search form: support quick domain rules via `_form_search_domain_rules`
-
-
-11.0.1.4.1 (2018-04-29)
-=======================
-
-**Docs**
-
-* Move documentation from README to `doc` folder
-
-
-11.0.1.4.0 (2018-04-27)
-=======================
-
-**Improvements**
-
-* Include wizard name in form wrapper klass
-* Add request marshallers and tests
-* Search form: pass `pager` as render value
-
-  This change is to facilitate templates that need a pager
-  to generate page metadata (like links prev/next).
-
-  A good use case is the SEO friendly `website_canonical_url`.
-
-* Rely on `cms_info` for permission and URLs
-
-
-**Fixes**
-
-* Fix `fake_session` helper in form tests common
-
-
-11.0.1.3.1 (2018-04-22)
-=======================
-
-**Improvements**
-
-* Wizard: ease customization of stored values
-
-  To customize stored values you can override `_prepare_step_values_to_store`
-
-
-11.0.1.3.0 (2018-04-17)
-=======================
-
-**Improvements**
-
-* Add wizard support to easily create custom wizards
-
-
-11.0.1.2.1 (2018-04-13)
-=======================
-
-**Fixes**
-
-* Fix search form regression on permission check
-
-  In 32a662e I've moved permission check from controller to form
-  but I missed the bypass for search forms.
-
-
-11.0.1.2.0 (2018-04-09)
-=======================
-
-**Improvements**
-
-* Add error msg block for validation errors right below field
-* Support multiple values for same field
-
-  In the input markup you can set the field name as `$fname:list`.
-
-  This will make the form transform submitted values as a list.
-
-  Example::
-
-      <input name="foo:list" type="checkbox" value="1" />
-      <input name="foo:list" type="checkbox" value="2" />
-      <input name="foo:list" type="checkbox" value="3" />
-
-  Will be translated to: `{'foo': [1, 2, 3]}`
-
-
-* Add `lock copy paste` option
-
-  You can now pass `lock_copy_paste` to widget init via `css_klass` arg
-  to set an input/text w/ copy/paste disabled.
-
-  Example::
-
-      def form_get_widget(self, fname, field, **kw):
-          """Disable copy paste on `foo`."""
-          if fname == 'foo':
-              kw['css_klass'] = 'lock_copy_paste'
-          return super().form_get_widget(fname, field, **kw)
-
-
-* `form_get_widget` pass keyword args to ease customization
-* Form controller: better HTTP status for redirect (303) and no cache
-* Improve custom attributes override
-* Move `check_permission` to form
-
-  You can now customize permission check on each form.
-  Before this change you had to override the controller to gain control on it.
-
-
-**Fixes**
-
-* Fix required attr on boolean widget (was not considered)
-* `_form_create` + `_form_write` use a copy of values to avoid pollution by Odoo
-* Fix handling of forms w/ no form_model
-  (some code blocks were relying on `form_model` to be there)
-
-
-11.0.1.1.1 (2018-03-26)
-=======================
-
-**Fixes**
-
-* Fix date widget: default today only if empty
-
-
-11.0.1.1.0 (2018-03-26)
-=======================
-
-**Improvements**
-
-* Delegate field wrapper class computation to form
-* Add vertical fields option
-* Add multi value widget for search forms
-* Improve date widget: allow custom default today
-
-**Fixes**
-
-* Fix fieldset support for search forms
-* Fix date search w/ empty value
-* Fix json params rendering on widgets
-
-
-11.0.1.0.4 (2018-03-23)
-=======================
-
-**Improvements**
-
-* Ease override of JSON info
-* Add fieldsets support
-* cms_form_example: add fieldsets forms
-
-
-11.0.1.0.3 (2018-03-21)
-=======================
-
-**Improvements**
-
-* Form controller: main_object defaults to empty recordset
-
-**Fixes**
-
-* Fix x2m widget value comparison
-* Fix x2m widget load default value empt^^
diff --git a/cms_form/README.rst b/cms_form/README.rst
index a8dd7f64..45c4137c 100644
--- a/cms_form/README.rst
+++ b/cms_form/README.rst
@@ -5,9 +5,9 @@
 CMS Form
 ========
 
-Basic website contents form framework. Allows to define front-end forms for every models in a simple way.
+Advanced contents form framework. Allows to define front-end forms for every models in a simple way.
 
-If you are tired of re-defining every time an edit form or a search form for your odoo website,
+If you are tired of re-defining every time an edit form or a search form for your odoo portal or website,
 this is the module you are looking for.
 
 Features
diff --git a/cms_form/__manifest__.py b/cms_form/__manifest__.py
index 48cb8575..6b3dad3c 100644
--- a/cms_form/__manifest__.py
+++ b/cms_form/__manifest__.py
@@ -5,17 +5,35 @@
     "name": "CMS Form",
     "summary": """
         Basic content type form""",
-    "version": "13.0.1.0.1",
+    "version": "16.0.1.0.0",
     "license": "LGPL-3",
     "author": "Camptocamp, Odoo Community Association (OCA)",
-    "mainainers": ["simahawk"],
+    "maintainers": ["simahawk"],
     "website": "https://github.com/OCA/website-cms",
-    "depends": ["website", "cms_info", "cms_status_message"],
+    "depends": [
+        "cms_info",
+        "cms_status_message",
+        # TODO: get rid of portal too
+        "portal",
+    ],
     "data": [
         "security/cms_form.xml",
-        "templates/assets.xml",
         "templates/form.xml",
         "templates/widgets.xml",
+        "templates/portal.xml",
     ],
-    "installable": False,
+    "installable": True,
+    "assets": {
+        "web.assets_frontend": [
+            "cms_form/static/src/scss/cms_form.scss",
+            "cms_form/static/src/scss/progressbar.scss",
+            # TODO: review them all w/ modern JS
+            "cms_form/static/src/js/select2widgets.js",
+            "cms_form/static/src/js/date_widget.js",
+            "cms_form/static/src/js/textarea_widget.js",
+            "cms_form/static/src/js/master_slave.js",
+            "cms_form/static/src/js/lock_copy_paste.js",
+            "cms_form/static/src/js/ajax.js",
+        ],
+    },
 }
diff --git a/cms_form/controllers/main.py b/cms_form/controllers/main.py
index 6d8feb65..8098280f 100644
--- a/cms_form/controllers/main.py
+++ b/cms_form/controllers/main.py
@@ -12,7 +12,7 @@
 class FormControllerMixin(object):
 
     # default template
-    template = "cms_form.form_wrapper"
+    template = "cms_form.portal_form_wrapper"
 
     def get_template(self, form, **kw):
         """Retrieve rendering template.
@@ -142,7 +142,7 @@ def cms_form(self, model, model_id=None, **kw):
 
 class WizardFormControllerMixin(FormControllerMixin):
 
-    template = "cms_form.wizard_form_wrapper"
+    template = "cms_form.portal_wizard_form_wrapper"
 
     def make_response(self, wiz_model, model_id=None, page=1, **kw):
         """Custom response.
@@ -176,7 +176,7 @@ def cms_wiz(self, wiz_model, model_id=None, **kw):
 
 class SearchFormControllerMixin(FormControllerMixin):
 
-    template = "cms_form.search_form_wrapper"
+    template = "cms_form.portal_search_form_wrapper"
 
     def form_model_key(self, model, **kw):
         return "cms.form.search." + model
diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index adaa79f1..4cdac449 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -79,8 +79,8 @@ def form_next_url(self, main_object=None):
             # redirect overridden
             return self.request.args.get("redirect")
         main_object = main_object or self.main_object
-        if main_object and "website_url" in main_object:
-            return main_object.website_url
+        if main_object and main_object.url:
+            return main_object.url
         return "/"
 
     def form_cancel_url(self, main_object=None):
@@ -89,8 +89,8 @@ def form_cancel_url(self, main_object=None):
             # redirect overridden
             return self.request.args.get("redirect")
         main_object = main_object or self.main_object
-        if main_object and "website_url" in main_object:
-            return main_object.website_url
+        if main_object and main_object.url:
+            return main_object.url
         return self.request.referrer or "/"
 
     def form_check_empty_value(self, fname, field, value, **req_values):
@@ -121,9 +121,9 @@ def form_validate(self, request_values=None):
                 errors_message[fname] = error_msg
 
         # error message for empty required fields
-        if missing and self.o_request.website:
+        if missing:
             msg = self.form_msg_error_missing
-            self.o_request.website.add_status_message(msg, type_="danger")
+            self.add_status_message(msg, type_="danger")
         return errors, errors_message
 
     def form_get_validator(self, fname, field):
@@ -181,8 +181,8 @@ def form_create_or_update(self):
         else:
             self._form_create(write_values)
             msg = self.form_msg_success_created
-        if msg and self.o_request.website:
-            self.o_request.website.add_status_message(msg)
+        if msg:
+            self.add_status_message(msg)
         # post hook
         self.form_after_create_or_update(write_values, extra_values)
         return self.main_object
@@ -229,9 +229,11 @@ def form_process_POST(self, render_values):
         orm_error = errors.get("_validation") or errors.get("_integrity")
         if orm_error:
             msg = errors_message.get("_validation") or errors_message.get("_integrity")
-            if msg and self.o_request.website:
-                self.o_request.website.add_status_message(
-                    msg, type_="danger", title=None
-                )
+            if msg:
+                self.add_status_message(msg, type_="danger", title=None)
         render_values.update({"errors": errors, "errors_message": errors_message})
         return render_values
+
+    def add_status_message(self, msg, **kw):
+        # TODO: allow add_status_message to receive a `request` arg
+        self.env["ir.http"].add_status_message(msg, **kw)
diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index cf0a1c79..71c3894f 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -20,6 +20,7 @@
     "message_unread",
     "message_unread_counter",
     "message_needaction_counter",
+    # Loose dep
     "website_message_ids",
     "website_published",
 ] + models.MAGIC_COLUMNS
@@ -115,6 +116,7 @@ class CMSFormMixin(models.AbstractModel):
     __form_fields_ignore = IGNORED_FORM_FIELDS
     # current edit object if any
     __form_main_object = None
+    _o_request = None
     # default is to post the form and have a full reload. Set to true to keep
     # the search form as it is and only replace the result pane
     _form_ajax = False
@@ -131,6 +133,14 @@ def main_object(self, value):
         """Current main object setter."""
         self.__form_main_object = value
 
+    @property
+    def o_request(self):
+        return self._o_request
+
+    @o_request.setter
+    def o_request(self, value):
+        self._o_request = value
+
     def form_init(self, request, main_object=None, **kw):
         """Initalize a form instance.
 
@@ -160,16 +170,15 @@ def form_check_permission(self, raise_exception=True):
             else:
                 # `cms.info.mixin` not provided by model.
                 res = self._can_edit(raise_exception=False)
-            msg = _("You cannot edit this record. Model: %s, ID: %s.") % (
-                self.main_object._name,
-                self.main_object.id,
+            msg = _(
+                "You cannot edit this record. Model: %(model)s, ID: %(obj_id)s.",
+                dict(model=self.main_object._name, obj_id=self.main_object.id),
             )
         else:
             if self._form_model:
                 if hasattr(self.form_model, "cms_can_create"):
                     res = self.form_model.cms_can_create()
                 else:
-                    # not `website.published.mixin` model
                     res = self._can_create(raise_exception=False)
                 msg = (
                     _("You are not allowed to create any record for the model `%s`.")
@@ -503,7 +512,7 @@ def form_render(self, **kw):
         values["field_wrapper_template"] = "cms_form.form_{}_field_wrapper".format(
             self.form_display_mode
         )
-        return self.env.ref(self.form_template).render(values)
+        return self.env["ir.qweb"]._render(self.form_template, values)
 
     def form_process(self, **kw):
         """Process current request.
diff --git a/cms_form/models/cms_search_form.py b/cms_form/models/cms_search_form.py
index c7eb5ddb..fd43a363 100644
--- a/cms_form/models/cms_search_form.py
+++ b/cms_form/models/cms_search_form.py
@@ -4,6 +4,8 @@
 from odoo import _, models
 from odoo.tools import pycompat
 
+from odoo.addons.portal.controllers.portal import pager as portal_pager
+
 
 class CMSFormSearch(models.AbstractModel):
     _name = "cms.form.search"
@@ -43,9 +45,10 @@ def form_check_permission(self):
 
     def form_update_fields_attributes(self, _fields):
         """No field should be mandatory."""
-        super().form_update_fields_attributes(_fields)
+        res = super().form_update_fields_attributes(_fields)
         for _fname, field in _fields.items():
             field["required"] = False
+        return res
 
     def form_get_widget_model(self, fname, field):
         """Search via related field needs a simple char widget."""
@@ -116,7 +119,7 @@ def _form_get_url_for_pager(self, render_values):
         return url
 
     def pager(self, **kw):
-        return self.env["website"].pager(**kw)
+        return portal_pager(**kw)
 
     def _form_results_pager(self, count=None, page=0, url="", url_args=None):
         """Prepare pager for current search."""
diff --git a/cms_form/static/src/js/ajax.js b/cms_form/static/src/js/ajax.js
index d390fb61..a429e91f 100644
--- a/cms_form/static/src/js/ajax.js
+++ b/cms_form/static/src/js/ajax.js
@@ -1,6 +1,7 @@
 odoo.define("cms_form.ajax", function (require) {
     "use strict";
 
+    // FIXME: website dep
     var core = require("web.core"),
         animation = require("website.content.snippets.animation");
 
diff --git a/cms_form/static/src/js/date_widget.js b/cms_form/static/src/js/date_widget.js
index c1bf0d23..f1c6db33 100644
--- a/cms_form/static/src/js/date_widget.js
+++ b/cms_form/static/src/js/date_widget.js
@@ -1,6 +1,7 @@
 odoo.define("cms_form.date_widget", function (require) {
     "use strict";
 
+    // FIXME: website dep
     var sAnimation = require("website.content.snippets.animation");
     var time_utils = require("web.time");
 
diff --git a/cms_form/static/src/js/lock_copy_paste.js b/cms_form/static/src/js/lock_copy_paste.js
index 6973716b..e5661371 100644
--- a/cms_form/static/src/js/lock_copy_paste.js
+++ b/cms_form/static/src/js/lock_copy_paste.js
@@ -1,6 +1,7 @@
 odoo.define("cms_form.lock_copy_paste", function (require) {
     "use strict";
 
+    // FIXME: website dep
     var sAnimation = require("website.content.snippets.animation");
 
     sAnimation.registry.CMSFormLockCopyPaste = sAnimation.Class.extend({
diff --git a/cms_form/static/src/js/master_slave.js b/cms_form/static/src/js/master_slave.js
index 76313464..503c428b 100644
--- a/cms_form/static/src/js/master_slave.js
+++ b/cms_form/static/src/js/master_slave.js
@@ -7,6 +7,7 @@ odoo.define("cms_form.master_slave", function (require) {
 
     // TODO: this does not work ATM :(
     // var pyeval = require('web.pyeval');
+    // FIXME: website dep
     var sAnimation = require("website.content.snippets.animation");
 
     sAnimation.registry.CMSFormMasterSlave = sAnimation.Class.extend({
diff --git a/cms_form/templates/assets.xml b/cms_form/templates/assets.xml
deleted file mode 100644
index 2fc66be2..00000000
--- a/cms_form/templates/assets.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-Copyright 2017 Simone Orsi
-License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
--->
-<odoo>
-    <template
-        id="assets_frontend"
-        name="CMS Form frontend assets"
-        inherit_id="website.assets_frontend"
-    >
-        <xpath expr="//link[last()]" position="after">
-            <link
-                rel="stylesheet"
-                type="text/scss"
-                href="/cms_form/static/src/scss/cms_form.scss"
-            />
-            <link
-                rel="stylesheet"
-                type="text/scss"
-                href="/cms_form/static/src/scss/progressbar.scss"
-            />
-        </xpath>
-        <xpath expr="//script[last()]" position="after">
-            <script
-                type="text/javascript"
-                src="/cms_form/static/src/js/select2widgets.js"
-            />
-            <script
-                type="text/javascript"
-                src="/cms_form/static/src/js/date_widget.js"
-            />
-            <script
-                type="text/javascript"
-                src="/cms_form/static/src/js/textarea_widget.js"
-            />
-            <script
-                type="text/javascript"
-                src="/cms_form/static/src/js/master_slave.js"
-            />
-            <script
-                type="text/javascript"
-                src="/cms_form/static/src/js/lock_copy_paste.js"
-            />
-            <script type="text/javascript" src="/cms_form/static/src/js/ajax.js" />
-        </xpath>
-    </template>
-</odoo>
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index ce16e366..3c213c18 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -5,23 +5,22 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
 <odoo>
     <template id="form_wrapper" name="CMS form wrapper">
-        <t t-call="website.layout">
-            <t t-set="title" t-value="form.form_title" />
-            <div id="wrap" t-att-class="form.form_wrapper_css_klass">
-                <div class="container">
-                    <t t-if="form.form_title">
-                        <h2>
-                            <span class="form_title" t-esc="form.form_title" />
-                        </h2>
-                    </t>
-                    <t t-if="form.form_description">
-                        <p class="form_description" t-esc="form.form_description" />
-                    </t>
-                    <t t-raw="form.form_render()" />
-                </div>
+        <t t-set="title" t-value="form.form_title" />
+        <div id="wrap" t-att-class="form.form_wrapper_css_klass">
+            <div class="container">
+                <t t-if="form.form_title">
+                    <h2>
+                        <span class="form_title" t-esc="form.form_title" />
+                    </h2>
+                </t>
+                <t t-if="form.form_description">
+                    <p class="form_description" t-esc="form.form_description" />
+                </t>
+                <t t-raw="form.form_render()" />
             </div>
-        </t>
+        </div>
     </template>
+
     <template
         id="form_horizontal_field_wrapper"
         name="CMS form field wrapper horiz form"
@@ -217,6 +216,11 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </div>
         </xpath>
     </template>
+    <template id="portal_search_form_wrapper" name="CMS search portal form wrapper">
+        <t t-call="portal.portal_layout">
+            <t t-call="cms_form.search_form_wrapper" />
+        </t>
+    </template>
     <template
         id="search_form_buttons"
         name="CMS search form buttons"
@@ -231,10 +235,11 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </div>
         </xpath>
     </template>
-    <template
+    <!-- FIXME -->
+    <!--template
         id="search_results_pager"
         name="CMS form pager"
-        inherit_id="website.pager"
+        inherit_id="portal.pager"
         primary="True"
     >
         <xpath expr="./ul/li[1]/a" position="attributes">
@@ -250,7 +255,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             pager['page']['num'] + 1 if pager['page']['num'] &lt; pager['page_count'] else None
         </attribute>
         </xpath>
-    </template>
+    </template-->
     <template id="search_results" name="CMS form search results">
         <t t-foreach="form.form_search_results['results']" t-as="item">
             <div
@@ -259,16 +264,17 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-attf-data-item='{"id": #{item.id}}'
             >
                 <h3 class="item-name">
-                    <t t-if="'website_url' in item">
-                        <a t-att-href="item.website_url" t-field="item.display_name" />
+                    <t t-if="'url' in item">
+                        <a t-att-href="item.url" t-field="item.display_name" />
                     </t>
-                    <t t-if="'website_url' not in item">
+                    <t t-if="'url' not in item">
                         <span t-field="item.display_name" />
                     </t>
                 </h3>
-                <t t-if="'website_description' in item">
+                <!-- TODO: define glue field `cms_description` -->
+                <!-- <t t-if="'website_description' in item">
                     <p class="item-description" t-field="item.website_description" />
-                </t>
+                </t> -->
             </div>
         </t>
         <div class="text-center mb32">
@@ -289,6 +295,11 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </t>
         </t>
     </template>
+    <template id="portal_wizard_form_wrapper" name="CMS wizard portal form wrapper">
+        <t t-call="portal.portal_layout">
+            <t t-call="cms_form.wizard_form_wrapper" />
+        </t>
+    </template>
     <template id="wizard_progress_bar" name="CMS Wizard progress bar">
         <ul class="status-bar wizard-status-bar hidden-xs">
             <t t-set="current_step" t-value="form.wiz_current_step()" />
diff --git a/cms_form/templates/portal.xml b/cms_form/templates/portal.xml
new file mode 100644
index 00000000..91d25d1d
--- /dev/null
+++ b/cms_form/templates/portal.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+Copyright 2023 Simone Orsi
+License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+-->
+<odoo>
+    <template id="portal_form_wrapper" name="CMS portal form wrapper">
+        <t t-call="portal.portal_layout">
+            <t t-call="cms_form.form_wrapper" />
+        </t>
+    </template>
+
+    <template id="portal_search_form_wrapper" name="CMS search portal form wrapper">
+        <t t-call="portal.portal_layout">
+            <t t-call="cms_form.search_form_wrapper" />
+        </t>
+    </template>
+
+    <template id="portal_wizard_form_wrapper" name="CMS wizard portal form wrapper">
+        <t t-call="portal.portal_layout">
+            <t t-call="cms_form.wizard_form_wrapper" />
+        </t>
+    </template>
+</odoo>
diff --git a/cms_form/tests/common.py b/cms_form/tests/common.py
index 44a176a2..a047d10a 100644
--- a/cms_form/tests/common.py
+++ b/cms_form/tests/common.py
@@ -4,7 +4,7 @@
 from lxml import html
 from odoo_test_helper import FakeModelLoader
 
-from odoo.tests.common import HttpCase, SavepointCase
+from odoo.tests.common import HttpCase, TransactionCase
 
 from .utils import fake_request, fake_session, session_store
 
@@ -79,7 +79,7 @@ def assert_match_inputs(self, node, expected):
             self.assertEqual(len(self.find_input_name(node, name)), 1)
 
 
-class FormTestCase(SavepointCase, FakeModelMixin):
+class FormTestCase(TransactionCase, FakeModelMixin):
     """Form test cases."""
 
     at_install = False
@@ -118,6 +118,7 @@ class FormRenderTestCase(FormTestCase, HTMLRenderMixin):
 class FormHttpTestCase(HttpCase, FakeModelMixin, HTMLRenderMixin):
     """Form test cases where you test HTML rendering and HTTP requests."""
 
+    # FIXME: use setupClass
     def setUp(self):
         # HttpCase has no ENV on setUpClass we have to setup fake models here
         super().setUp()
diff --git a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
index 52cdd859..6c163bfd 100644
--- a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
+++ b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
@@ -26,4 +26,5 @@ class FakeFieldsFormWithFieldsets(models.AbstractModel):
         },
         {"id": "protected", "fields": ["ihaveagroup"]},
     ]
+    # FIXME
     ihaveagroup = fields.Char(groups="website.group_website_designer")
diff --git a/cms_form/tests/fake_models/fake_nonpub_model_form.py b/cms_form/tests/fake_models/fake_nonpub_model_form.py
index 3fa276f2..08d16daa 100644
--- a/cms_form/tests/fake_models/fake_nonpub_model_form.py
+++ b/cms_form/tests/fake_models/fake_nonpub_model_form.py
@@ -4,8 +4,8 @@
 from odoo import fields, models
 
 
-# `AbstractModel` or `TransientModel` needed to make ACL check happy`
-class FakeNonPubModel(models.TransientModel):
+# `AbstractModel` or `AbstractModel` needed to make ACL check happy`
+class FakeNonPubModel(models.AbstractModel):
     _name = "fake.non.publishable"
     _description = "CMS Form fake non publishable model"
     name = fields.Char()
diff --git a/cms_form/tests/fake_models/fake_pub_model_form.py b/cms_form/tests/fake_models/fake_pub_model_form.py
index 77c0b71a..9a686992 100644
--- a/cms_form/tests/fake_models/fake_pub_model_form.py
+++ b/cms_form/tests/fake_models/fake_pub_model_form.py
@@ -4,18 +4,18 @@
 from odoo import fields, models
 
 
-# `AbstractModel` or `TransientModel` needed to make ACL check happy`
-class FakePubModel(models.TransientModel):
+# `AbstractModel` or `AbstractModel` needed to make ACL check happy`
+class FakePubModel(models.AbstractModel):
     _name = "fake.publishable"
     _inherit = [
-        "website.published.mixin",
+        "cms.info.mixin",
     ]
     _description = "CMS Form fake publishable model form"
     name = fields.Char()
 
-    def _compute_website_url(self):
+    def _compute_cms_view_url(self):
         for item in self:
-            item.website_url = "/publishable/%d" % item.id
+            item.url = "/publishable/%d" % item.id
 
 
 class FakePubModelForm(models.AbstractModel):
diff --git a/cms_form/tests/test_controllers.py b/cms_form/tests/test_controllers.py
index dd958a4b..888ecfa9 100644
--- a/cms_form/tests/test_controllers.py
+++ b/cms_form/tests/test_controllers.py
@@ -4,8 +4,7 @@
 import os
 import unittest
 from contextlib import contextmanager
-
-import mock
+from unittest import mock
 
 from ..controllers import main
 from .common import FormHttpTestCase
@@ -150,9 +149,9 @@ def test_redirect_after_success(self):
                 "res.partner", model_id=partner.id
             )
             self.assertEqual(response.status_code, 303)
-            if "website_url" in partner:
+            if "url" in partner:
                 # website_partner installed
-                self.assertEqual(response.location, partner.website_url)
+                self.assertEqual(response.location, partner.url)
             else:
                 self.assertEqual(response.location, "/")
 
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index eae3eb2f..ae63f01e 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -1,7 +1,8 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import mock
+from unittest import mock
+
 from werkzeug.wrappers import Request
 
 from odoo import http
diff --git a/cms_form/tests/test_form_cms.py b/cms_form/tests/test_form_cms.py
index b5c71101..4af6aada 100644
--- a/cms_form/tests/test_form_cms.py
+++ b/cms_form/tests/test_form_cms.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import mock
+from unittest import mock
 
 from odoo import exceptions
 from odoo.tools import mute_logger
diff --git a/cms_form/tests/test_form_permission.py b/cms_form/tests/test_form_permission.py
index 56cd1012..58fd194a 100644
--- a/cms_form/tests/test_form_permission.py
+++ b/cms_form/tests/test_form_permission.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import mock
+from unittest import mock
 
 from odoo import exceptions
 
diff --git a/cms_form/tests/test_form_search.py b/cms_form/tests/test_form_search.py
index db17d608..1a7edf41 100644
--- a/cms_form/tests/test_form_search.py
+++ b/cms_form/tests/test_form_search.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import mock
+from unittest import mock
 
 from .common import FormTestCase
 from .utils import fake_request
diff --git a/cms_form/tests/utils.py b/cms_form/tests/utils.py
index b1238188..8cd4acb1 100644
--- a/cms_form/tests/utils.py
+++ b/cms_form/tests/utils.py
@@ -5,14 +5,14 @@
 import io
 import urllib.parse
 from contextlib import contextmanager
+from unittest import mock
 
-import mock
-from werkzeug.contrib.sessions import SessionStore
 from werkzeug.datastructures import FileStorage
 from werkzeug.wrappers import Request
 
 from odoo import api, http
 from odoo.tests.common import get_db_name
+from odoo.tools._vendor.sessions import SessionStore
 
 
 def fake_request(
@@ -37,8 +37,7 @@ def fake_request(
     )
     w_req.session = session if session is not None else mock.MagicMock()
     # odoo request
-    o_req = http.HttpRequest(w_req)
-    o_req.website = mock.MagicMock()
+    o_req = http.Request(w_req)
     o_req.csrf_token = mock.MagicMock()
     o_req.httprequest = w_req
     o_req.__testing__ = True
@@ -51,7 +50,7 @@ def delete(self, session):
         del session
 
 
-session_store = FakeSessionStore(session_class=http.OpenERPSession)
+session_store = FakeSessionStore(session_class=http.Session)
 
 
 def fake_session(env, **kw):
@@ -64,7 +63,6 @@ def fake_session(env, **kw):
     session.password = ""
     session.context = dict(env.context)
     session.context["uid"] = env.uid
-    session._fix_lang(session.context)
     for k, v in kw.items():
         if hasattr(session, k):
             setattr(session, k, v)
diff --git a/cms_form/tests/widgets/common.py b/cms_form/tests/widgets/common.py
index 803b0e98..ce70f9da 100644
--- a/cms_form/tests/widgets/common.py
+++ b/cms_form/tests/widgets/common.py
@@ -1,8 +1,8 @@
 # Copyright 2018 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-import mock
+from unittest import mock
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 from ..common import HTMLRenderMixin
 
@@ -52,7 +52,7 @@ def get_widget(env, fname, field, form=None, widget_model=None, **kw):
     return env[widget_model].widget_init(form, fname, field, **kw)
 
 
-class TestWidgetCase(SavepointCase, HTMLRenderMixin):
+class TestWidgetCase(TransactionCase, HTMLRenderMixin):
 
     at_install = False
     post_install = True
diff --git a/setup/cms_form/odoo/addons/cms_form b/setup/cms_form/odoo/addons/cms_form
new file mode 120000
index 00000000..7a2c1e03
--- /dev/null
+++ b/setup/cms_form/odoo/addons/cms_form
@@ -0,0 +1 @@
+../../../../cms_form
\ No newline at end of file
diff --git a/setup/cms_form/setup.py b/setup/cms_form/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/cms_form/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

From 0122763e499b5d9b2a1559ffef33b20c2b6c9fe0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 11 Jul 2023 14:33:00 +0200
Subject: [PATCH 03/69] cms_form:  refactor class init and attributes

**Attributes become fields**

All attributes that configure a form are now odoo fields.
Fields that are just for configuration/behavior
(meaning that shouldn't be consider in form rendering)
must have the flag `form_tech=True`.

Default configuration can be set by overriding fields' defaults.
For instance, to declare the model::

    form_model_name = fields.Char(default="res.partner")

or to declare which fields to use::

    form_model_fields = Serialized(default=("name", "country_id"))

Same story for widgets.

**Fields lookup API change**

`form_fields()` and `form_fieldsets()` are not available anymore.

You must use `form.form_fields_get()` and `form.form_fieldsets_get`.
---
 cms_form/__manifest__.py                      |   1 +
 cms_form/controllers/main.py                  |   4 +-
 cms_form/doc/source/basics.rst                |  30 +-
 cms_form/doc/source/conf.py                   |   3 +-
 cms_form/models/cms_form.py                   |  69 ++--
 cms_form/models/cms_form_mixin.py             | 350 +++++++++---------
 cms_form/models/cms_form_wizard.py            |  29 +-
 cms_form/models/cms_search_form.py            | 109 +++---
 cms_form/models/fields.py                     |  26 ++
 cms_form/models/widgets/__init__.py           |   1 +
 cms_form/models/widgets/widget_boolean.py     |   3 +-
 cms_form/models/widgets/widget_many2one.py    |  13 +-
 cms_form/models/widgets/widget_mixin.py       |  57 ++-
 cms_form/models/widgets/widget_rel_mixin.py   |  29 ++
 cms_form/models/widgets/widget_x2many.py      |  16 +-
 cms_form/templates/form.xml                   |  36 +-
 .../tests/fake_models/fake_fields_form.py     |   4 +-
 .../fake_models/fake_fields_form_fieldsets.py |  39 +-
 .../fake_models/fake_nonpub_model_form.py     |  10 +-
 .../fake_models/fake_partner_channel_form.py  |  19 +-
 .../tests/fake_models/fake_partner_form.py    |   9 +-
 .../fake_partner_form_protected_fields.py     |   2 +-
 .../tests/fake_models/fake_pub_model_form.py  |  11 +-
 .../fake_models/fake_search_partner_form.py   |  29 +-
 .../tests/fake_models/fake_wizard_form.py     |  21 +-
 cms_form/tests/test_controllers.py            |   6 +-
 cms_form/tests/test_form_base.py              | 176 +++++----
 cms_form/tests/test_form_cms.py               |  20 +-
 cms_form/tests/test_form_permission.py        |  12 +-
 cms_form/tests/test_form_render.py            |   8 +-
 cms_form/tests/test_form_search.py            |  16 +-
 cms_form/tests/test_form_wizard.py            |  15 +-
 cms_form/tests/utils.py                       |   1 -
 cms_form/tests/widgets/test_widget_base.py    |   4 +-
 cms_form/tests/widgets/test_widget_binary.py  |   5 +-
 cms_form/utils.py                             |   2 +-
 36 files changed, 679 insertions(+), 506 deletions(-)
 create mode 100644 cms_form/models/fields.py
 create mode 100644 cms_form/models/widgets/widget_rel_mixin.py

diff --git a/cms_form/__manifest__.py b/cms_form/__manifest__.py
index 6b3dad3c..18af6fda 100644
--- a/cms_form/__manifest__.py
+++ b/cms_form/__manifest__.py
@@ -15,6 +15,7 @@
         "cms_status_message",
         # TODO: get rid of portal too
         "portal",
+        "base_sparse_field",
     ],
     "data": [
         "security/cms_form.xml",
diff --git a/cms_form/controllers/main.py b/cms_form/controllers/main.py
index 8098280f..4ec8a7f2 100644
--- a/cms_form/controllers/main.py
+++ b/cms_form/controllers/main.py
@@ -46,7 +46,7 @@ def get_render_values(self, form, **kw):
         #    w/ a name that overrides a rendering value not related to a form.
         #    Most common example: field named `website` will override
         #    odoo record for current website.
-        vals = {k: v for k, v in kw.items() if k not in form.form_fields()}
+        vals = {k: v for k, v in kw.items() if k not in form.form_fields_get()}
         vals.update({"form": form, "main_object": main_object, "controller": self})
         return vals
 
@@ -155,7 +155,7 @@ def make_response(self, wiz_model, model_id=None, page=1, **kw):
         step_info = wiz.wiz_get_step_info(page)
         # retrieve form model for current step
         form_model = step_info["form_model"]
-        model = request.env[form_model]._form_model
+        model = request.env[form_model].form_model_name
         kw["form_model_key"] = form_model
         return super().make_response(model, model_id=model_id, page=page, **kw)
 
diff --git a/cms_form/doc/source/basics.rst b/cms_form/doc/source/basics.rst
index c867111c..229ca58e 100644
--- a/cms_form/doc/source/basics.rst
+++ b/cms_form/doc/source/basics.rst
@@ -12,9 +12,9 @@ Just inherit from ``cms.form`` to add a form for your model. Quick example for p
 
         _name = 'cms.form.res.partner'
         _inherit = 'cms.form'
-        _form_model = 'res.partner'
-        _form_model_fields = ('name', 'country_id')
-        _form_required_fields = ('name', 'country_id')
+        form_model = 'res.partner'
+        form_model_fields = ('name', 'country_id')
+        form_required_fields = ('name', 'country_id')
 
 
 In this case you'll have form with the following characteristics:
@@ -55,9 +55,9 @@ The form above can be extended with extra fields that are not part of the ``_for
 
         _name = 'cms.form.res.partner'
         _inherit = 'cms.form'
-        _form_model = 'res.partner'
-        _form_model_fields = ('name', 'country_id', 'email')
-        _form_required_fields = ('name', 'country_id', 'email')
+        form_model = 'res.partner'
+        form_model_fields = ('name', 'country_id', 'email')
+        form_required_fields = ('name', 'country_id', 'email')
 
         notify_partner = fields.Boolean()
 
@@ -81,10 +81,10 @@ You want to group fields into meaningful groups. You can use fieldsets:
 
         _name = 'cms.form.res.partner'
         _inherit = 'cms.form'
-        _form_model = 'res.partner'
-        _form_model_fields = ('name', 'country_id', 'email')
-        _form_required_fields = ('name', 'country_id', 'email')
-        _form_fieldsets = [
+        form_model = 'res.partner'
+        form_model_fields = ('name', 'country_id', 'email')
+        form_required_fields = ('name', 'country_id', 'email')
+        form_fieldsets = [
             {
                 'id': 'main',
                 'title': 'Main',
@@ -116,8 +116,8 @@ If you want fieldsets to be displayed as tabs, just override this option:
 
         _name = 'cms.form.res.partner'
         _inherit = 'cms.form'
-        _form_fieldsets = [...]
-        _form_fieldsets_display = 'tabs'
+        form_fieldsets = [...]
+        form_fieldsets_display = 'tabs'
 
 
 .. image:: ./_static/images/cms_form_example_tabbed.png
@@ -135,9 +135,9 @@ Just inherit from ``cms.form.search`` to add a form for your model. Quick exampl
 
         _name = 'cms.form.search.res.partner'
         _inherit = 'cms.form.search'
-        _form_model = 'res.partner'
-        _form_model_fields = ('name', 'country_id', )
-        _form_fields_order = ('country_id', 'name', )
+        form_model = 'res.partner'
+        form_model_fields = ('name', 'country_id', )
+        form_fields_order = ('country_id', 'name', )
 
 
 .. image:: ./_static/images/cms_form_example_search.png
diff --git a/cms_form/doc/source/conf.py b/cms_form/doc/source/conf.py
index bc334304..8fdc6dd8 100644
--- a/cms_form/doc/source/conf.py
+++ b/cms_form/doc/source/conf.py
@@ -19,7 +19,8 @@
 # -- Project information -----------------------------------------------------
 
 project = "Odoo CMS Form"
-copyright = "2018, Simone Orsi"
+# FIXME: builtin word. In any case move to GH pages!
+# copyright = "2018, Simone Orsi"
 author = "Simone Orsi"
 
 # The short X.Y version
diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index 4cdac449..55fc77e9 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -1,9 +1,11 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from psycopg2 import IntegrityError
+import psycopg2 as pg
 
-from odoo import _, exceptions, models
+from odoo import _, exceptions, fields, models
+
+from .fields import Serialized
 
 
 class CMSForm(models.AbstractModel):
@@ -11,25 +13,22 @@ class CMSForm(models.AbstractModel):
     _description = "CMS Form"
     _inherit = "cms.form.mixin"
 
-    # default validators by field type
-    _form_validators = {
-        # 'many2one': 'my_validation_method'
-    }
-
     # internal flag for successful form
-    __form_success = False
-
-    @property
-    def form_success(self):
-        return self.__form_success
+    form_success = fields.Boolean(form_tech=True, default=False)
+    # internal flag for turning on redirection
+    form_redirect = fields.Boolean(form_tech=True, default=False)
+    # default validators by field type
+    # 'many2one': 'my_validation_method'
+    form_validators = Serialized(form_tech=True, default={})
+    # make it computed
+    form_title = fields.Char(form_tech=True, compute="_compute_form_title")
 
-    @form_success.setter
-    def form_success(self, value):
-        self.__form_success = value
+    def _compute_form_title(self):
+        for rec in self:
+            rec.form_title = rec._get_form_title()
 
-    @property
-    def form_title(self):
-        if not self._form_model:
+    def _get_form_title(self):
+        if not self.form_model_name:
             return ""
         if self.main_object:
             rec_field = self.main_object[self.form_model._rec_name]
@@ -38,27 +37,16 @@ def form_title(self):
             title = _('Edit "%s"') % rec_field
         else:
             title = _("Create %s")
-            if self._form_model:
+            if self.form_model_name:
                 model = (
                     self.env["ir.model"]
                     .sudo()
-                    .search([("model", "=", self._form_model)])
+                    .search([("model", "=", self.form_model_name)])
                 )
                 name = model and model.name or ""
                 title = _("Create %s") % name
         return title
 
-    # internal flag for turning on redirection
-    __form_redirect = False
-
-    @property
-    def form_redirect(self):
-        return self.__form_redirect
-
-    @form_redirect.setter
-    def form_redirect(self, value):
-        self.__form_redirect = value
-
     @property
     def form_msg_success_created(self):
         # TODO: include form model name if any
@@ -105,7 +93,7 @@ def form_validate(self, request_values=None):
         request_values = request_values or self.form_get_request_values()
 
         missing = False
-        for fname, field in self.form_fields().items():
+        for fname, field in self.form_fields_get().items():
             value = request_values.get(fname)
             error = False
             if field["required"] and self.form_check_empty_value(
@@ -123,13 +111,13 @@ def form_validate(self, request_values=None):
         # error message for empty required fields
         if missing:
             msg = self.form_msg_error_missing
-            self.add_status_message(msg, type_="danger")
+            self.add_status_message(msg, kind="danger")
         return errors, errors_message
 
     def form_get_validator(self, fname, field):
         """Retrieve field validator."""
         # 1nd lookup for a default type validator
-        validator = self._form_validators.get(field["type"], None)
+        validator = self.form_validators.get(field["type"], None)
         # 2nd lookup for a specific type validator
         validator = getattr(self, "_form_validate_" + field["type"], validator)
         # 3rd lookup and override by named validator if any
@@ -145,12 +133,12 @@ def form_after_create_or_update(self, values, extra_values):
     def _form_purge_non_model_fields(self, values):
         """Purge fields that are not in `form_model` schema and return them."""
         extra_values = {}
-        if not self._form_model:
+        if not self.form_model_name:
             return extra_values
         _model_fields = list(
             self.form_model.fields_get(
-                self._form_model_fields,
-                attributes=self._form_fields_attributes,
+                self.form_model_fields,
+                attributes=self.form_fields_attributes,
             ).keys()
         )
         submitted_keys = list(values.keys())
@@ -207,7 +195,7 @@ def form_process_POST(self, render_values):
                 errors_message["_validation"] = "<br />".join(
                     [x for x in err.name.replace("None", "").split("\n") if x.strip()]
                 )
-            except IntegrityError as err:
+            except (pg.IntegrityError, pg.OperationalError) as err:
                 errors["_integrity"] = True
                 errors_message["_integrity"] = "<br />".join(
                     [x for x in str(err).split("\n") if x.strip()]
@@ -230,10 +218,9 @@ def form_process_POST(self, render_values):
         if orm_error:
             msg = errors_message.get("_validation") or errors_message.get("_integrity")
             if msg:
-                self.add_status_message(msg, type_="danger", title=None)
+                self.add_status_message(msg, kind="danger", title=None)
         render_values.update({"errors": errors, "errors_message": errors_message})
         return render_values
 
     def add_status_message(self, msg, **kw):
-        # TODO: allow add_status_message to receive a `request` arg
-        self.env["ir.http"].add_status_message(msg, **kw)
+        self.env["ir.http"].add_status_message(msg, request=self.request, **kw)
diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 71c3894f..b367c35c 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -1,13 +1,13 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import inspect
 import json
 from collections import OrderedDict
 
-from odoo import _, exceptions, models, tools
+from odoo import _, api, exceptions, fields, models, tools
 
 from .. import marshallers, utils
+from .fields import Serialized
 
 IGNORED_FORM_FIELDS = [
     "display_name",
@@ -32,114 +32,159 @@ class CMSFormMixin(models.AbstractModel):
     _name = "cms.form.mixin"
     _description = "CMS Form mixin"
 
-    # template to render the form
-    form_template = "cms_form.base_form"
-    form_fields_template = "cms_form.base_form_fields"
-    form_buttons_template = "cms_form.base_form_buttons"
-    form_display_mode = "horizontal"  # or 'vertical'
-    form_action = ""
-    form_method = "POST"
-    _form_mode = ""
+    id = fields.Id(automatic=True)
+
+    # Special fields /
+    # TODO: would be better to have python obj fields
+    request = fields.Binary(form_tech=True, store=False)
+    o_request = fields.Binary(form_tech=True, store=False)
+    main_object = fields.Binary(form_tech=True, store=False, default=None)
+    # Values used to render the form
+    form_render_values = fields.Binary(
+        form_tech=True, store=False, compute="_compute_form_render_values"
+    )
+    # / special fields
+    form_template = fields.Char(form_tech=True, default="cms_form.base_form")
+    form_fields_template = fields.Char(
+        form_tech=True, default="cms_form.base_form_fields"
+    )
+    form_buttons_template = fields.Char(
+        form_tech=True, default="cms_form.base_form_buttons"
+    )
+    form_display_mode = fields.Selection(
+        form_tech=True,
+        selection=[("horizontal", "Horizontal"), ("vertical", "Vertical")],
+        default="horizontal",
+    )
+    form_action = fields.Char(form_tech=True, default="")
+    form_method = fields.Char(form_tech=True, default="POST")
+    form_mode = fields.Char(
+        form_tech=True, default="", compute="_compute_form_mode", readonly=False
+    )
+    form_title = fields.Char(form_tech=True, default="")
+    form_description = fields.Char(form_tech=True, default="")
     # extra css klasses for the whole form wrapper
-    _form_wrapper_extra_css_klass = ""
+    form_wrapper_extra_css_klass = fields.Char(form_tech=True, default="")
     # extra css klasses for just the form element
-    _form_extra_css_klass = ""
+    form_extra_css_klass = fields.Char(form_tech=True, default="")
     # model tied to this form
-    _form_model = ""
+    form_model_name = fields.Char(form_tech=True, default="")
     # model's fields to load
-    _form_model_fields = []
+    form_model_fields = Serialized(form_tech=True, default=[])
     # force fields order
-    _form_fields_order = []
+    form_fields_order = Serialized(form_tech=True, default=[])
     # quickly force required fields
-    _form_required_fields = ()
+    form_required_fields = Serialized(form_tech=True, default=[])
     # mark some fields as "sub".
     # For usability reasons you might want to move some fields
     # inside the widget of another field.
     # If you mark a field as "sub" this field
     # won't be included into fields' list as usual
     # but you can still find it in `form_fields` value.
-    _form_sub_fields = {
-        # 'mainfield': {
-        #     # loaded for a specific value
-        #     'mainfield_value': ('subfield1', 'subfield2'),
-        #     # loaded for all values
-        #     '_all': ('subfield3', ),
-        # }
-    }
+    # 'mainfield': {
+    #     # loaded for a specific value
+    #     'mainfield_value': ('subfield1', 'subfield2'),
+    #     # loaded for all values
+    #     '_all': ('subfield3', ),
+    # }
+    form_sub_fields = Serialized(form_tech=True, default={})
     # fields' attributes to load
-    _form_fields_attributes = [
-        "type",
-        "string",
-        "domain",
-        "required",
-        "readonly",
-        "relation",
-        "store",
-        "help",
-        "selection",
-    ]
+    form_fields_attributes = Serialized(
+        form_tech=True,
+        default=[
+            "type",
+            "string",
+            "domain",
+            "required",
+            "readonly",
+            "relation",
+            "store",
+            "help",
+            "selection",
+        ],
+    )
     # include only these fields
-    _form_fields_whitelist = ()
+    form_fields_whitelist = Serialized(form_tech=True, default=[])
     # exclude these fields
-    _form_fields_blacklist = ()
+    form_fields_blacklist = Serialized(form_tech=True, default=[])
     # include fields but make them input[type]=hidden
-    _form_fields_hidden = ()
+    form_fields_hidden = Serialized(form_tech=True, default=[])
     # group form fields together
-    _form_fieldsets = [
-        # {
-        #     'id': 'main',
-        #     'title': 'My group of fields',
-        #     'description': 'Bla bla bla',
-        #     'fields': ['name', 'age', 'foo'],
-        #     'css_extra_klass': 'best_fieldset',
-        # },
-        # {
-        #     'id': 'extras',
-        #     'title': 'My group of fields 2',
-        #     'description': 'Bla bla bla',
-        #     'fields': ['some', 'other', 'field'],
-        #     'css_extra_klass': '',
-        # },
-    ]
+    # [
+    # {
+    #     'id': 'main',
+    #     'title': 'My group of fields',
+    #     'description': 'Bla bla bla',
+    #     'fields': ['name', 'age', 'foo'],
+    #     'css_extra_klass': 'best_fieldset',
+    # },
+    # {
+    #     'id': 'extras',
+    #     'title': 'My group of fields 2',
+    #     'description': 'Bla bla bla',
+    #     'fields': ['some', 'other', 'field'],
+    #     'css_extra_klass': '',
+    # },
+    # ]
+    form_fieldsets = Serialized(form_tech=True, default=[])
     # control fieldset display
     # options:
     # * `tabs` -> rendered as tabs
     # * `vertical` -> one after each other, vertically
-    _form_fieldsets_display = "vertical"
+    form_fieldsets_display = fields.Selection(
+        form_tech=True,
+        selection=[("tabs", "Tabs"), ("vertical", "Vertical")],
+        default="vertical",
+    )
     # extract values mode
     # This param can be used to alter value format
     # when extracting values from request.
     # eg: in write mode you can get on a m2m [(6, 0, [1,2,3])]
     # while in read mode you can get just the ids [1,2,3]
-    _form_extract_value_mode = "write"
+    form_extract_value_mode = fields.Selection(
+        form_tech=True,
+        selection=[("write", "Write"), ("read", "Read")],
+        default="write",
+    )
     # ignore this fields default
-    __form_fields_ignore = IGNORED_FORM_FIELDS
-    # current edit object if any
-    __form_main_object = None
-    _o_request = None
+    form_fields_ignore = Serialized(form_tech=True, default=IGNORED_FORM_FIELDS)
     # default is to post the form and have a full reload. Set to true to keep
     # the search form as it is and only replace the result pane
-    _form_ajax = False
-    # submit the form for every change event
-    _form_ajax_onchange = False
-
-    @property
-    def main_object(self):
-        """Current main object."""
-        return self.__form_main_object
+    form_ajax = fields.Boolean(form_tech=True, default=False)
+    form_ajax_onchange = fields.Boolean(form_tech=True, default=False)
+    # jQuery selector to find container of search results
+    form_content_selector = fields.Char(form_tech=True, default=".form_content")
+
+    def _valid_field_parameter(self, field, name):
+        res = super()._valid_field_parameter(field, name)
+        # allow form tech fields
+        return name.startswith("form_") or res
+
+    def _compute_form_render_values(self):
+        for rec in self:
+            rec.form_render_values = rec._get_render_values()
+
+    def _get_render_values(self):
+        return {
+            # TODO: default for BInary field is "False" but we need "None"
+            "main_object": self.main_object or None,
+            "form": self,
+            "form_data": {},
+            "errors": {},
+            "errors_messages": {},
+        }
 
-    @main_object.setter
-    def main_object(self, value):
-        """Current main object setter."""
-        self.__form_main_object = value
+    def _compute_form_mode(self):
+        for rec in self:
+            rec.form_mode = rec._get_form_mode()
 
-    @property
-    def o_request(self):
-        return self._o_request
-
-    @o_request.setter
-    def o_request(self, value):
-        self._o_request = value
+    def _get_form_mode(self):
+        if self.form_mode:
+            # forced mode
+            return self.form_mode
+        if self.main_object:
+            return "edit"
+        return "create"
 
     def form_init(self, request, main_object=None, **kw):
         """Initalize a form instance.
@@ -147,17 +192,16 @@ def form_init(self, request, main_object=None, **kw):
         @param request: an odoo-wrapped werkeug request
         @param main_object: current model instance if any
         @param kw: pass any override for `_form_` attributes
-            ie: `fields_attributes` -> `_form_fields_attributes`
+            ie: `fields_attributes` -> `form_fields_attributes`
         """
-        form = self.new()
-        form.o_request = request  # odoo wrapped request
-        form.request = request.httprequest  # werkzeug request, the "real" one
-        form.main_object = main_object
-        # override `_form_` parameters
-        for k, v in kw.items():
-            attr = getattr(form, "_form_" + k, "__no__attr__")
-            if attr != "__no__attr__" and not inspect.ismethod(attr):
-                setattr(form, "_form_" + k, v)
+        vals = {
+            "o_request": request,
+            "request": request.httprequest,
+            "main_object": main_object,
+        }
+        form_kw = {k: v for k, v in kw.items() if k in self._fields}
+        vals.update(form_kw)
+        form = self.new(vals)
         return form
 
     def form_check_permission(self, raise_exception=True):
@@ -172,17 +216,18 @@ def form_check_permission(self, raise_exception=True):
                 res = self._can_edit(raise_exception=False)
             msg = _(
                 "You cannot edit this record. Model: %(model)s, ID: %(obj_id)s.",
-                dict(model=self.main_object._name, obj_id=self.main_object.id),
+                model=self.main_object._name,
+                obj_id=self.main_object.id,
             )
         else:
-            if self._form_model:
+            if self.form_model_name:
                 if hasattr(self.form_model, "cms_can_create"):
                     res = self.form_model.cms_can_create()
                 else:
                     res = self._can_create(raise_exception=False)
                 msg = (
                     _("You are not allowed to create any record for the model `%s`.")
-                    % self._form_model
+                    % self.form_model_name
                 )
         if raise_exception and not res:
             raise exceptions.AccessError(msg)
@@ -190,7 +235,7 @@ def form_check_permission(self, raise_exception=True):
 
     def _can_create(self, raise_exception=True):
         """Check that current user can create instances of given model."""
-        if self._form_model:
+        if self.form_model_name:
             return self.form_model.check_access_rights(
                 "create", raise_exception=raise_exception
             )
@@ -212,29 +257,12 @@ def _can_edit(self, raise_exception=True):
             can = False
         return can
 
-    @property
-    def form_title(self):
-        return ""  # pragma: no cover
-
-    @property
-    def form_description(self):
-        return ""  # pragma: no cover
-
-    @property
-    def form_mode(self):
-        if self._form_mode:
-            # forced mode
-            return self._form_mode
-        if self.main_object:
-            return "edit"
-        return "create"
-
     @property
     def form_model(self):
         # queue_job tries to read properties. Be defensive.
-        return self.env.get(self._form_model)
+        return self.env.get(self.form_model_name)
 
-    def form_fields(self, hidden=None):
+    def form_fields_get(self, hidden=None):
         """Retrieve form fields.
 
         :param hidden: whether to include or not hidden inputs.
@@ -243,7 +271,7 @@ def form_fields(self, hidden=None):
             * True: include only hidden fields
             * False: include all fields but those hidden.
         """
-        _fields = self._form_fields()
+        _fields = self._form_fields_get()
         # update fields attributes
         self.form_update_fields_attributes(_fields)
         if hidden is not None:
@@ -256,7 +284,7 @@ def form_fields(self, hidden=None):
         return _fields
 
     @tools.cache("self")
-    def _form_fields(self):
+    def _form_fields_get(self):
         """Retrieve form fields ready to be used.
 
         Fields lookup:
@@ -269,17 +297,17 @@ def _form_fields(self):
         _all_fields = OrderedDict()
         # load model fields
         _model_fields = {}
-        if self._form_model:
+        if self.form_model_name:
             _model_fields = self.form_model.fields_get(
-                self._form_model_fields,
-                attributes=self._form_fields_attributes,
+                self.form_model_fields,
+                attributes=self.form_fields_attributes,
             )
             # inject defaults
-            defaults = self.form_model.default_get(self._form_model_fields)
+            defaults = self.form_model.default_get(self.form_model_fields)
             for k, v in defaults.items():
                 _model_fields[k]["_default"] = v
         # load form fields
-        _form_fields = self.fields_get(attributes=self._form_fields_attributes)
+        _form_fields = self.fields_get(attributes=self.form_fields_attributes)
         # inject defaults
         for k, v in self.default_get(list(_form_fields.keys())).items():
             _form_fields[k]["_default"] = v
@@ -287,12 +315,12 @@ def _form_fields(self):
         # form fields override model fields
         _all_fields.update(_form_fields)
         # exclude blacklisted
-        for fname in self._form_fields_blacklist:
+        for fname in self.form_fields_blacklist:
             # make it fail if passing wrong field name
             _all_fields.pop(fname)
         # include whitelisted
         _all_whitelisted = {}
-        for fname in self._form_fields_whitelist:
+        for fname in self.form_fields_whitelist:
             _all_whitelisted[fname] = _all_fields[fname]
         _all_fields = _all_whitelisted or _all_fields
         # remove unwanted fields
@@ -303,9 +331,9 @@ def _form_fields(self):
         # whereas some core fields attributes are missing.
         _all_fields = {k: v for k, v in _all_fields.items() if v.get("store")}
         # update fields order
-        if self._form_fields_order:
+        if self.form_fields_order:
             _sorted_all_fields = OrderedDict()
-            for fname in self._form_fields_order:
+            for fname in self.form_fields_order:
                 # this check is required since you can have `groups` attribute
                 # on a field, making the field unavailable if not satisfied.
                 if fname in _all_fields:
@@ -315,10 +343,20 @@ def _form_fields(self):
         self._form_prepare_subfields(_all_fields)
         return _all_fields
 
+    @api.model
+    def fields_get(self, allfields=None, attributes=None):
+        res = super().fields_get(allfields, attributes)
+        # Wipe tech fields
+        return {
+            k: v
+            for k, v in res.items()
+            if not getattr(self._fields[k], "form_tech", False)
+        }
+
     def _form_prepare_subfields(self, _all_fields):
         """Add subfields to related main fields."""
         # TODO: document this
-        for mainfield, subfields in self._form_sub_fields.items():
+        for mainfield, subfields in self.form_sub_fields.items():
             if mainfield not in _all_fields:
                 continue
             _subfields = {}
@@ -332,14 +370,14 @@ def _form_prepare_subfields(self, _all_fields):
 
     def _form_remove_uwanted(self, _all_fields):
         """Remove fields from form fields."""
-        for fname in self.__form_fields_ignore:
+        for fname in self.form_fields_ignore:
             _all_fields.pop(fname, None)
 
-    def form_fieldsets(self):
+    def form_fieldsets_get(self):
         # exclude empty ones
-        form_fields = self._form_fields()
+        form_fields = self._form_fields_get()
         res = []
-        for fset in self._form_fieldsets:
+        for fset in self.form_fieldsets:
             if any([form_fields.get(fname) for fname in fset["fields"]]):
                 # at least one field is here
                 res.append(fset)
@@ -348,16 +386,16 @@ def form_fieldsets(self):
     @property
     def form_fieldsets_wrapper_klass(self):
         klass = []
-        if self._form_fieldsets:
-            klass = ["has_fieldsets", self._form_fieldsets_display]
+        if self.form_fieldsets:
+            klass = ["has_fieldsets", self.form_fieldsets_display]
         return " ".join(klass)
 
     def form_update_fields_attributes(self, _fields):
         """Manipulate fields attributes."""
         for fname, field in _fields.items():
-            if fname in self._form_required_fields:
+            if fname in self.form_required_fields:
                 _fields[fname]["required"] = True
-            if fname in self._form_fields_hidden:
+            if fname in self.form_fields_hidden:
                 _fields[fname]["hidden"] = True
             _fields[fname]["widget"] = self.form_get_widget(fname, field)
 
@@ -387,7 +425,9 @@ def form_get_widget(self, fname, field, **kw):
     @property
     def form_file_fields(self):
         """File fields."""
-        return {k: v for k, v in self.form_fields().items() if v["type"] == "binary"}
+        return {
+            k: v for k, v in self.form_fields_get().items() if v["type"] == "binary"
+        }
 
     def form_get_request_values(self):
         """Retrieve fields values from current request."""
@@ -416,7 +456,7 @@ def form_load_defaults(self, main_object=None, request_values=None):
         main_object = main_object or self.main_object
         request_values = request_values or self.form_get_request_values()
         defaults = request_values.copy()
-        form_fields = self.form_fields()
+        form_fields = self.form_fields_get()
         for fname, field in form_fields.items():
             value = field["widget"].w_load(**request_values)
             # override via specific form loader when needed
@@ -447,7 +487,7 @@ def form_extract_values(self, **request_values):
         """Extract values from request form."""
         request_values = request_values or self.form_get_request_values()
         values = {}
-        for fname, field in self.form_fields().items():
+        for fname, field in self.form_fields_get().items():
             value = field["widget"].w_extract(**request_values)
             # override via specific form extractor when needed
             extractor = self.form_get_extractor(
@@ -480,26 +520,6 @@ def form_get_extractor(self, fname, field, value=None, **req_values):
         extractor = getattr(self, "_form_extract_" + fname, extractor)
         return extractor
 
-    __form_render_values = {}
-
-    @property
-    def form_render_values(self):
-        """Values used to render the form."""
-        if not self.__form_render_values:
-            # default render values
-            self.__form_render_values = {
-                "main_object": self.main_object,
-                "form": self,
-                "form_data": {},
-                "errors": {},
-                "errors_messages": {},
-            }
-        return self.__form_render_values
-
-    @form_render_values.setter
-    def form_render_values(self, value):
-        self.__form_render_values = value
-
     def form_render(self, **kw):
         """Renders form template declared in `form_template`.
 
@@ -550,14 +570,14 @@ def form_wrapper_css_klass(self):
         Included by default:
         * `cms_form_wrapper` marker
         * form model name normalized (res.partner -> res_partner)
-        * `_form_wrapper_extra_css_klass` extra klasses from form attribute
+        * `form_wrapper_extra_css_klass` extra klasses from form attribute
         * `mode_` + form mode (ie: 'mode_write')
         """
         parts = [
             "cms_form_wrapper",
             self._name.replace(".", "_").lower(),
-            self._form_model.replace(".", "_").lower(),
-            self._form_wrapper_extra_css_klass,
+            self.form_model_name.replace(".", "_").lower(),
+            self.form_wrapper_extra_css_klass,
             "mode_" + self.form_mode,
         ]
         return " ".join([x.strip() for x in parts if x.strip()])
@@ -566,7 +586,7 @@ def form_wrapper_css_klass(self):
     def form_css_klass(self):
         """Return `<form />` element css klasses.
 
-        By default you can provide extra klasses via `_form_extra_css_klass`.
+        By default you can provide extra klasses via `form_extra_css_klass`.
         """
         klass = ""
         if self.form_display_mode == "horizontal":
@@ -574,8 +594,8 @@ def form_css_klass(self):
         elif self.form_display_mode == "vertical":
             # actually not a real BS3 css klass but helps styling
             klass = "form-vertical"
-        if self._form_extra_css_klass:
-            klass += " " + self._form_extra_css_klass
+        if self.form_extra_css_klass:
+            klass += " " + self.form_extra_css_klass
         return klass
 
     def form_make_field_wrapper_klass(self, fname, field, **kw):
@@ -597,12 +617,8 @@ def _form_json_info(self):
         info.update(
             {
                 "master_slave": self._form_master_slave_info(),
-                "model": self._form_model,
-                "form_content_selector": getattr(
-                    self,
-                    "_form_content_selector",
-                    None,
-                ),
+                "model": self.form_model_name,
+                "form_content_selector": self.form_content_selector,
             }
         )
         return info
diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index df67fea2..6c5acaf7 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -3,7 +3,9 @@
 
 from copy import deepcopy
 
-from odoo import models
+from odoo import fields, models
+
+from .fields import Serialized
 
 
 class CMSFormWizard(models.AbstractModel):
@@ -18,16 +20,21 @@ class CMSFormWizard(models.AbstractModel):
     _name = "cms.form.wizard"
     _description = "CMS Form wizard"
     _inherit = "cms.form"
-    _form_mode = "wizard"
     _wiz_name = _name
-    form_buttons_template = "cms_form.wizard_form_buttons"
+    form_buttons_template = fields.Char(
+        form_tech=True, default="cms_form.wizard_form_buttons"
+    )
     # display wizard progress bar?
-    wiz_show_progress_bar = True
-    # fields declared here will be automatically stored
+    form_show_progress_bar = fields.Boolean(form_tech=True, default=True)
+    # Fields declared here will be automatically stored
     # into wizard storage
-    # Use `_wiz_step_stored_fields = 'all'` to store them all.
+    # Use `form_step_store_all_fields = True` to store them all.
     # You can pass a list of fields if you don't want to store them all.
-    _wiz_step_stored_fields = "all"
+    form_step_stored_fields = Serialized(form_tech=True, default=[])
+    form_step_store_all_fields = fields.Boolean(form_tech=True, default=True)
+
+    def _get_form_mode(self):
+        return "wizard"
 
     @property
     def form_wrapper_css_klass(self):
@@ -113,8 +120,8 @@ def wiz_get_step_info(self, step):
         step = int(step)
         try:
             return self.wiz_configure_steps()[step]
-        except KeyError:
-            raise ValueError("Step `%s` does not exists." % str(step))
+        except KeyError as e:
+            raise ValueError("Step `%s` does not exists." % str(step)) from e
 
     def wiz_current_step(self):
         return self.wiz_storage_get().get("current") or 1
@@ -162,8 +169,8 @@ def _prepare_step_values_to_store(self, values, extra_values):
         values = values.copy()
         values.update(extra_values)
         step_values = {}
-        stored_fields = self._wiz_step_stored_fields
-        if stored_fields == "all":
+        stored_fields = self.form_step_stored_fields
+        if not stored_fields and self.form_step_store_all_fields:
             stored_fields = values.keys()
         for fname in stored_fields:
             if fname in values:
diff --git a/cms_form/models/cms_search_form.py b/cms_form/models/cms_search_form.py
index fd43a363..8b7bc631 100644
--- a/cms_form/models/cms_search_form.py
+++ b/cms_form/models/cms_search_form.py
@@ -1,43 +1,66 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import _, models
+from odoo import _, fields, models
 from odoo.tools import pycompat
 
 from odoo.addons.portal.controllers.portal import pager as portal_pager
 
+from .fields import Serialized
+
 
 class CMSFormSearch(models.AbstractModel):
     _name = "cms.form.search"
     _description = "CMS Form search"
     _inherit = "cms.form.mixin"
 
-    form_buttons_template = "cms_form.search_form_buttons"
-    form_search_results_template = "cms_form.search_results"
-    form_action = ""
-    form_method = "GET"
+    # change defaults
+    form_buttons_template = fields.Char(
+        form_tech=True, default="cms_form.search_form_buttons"
+    )
+    form_search_results_template = fields.Char(
+        form_tech=True, default="cms_form.search_results"
+    )
+    form_method = fields.Char(form_tech=True, default="GET")
     # you might want to just list items based on a predefined query
     # if this flag is false the search form won't be rendered
-    form_show_search_form = True
-    _form_mode = "search"
-    _form_extract_value_mode = "read"
+    form_show_search_form = fields.Boolean(form_tech=True, default=True)
+    form_mode = fields.Char(form_tech=True, default="search")
+    form_extract_value_mode = fields.Char(form_tech=True, default="read")
     # show results if no query has been submitted?
-    _form_show_results_no_submit = True
-    _form_results_per_page = 10
+    form_show_search_form = fields.Boolean(form_tech=True, default=True)
+    form_show_results_no_submit = fields.Boolean(form_tech=True, default=True)
+    form_results_per_page = fields.Integer(form_tech=True, default=10)
     # sort by this param, defaults to model's `_order`
-    _form_results_orderby = ""
+    form_results_orderby = fields.Char(form_tech=True, default="")
     # declare fields that must be searched w/ multiple values
-    _form_search_fields_multi = ()
+    form_search_fields_multi = Serialized(form_tech=True, default=[])
     # declare custom domain computation rules
-    _form_search_domain_rules = {
-        # opt 1: `field name: (leaf field name, operator, format value)`
-        # `format_value` is a formatting compatible string
-        # 'product_id': ('product_id.name', 'ilike', '{}')
-        # opt 2: function that give back `(fname, operator, value)``
-        # 'foo': lambda field, value, search_values: ('foo', 'not like', value)
-    }
-    # jQuery selector to find container of search results
-    _form_content_selector = ".form_content"
+    # opt 1: `field name: (leaf field name, operator, format value)`
+    # `format_value` is a formatting compatible string
+    # 'product_id': ('product_id.name', 'ilike', '{}')
+    # opt 2: function that give back `(fname, operator, value)``
+    # 'foo': lambda field, value, search_values: ('foo', 'not like', value)
+    form_search_domain_rules = fields.Binary(form_tech=True, default={}, store=False)
+    form_search_results = fields.Binary(form_tech=True, default={}, store=False)
+
+    # make it computed
+    form_title = fields.Char(form_tech=True, compute="_compute_form_title")
+
+    def _get_form_mode(self):
+        return "search"
+
+    def _compute_form_title(self):
+        for rec in self:
+            rec.form_title = rec._get_form_title()
+
+    def _get_form_title(self):
+        title = _("Search")
+        if self.form_model_name:
+            model = self.env["ir.model"]._get(self.form_model_name)
+            name = model and model.name or ""
+            title = _("Search %s") % name
+        return title
 
     def form_check_permission(self):
         """Just searching, nothing to check here."""
@@ -53,32 +76,10 @@ def form_update_fields_attributes(self, _fields):
     def form_get_widget_model(self, fname, field):
         """Search via related field needs a simple char widget."""
         res = super().form_get_widget_model(fname, field)
-        if fname in self._form_search_domain_rules:
+        if fname in self.form_search_domain_rules:
             res = "cms.form.widget.char"
         return res
 
-    __form_search_results = {}
-
-    @property
-    def form_search_results(self):
-        """Return search results."""
-        return self.__form_search_results
-
-    @form_search_results.setter
-    def form_search_results(self, value):
-        self.__form_search_results = value
-
-    @property
-    def form_title(self):
-        title = _("Search")
-        if self._form_model:
-            model = (
-                self.env["ir.model"].sudo().search([("model", "=", self._form_model)])
-            )
-            name = model and model.name or ""
-            title = _("Search %s") % name
-        return title
-
     def form_process_GET(self, render_values):
         self.form_search(render_values)
         return render_values
@@ -86,17 +87,17 @@ def form_process_GET(self, render_values):
     def form_search(self, render_values):
         """Produce search results."""
         search_values = self.form_extract_values()
-        if not search_values and not self._form_show_results_no_submit:
+        if not search_values and not self.form_show_results_no_submit:
             return self.form_search_results
         domain = self.form_search_domain(search_values)
         count = self.form_model.search_count(domain)
         page = render_values.get("extra_args", {}).get("page", 0)
         url = self._form_get_url_for_pager(render_values)
         pager = self._form_results_pager(count=count, page=page, url=url)
-        order = self._form_results_orderby or None
+        order = self.form_results_orderby or None
         results = self.form_model.search(
             domain,
-            limit=self._form_results_per_page,
+            limit=self.form_results_per_page,
             offset=pager["offset"],
             order=order,
         )
@@ -111,7 +112,7 @@ def _form_get_url_for_pager(self, render_values):
         # default to current path w/out paging
         path = pycompat.to_text(self.request.path)
         url = path.split("/page")[0]
-        if self._form_model:
+        if self.form_model_name:
             # rely on model's cms search url
             url = getattr(self.form_model, "cms_search_url", None) or url
         # override via controller/request specific value
@@ -129,19 +130,19 @@ def _form_results_pager(self, count=None, page=0, url="", url_args=None):
             url=url,
             total=count,
             page=page,
-            step=self._form_results_per_page,
-            scope=self._form_results_per_page,
+            step=self.form_results_per_page,
+            scope=self.form_results_per_page,
             url_args=url_args,
         )
 
     def form_search_domain(self, search_values):
         """Build search domain."""
         domain = []
-        for fname, field in self.form_fields().items():
+        for fname, field in self.form_fields_get().items():
             value = search_values.get(fname)
             if value is None:
                 continue
-            if fname in self._form_search_fields_multi:
+            if fname in self.form_search_fields_multi:
                 leaf = (fname, "in", value)
                 domain.append(leaf)
                 continue
@@ -166,8 +167,8 @@ def form_search_domain(self, search_values):
                 if not value:
                     # searching for an empty string breaks search
                     continue
-            if fname in self._form_search_domain_rules:
-                rule = self._form_search_domain_rules[fname]
+            if fname in self.form_search_domain_rules:
+                rule = self.form_search_domain_rules[fname]
                 if callable(rule):
                     fname, operator, value = rule(field, value, search_values)
                 else:
diff --git a/cms_form/models/fields.py b/cms_form/models/fields.py
new file mode 100644
index 00000000..37e8c54b
--- /dev/null
+++ b/cms_form/models/fields.py
@@ -0,0 +1,26 @@
+# Copyright 2023 Simone Orsi
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+import json
+
+from odoo.addons.base_sparse_field.models.fields import Serialized as BaseSerialized
+
+
+class Serialized(BaseSerialized):
+    """Better implementation of Serialized field.
+
+    1. load proper default (core always load {})
+    2. do not fail if value is already a py obj
+    TODO: propose to odoo core
+    """
+
+    def convert_to_record(self, value, record):
+        default = (
+            self.default(self.model_name) if callable(self.default) else self.default
+        )
+        # Important: if you want to set an empty value and bypass the default
+        # you must use a string (eg: "[]" or "{}")
+        value = value if value is not None else default
+        if isinstance(value, str):
+            return json.loads(value)
+        return value
diff --git a/cms_form/models/widgets/__init__.py b/cms_form/models/widgets/__init__.py
index 998bfc46..d9bac019 100644
--- a/cms_form/models/widgets/__init__.py
+++ b/cms_form/models/widgets/__init__.py
@@ -1,4 +1,5 @@
 from . import widget_mixin
+from . import widget_rel_mixin
 from . import widget_text
 from . import widget_hidden
 from . import widget_numeric
diff --git a/cms_form/models/widgets/widget_boolean.py b/cms_form/models/widgets/widget_boolean.py
index c04503c0..bb1c714b 100644
--- a/cms_form/models/widgets/widget_boolean.py
+++ b/cms_form/models/widgets/widget_boolean.py
@@ -4,6 +4,7 @@
 from odoo import models
 
 from ... import utils
+from ..fields import Serialized
 
 
 class BooleanWidget(models.AbstractModel):
@@ -12,7 +13,7 @@ class BooleanWidget(models.AbstractModel):
     _description = "CMS Form boolean widget"
     _w_template = "cms_form.field_widget_boolean"
 
-    w_true_values = utils.TRUE_VALUES
+    w_true_values = Serialized(default=utils.TRUE_VALUES)
 
     def widget_init(self, form, fname, field, **kw):
         widget = super().widget_init(form, fname, field, **kw)
diff --git a/cms_form/models/widgets/widget_many2one.py b/cms_form/models/widgets/widget_many2one.py
index 818a8b20..caa76976 100644
--- a/cms_form/models/widgets/widget_many2one.py
+++ b/cms_form/models/widgets/widget_many2one.py
@@ -3,22 +3,17 @@
 
 import json
 
-from odoo import models
+from odoo import fields, models
 
 from ... import utils
 
 
 class M2OWidget(models.AbstractModel):
     _name = "cms.form.widget.many2one"
-    _inherit = "cms.form.widget.mixin"
+    _inherit = "cms.form.widget.rel.mixin"
     _description = "CMS Form M2O widget"
-    _w_template = "cms_form.field_widget_m2o"
 
-    def widget_init(self, form, fname, field, **kw):
-        widget = super().widget_init(form, fname, field, **kw)
-        widget.w_comodel = self.env[widget.w_field["relation"]]
-        widget.w_domain = widget.w_field.get("domain", [])
-        return widget
+    w_template = fields.Char(default="cms_form.field_widget_m2o")
 
     @property
     def w_option_items(self):
@@ -57,7 +52,7 @@ class M2OMultiWidget(models.AbstractModel):
     _description = "CMS Form M2O multi widget"
     _w_template = "cms_form.field_widget_m2o_multi"
     # TODO: not used ATM
-    w_diplay_field = "display_name"
+    w_display_field = "display_name"
 
     def m2o_to_form(self, value, **req_values):
         if not value:
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index f61d794f..475a4dfa 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -3,7 +3,9 @@
 
 import json
 
-from odoo import models
+from odoo import fields, models
+
+from ..fields import Serialized
 
 
 class Widget(models.AbstractModel):
@@ -11,8 +13,22 @@ class Widget(models.AbstractModel):
     _description = "CMS Form widget mixin"
 
     # use `w_` prefix as a namespace for all widget properties
-    _w_template = ""
-    _w_css_klass = ""
+
+    id = fields.Id(automatic=True)
+    # Special fields
+    # TODO: would be better to have python obj fields
+    w_form = fields.Binary(store=False)
+    w_record = fields.Binary(store=False)
+    main_object = fields.Binary(store=False)
+    w_field = fields.Binary(store=False)
+
+    w_template = fields.Char(default="")
+    w_css_klass = fields.Char(default="")
+
+    w_fname = fields.Char(default="")
+    w_field_value = Serialized(default=None)
+    w_data = Serialized(default={})
+    w_subfields = Serialized(default={})
 
     def widget_init(
         self,
@@ -25,30 +41,33 @@ def widget_init(
         css_klass="",
         **kw
     ):
-        widget = self.new()
-        widget.w_form = form
-        widget.w_form_model = form.form_model
-        widget.w_record = form.main_object
-        widget.w_form_values = form.form_render_values
-        widget.w_fname = fname
-        widget.w_field = field
-        widget.w_field_value = widget.w_form_values.get("form_data", {}).get(fname)
-        widget.w_data = data or {}
-        widget.w_subfields = subfields or field.get("subfields", {})
-        widget._w_template = template or self._w_template
-        widget._w_css_klass = css_klass or self._w_css_klass
+        vals = {
+            "w_form": form,
+            "w_fname": fname,
+            "w_field": field,
+            "w_field_value": form.form_render_values.get("form_data", {}).get(fname),
+            "w_data": data or {},
+            "w_subfields": subfields or field.get("subfields", {}),
+            "w_template": template,
+            "w_css_klass": css_klass,
+        }
+        widget = self.new(vals)
         return widget
 
     def render(self):
         return self.env.ref(self.w_template).render({"widget": self})
 
     @property
-    def w_template(self):
-        return self._w_template
+    def w_form_model(self):
+        return self.w_form.form_model
+
+    @property
+    def w_record(self):
+        return self.w_form.main_object
 
     @property
-    def w_css_klass(self):
-        return self._w_css_klass
+    def w_form_values(self):
+        return self.w_form.form_render_values
 
     def w_load(self, **req_values):
         """Load value for current field in current request."""
diff --git a/cms_form/models/widgets/widget_rel_mixin.py b/cms_form/models/widgets/widget_rel_mixin.py
new file mode 100644
index 00000000..f5d5b03e
--- /dev/null
+++ b/cms_form/models/widgets/widget_rel_mixin.py
@@ -0,0 +1,29 @@
+# Copyright 2017 Simone Orsi
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+
+
+from odoo import fields, models
+
+from ..fields import Serialized
+
+
+class RelWidgetMixin(models.AbstractModel):
+    _name = "cms.form.widget.rel.mixin"
+    _inherit = "cms.form.widget.mixin"
+    _description = "CMS Form relation widget mixin"
+
+    w_comodel_name = fields.Char(default="")
+    w_domain = Serialized(default=[])
+    w_display_field = fields.Char(default="display_name")
+
+    def widget_init(self, form, fname, field, **kw):
+        widget = super().widget_init(form, fname, field, **kw)
+        widget.w_comodel_name = widget.w_field["relation"]
+        for k in ("domain", "display_field"):
+            if widget.w_field.get(k):
+                setattr(widget, f"w_{k}", widget.w_field.get(k))
+        return widget
+
+    @property
+    def w_comodel(self):
+        return self.env[self.w_comodel_name]
diff --git a/cms_form/models/widgets/widget_x2many.py b/cms_form/models/widgets/widget_x2many.py
index 47aac4c7..f5615e32 100644
--- a/cms_form/models/widgets/widget_x2many.py
+++ b/cms_form/models/widgets/widget_x2many.py
@@ -3,21 +3,15 @@
 
 import json
 
-from odoo import models
+from odoo import fields, models
 
 
 class X2MWidget(models.AbstractModel):
     _name = "cms.form.widget.x2m.mixin"
-    _inherit = "cms.form.widget.mixin"
+    _inherit = "cms.form.widget.rel.mixin"
     _description = "CMS Form X2M widget"
-    _w_template = "cms_form.field_widget_x2m"
-    w_diplay_field = "display_name"
 
-    def widget_init(self, form, fname, field, **kw):
-        widget = super().widget_init(form, fname, field, **kw)
-        widget.w_comodel = self.env[widget.w_field["relation"]]
-        widget.w_domain = widget.w_field.get("domain", [])
-        return widget
+    w_template = fields.Char(default="cms_form.field_widget_x2m")
 
     # TODO: rename all widget-specific methods like:
     #    `x2many_to_form` -> `_w_orm_to_form`
@@ -50,7 +44,7 @@ def x2many_to_form(self, value, **req_values):
             # request value take precedence
             ids = req_val[:]
         read_fields = [
-            self.w_diplay_field,
+            self.w_display_field,
         ]
         if "name" in self.w_comodel:
             read_fields.append("name")
@@ -62,7 +56,7 @@ def w_extract(self, **req_values):
 
     def form_to_x2many(self, value, **req_values):
         _value = False
-        if self.w_form._form_extract_value_mode == "write":
+        if self.w_form.form_extract_value_mode == "write":
             if value:
                 _value = [(6, False, self.w_ids_from_input(value))]
             else:
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 3c213c18..49a2e83f 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -34,7 +34,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-esc="field['string']"
             >Name</label>
             <div class="col-md-9 col-sm-8">
-                <t t-raw="widget.render()" />
+                <t t-out="widget.render()" />
                 <t t-if="field.get('help')">
                     <t t-call="cms_form.base_form_field_help_block" />
                 </t>
@@ -79,9 +79,9 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         </t>
     </template>
     <template id="base_form_fields" name="CMS form fields">
-        <div t-attf-class="form-fields #{ form.form_fieldsets_wrapper_klass }">
+        <div t-attf-class="form-fields {{ form.form_fieldsets_wrapper_klass }}">
             <t t-if="form_fieldsets">
-                <t t-if="form._form_fieldsets_display == 'tabs'">
+                <t t-if="form.form_fieldsets_display == 'tabs'">
                     <t t-call="cms_form.fieldsets_as_tabs" />
                 </t>
                 <t t-else="">
@@ -102,7 +102,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             <!-- this template is computed in `form_render`
       based on `form_display_mode`
       -->
-            <t t-call="#{ field_wrapper_template }">
+            <t t-call="{{ field_wrapper_template }}">
                 <t t-set="field" t-value="form_fields[fname]" />
                 <t t-set="widget" t-value="field['widget']" />
             </t>
@@ -157,8 +157,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-data-form="form.form_json_info()"
             t-att-class="form.form_css_klass"
             enctype="multipart/form-data"
-            t-att-data-ajax="form._form_ajax or None"
-            t-att-data-ajax-onchange="form._form_ajax_onchange or None"
+            t-att-data-ajax="form.form_ajax or None"
+            t-att-data-ajax-onchange="form.form_ajax_onchange or None"
         >
             <t t-if="form.form_method == 'POST'">
                 <input
@@ -167,13 +167,16 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                     t-att-value="form.o_request.csrf_token()"
                 />
             </t>
-            <t t-set="form_fields" t-value="form.form_fields(hidden=False)" />
-            <t t-set="form_hidden_fields" t-value="form.form_fields(hidden=True)" />
-            <t t-set="form_fieldsets" t-value="form.form_fieldsets()" />
+            <t t-set="form_fields" t-value="form.form_fields_get(hidden=False)" />
+            <t
+                t-set="form_hidden_fields"
+                t-value="form.form_fields_get(hidden=True) or []"
+            />
+            <t t-set="form_fieldsets" t-value="form.form_fieldsets_get()" />
             <t t-foreach="form_hidden_fields" t-as="hidden_fname">
-                <t t-raw="form_hidden_fields[hidden_fname]['widget'].render()" />
+                <t t-out="form_hidden_fields[hidden_fname]['widget'].render()" />
             </t>
-            <t t-call="#{ form.form_fields_template }" />
+            <t t-call="{{ form.form_fields_template }}" />
             <div class="col-sm-9 col-sm-offset-3 above-controls">
                 <!-- you can style required fields like this:
             `form .form-group.field-required label.control-label::after{ content: '*'}`
@@ -187,7 +190,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                     </div>
                 </t>
             </div>
-            <t t-call="#{ form.form_buttons_template }" />
+            <t t-call="{{ form.form_buttons_template }}" />
         </form>
     </template>
     <template id="base_form_buttons" name="CMS base form buttons">
@@ -212,7 +215,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 <t t-raw="form.form_render()" />
             </t>
             <div class="form_content">
-                <t t-call="#{ form.form_search_results_template }" />
+                <t t-call="{{ form.form_search_results_template  }}" />
             </div>
         </xpath>
     </template>
@@ -235,8 +238,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </div>
         </xpath>
     </template>
-    <!-- FIXME -->
-    <!--template
+    <template
         id="search_results_pager"
         name="CMS form pager"
         inherit_id="portal.pager"
@@ -255,7 +257,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             pager['page']['num'] + 1 if pager['page']['num'] &lt; pager['page_count'] else None
         </attribute>
         </xpath>
-    </template-->
+    </template>
     <template id="search_results" name="CMS form search results">
         <t t-foreach="form.form_search_results['results']" t-as="item">
             <div
@@ -290,7 +292,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         primary="True"
     >
         <t t-if="form.form_title" position="before">
-            <t t-if="form.wiz_show_progress_bar">
+            <t t-if="form.form_show_progress_bar">
                 <t t-call="cms_form.wizard_progress_bar" />
             </t>
         </t>
diff --git a/cms_form/tests/fake_models/fake_fields_form.py b/cms_form/tests/fake_models/fake_fields_form.py
index 1e3a2ee8..61fd6bfe 100644
--- a/cms_form/tests/fake_models/fake_fields_form.py
+++ b/cms_form/tests/fake_models/fake_fields_form.py
@@ -19,8 +19,8 @@ class FakeFieldsForm(models.AbstractModel):
     a_one2many = fields.Char()
     a_many2many = fields.Char()
 
-    def _form_fields(self):
-        _fields = super()._form_fields()
+    def _form_fields_get(self):
+        _fields = super()._form_fields_get()
         # fake fields' types
         _fields["a_many2one"]["type"] = "many2one"
         _fields["a_many2one"]["relation"] = "res.partner"
diff --git a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
index 6c163bfd..ab27a64d 100644
--- a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
+++ b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
@@ -3,6 +3,8 @@
 
 from odoo import fields, models
 
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+
 
 class FakeFieldsFormWithFieldsets(models.AbstractModel):
     """A test model form."""
@@ -10,21 +12,22 @@ class FakeFieldsFormWithFieldsets(models.AbstractModel):
     _name = "cms.form.test_fieldsets"
     _inherit = "cms.form.test_fields"
     _description = "CMS Form test fieldsets form"
-    _form_fieldsets = [
-        {"id": "main", "fields": ["a_char"]},
-        {
-            "id": "numbers",
-            "title": "Number fields",
-            "description": "Only number fields here",
-            "fields": ["a_number", "a_float"],
-            "css_extra_klass": "best_fieldset",
-        },
-        {
-            "id": "relations",
-            "title": "Only relations here",
-            "fields": ["a_many2one", "a_many2many", "a_one2many"],
-        },
-        {"id": "protected", "fields": ["ihaveagroup"]},
-    ]
-    # FIXME
-    ihaveagroup = fields.Char(groups="website.group_website_designer")
+    form_fieldsets = Serialized(
+        default=[
+            {"id": "main", "fields": ["a_char"]},
+            {
+                "id": "numbers",
+                "title": "Number fields",
+                "description": "Only number fields here",
+                "fields": ["a_number", "a_float"],
+                "css_extra_klass": "best_fieldset",
+            },
+            {
+                "id": "relations",
+                "title": "Only relations here",
+                "fields": ["a_many2one", "a_many2many", "a_one2many"],
+            },
+            {"id": "protected", "fields": ["ihaveagroup"]},
+        ]
+    )
+    ihaveagroup = fields.Char(groups="base.group_system")
diff --git a/cms_form/tests/fake_models/fake_nonpub_model_form.py b/cms_form/tests/fake_models/fake_nonpub_model_form.py
index 08d16daa..5f50bc95 100644
--- a/cms_form/tests/fake_models/fake_nonpub_model_form.py
+++ b/cms_form/tests/fake_models/fake_nonpub_model_form.py
@@ -3,9 +3,10 @@
 
 from odoo import fields, models
 
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
 
-# `AbstractModel` or `AbstractModel` needed to make ACL check happy`
-class FakeNonPubModel(models.AbstractModel):
+
+class FakeNonPubModel(models.Model):
     _name = "fake.non.publishable"
     _description = "CMS Form fake non publishable model"
     name = fields.Char()
@@ -15,5 +16,6 @@ class FakeNonPubModelForm(models.AbstractModel):
     _name = "cms.form.fake.non.publishable"
     _inherit = "cms.form"
     _description = "CMS Form fake non publishable model form"
-    _form_model = "fake.non.publishable"
-    _form_model_fields = ("name",)
+
+    form_model_name = fields.Char(default="fake.non.publishable")
+    form_model_fields = Serialized(default=("name",))
diff --git a/cms_form/tests/fake_models/fake_partner_channel_form.py b/cms_form/tests/fake_models/fake_partner_channel_form.py
index 56ace6a7..4bacd47f 100644
--- a/cms_form/tests/fake_models/fake_partner_channel_form.py
+++ b/cms_form/tests/fake_models/fake_partner_channel_form.py
@@ -1,15 +1,24 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 
-class FakePartnerChannelForm(models.AbstractModel):
+class FakePartnerRelModel(models.Model):
+    _name = "fake.partner.related"
+    _description = _name
+    _rec_name = "partner_id"
+
+    foo = fields.Char()
+    partner_id = fields.Many2one("res.partner")
+
+
+class FakePartnerRelatedForm(models.AbstractModel):
     """A test model form."""
 
-    _name = "cms.form.mail.channel.partner"
+    _name = "cms.form.rel.partner"
     _inherit = "cms.form"
-    _description = "CMS Form test partner channel form"
+    _description = "CMS Form test partner form"
     # This model has `_rec_name = 'partner_id'` and allows us
     # to test a specific case for form_title computation
-    _form_model = "mail.channel.partner"
+    form_model_name = fields.Char(default=FakePartnerRelModel._name)
diff --git a/cms_form/tests/fake_models/fake_partner_form.py b/cms_form/tests/fake_models/fake_partner_form.py
index 577d0907..039fbfa0 100644
--- a/cms_form/tests/fake_models/fake_partner_form.py
+++ b/cms_form/tests/fake_models/fake_partner_form.py
@@ -3,6 +3,8 @@
 
 from odoo import fields, models
 
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+
 
 class FakePartnerForm(models.AbstractModel):
     """A test model form."""
@@ -10,9 +12,10 @@ class FakePartnerForm(models.AbstractModel):
     _name = "cms.form.res.partner"
     _inherit = "cms.form"
     _description = "CMS Form test partner form"
-    _form_model = "res.partner"
-    _form_model_fields = ("name", "country_id")
-    _form_required_fields = ("name", "country_id")
+
+    form_model_name = fields.Char(default="res.partner")
+    form_model_fields = Serialized(default=("name", "country_id"))
+    form_required_fields = Serialized(default=("name", "country_id"))
 
     custom = fields.Char(default=lambda self: "I am your default")
 
diff --git a/cms_form/tests/fake_models/fake_partner_form_protected_fields.py b/cms_form/tests/fake_models/fake_partner_form_protected_fields.py
index 6ff132db..b63b96ab 100644
--- a/cms_form/tests/fake_models/fake_partner_form_protected_fields.py
+++ b/cms_form/tests/fake_models/fake_partner_form_protected_fields.py
@@ -14,4 +14,4 @@ class FakePartnerFormProtectedFields(models.AbstractModel):
     _form_fields_order = ["ihaveagroup", "nogroup"]
 
     nogroup = fields.Char()
-    ihaveagroup = fields.Char(groups="website.group_website_designer")
+    ihaveagroup = fields.Char(groups="base.group_system")
diff --git a/cms_form/tests/fake_models/fake_pub_model_form.py b/cms_form/tests/fake_models/fake_pub_model_form.py
index 9a686992..983876bb 100644
--- a/cms_form/tests/fake_models/fake_pub_model_form.py
+++ b/cms_form/tests/fake_models/fake_pub_model_form.py
@@ -3,14 +3,16 @@
 
 from odoo import fields, models
 
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
 
-# `AbstractModel` or `AbstractModel` needed to make ACL check happy`
-class FakePubModel(models.AbstractModel):
+
+class FakePubModel(models.Model):
     _name = "fake.publishable"
     _inherit = [
         "cms.info.mixin",
     ]
     _description = "CMS Form fake publishable model form"
+
     name = fields.Char()
 
     def _compute_cms_view_url(self):
@@ -22,5 +24,6 @@ class FakePubModelForm(models.AbstractModel):
     _name = "cms.form.fake.publishable"
     _inherit = "cms.form"
     _description = "CMS Form fake publishable form"
-    _form_model = "fake.publishable"
-    _form_model_fields = ("name",)
+
+    form_model_name = fields.Char(default="fake.publishable")
+    form_model_fields = Serialized(default=("name",))
diff --git a/cms_form/tests/fake_models/fake_search_partner_form.py b/cms_form/tests/fake_models/fake_search_partner_form.py
index 9d390ce7..c56c7aff 100644
--- a/cms_form/tests/fake_models/fake_search_partner_form.py
+++ b/cms_form/tests/fake_models/fake_search_partner_form.py
@@ -1,7 +1,11 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
+
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+
+TEST_RECORD_IDS = []
 
 
 class FakeSearchPartnerForm(models.AbstractModel):
@@ -10,22 +14,30 @@ class FakeSearchPartnerForm(models.AbstractModel):
     _name = "cms.form.search.res.partner"
     _inherit = "cms.form.search"
     _description = "CMS Form test partner search form"
-    _form_model = "res.partner"
-    _form_model_fields = (
-        "name",
-        "country_id",
-    )
+
+    form_model_name = fields.Char(default="res.partner")
+    form_model_fields = Serialized(default=("name", "country_id"))
 
     def form_search_domain(self, search_values):
         """Force domain to include only test-created records."""
         domain = super().form_search_domain(search_values)
         # we use this attr in tests to limit search results
         # to test records' scope
-        include_only_ids = getattr(self, "test_record_ids", [])
+        include_only_ids = self._get_test_record_ids()
         if include_only_ids:
             domain.append(("id", "in", include_only_ids))
         return domain
 
+    @classmethod
+    def _get_test_record_ids(cls):
+        global TEST_RECORD_IDS
+        return TEST_RECORD_IDS
+
+    @classmethod
+    def _set_test_record_ids(cls, ids):
+        global TEST_RECORD_IDS
+        TEST_RECORD_IDS = ids
+
 
 class FakeSearchPartnerFormMulti(models.AbstractModel):
     """A test model search form w/ multiple values for country."""
@@ -33,7 +45,8 @@ class FakeSearchPartnerFormMulti(models.AbstractModel):
     _name = "cms.form.search.res.partner.multicountry"
     _inherit = "cms.form.search.res.partner"
     _description = "CMS Form test partner search multi form"
-    _form_search_fields_multi = ("country_id",)
+
+    form_search_fields_multi = Serialized(default=("country_id",))
 
     @property
     def form_widgets(self):
diff --git a/cms_form/tests/fake_models/fake_wizard_form.py b/cms_form/tests/fake_models/fake_wizard_form.py
index 2456f0e8..c0c19ead 100644
--- a/cms_form/tests/fake_models/fake_wizard_form.py
+++ b/cms_form/tests/fake_models/fake_wizard_form.py
@@ -3,6 +3,8 @@
 
 from odoo import fields, models
 
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+
 
 class FakeWiz(models.AbstractModel):
     """A wizard form."""
@@ -35,8 +37,8 @@ class FakeWizStep1Country(models.AbstractModel):
     _name = "fake.wiz.step1.country"
     _inherit = "fake.wiz"
     _description = "CMS Form test wizard form step 1"
-    _form_model = "res.country"
-    _form_model_fields = ("name",)
+    form_model_name = fields.Char(default="res.country")
+    form_model_fields = Serialized(default=("name",))
 
 
 class FakeWizStep2Partner(models.AbstractModel):
@@ -44,12 +46,13 @@ class FakeWizStep2Partner(models.AbstractModel):
     _name = "fake.wiz.step2.partner"
     _inherit = "fake.wiz"
     _description = "CMS Form test wizard form step 2"
-    _form_model = "res.partner"
-    _form_model_fields = (
-        "name",
-        "to_be_stored",
+    form_model_name = fields.Char(default="res.partner")
+    form_model_fields = Serialized(default=("name", "to_be_stored"))
+    form_step_stored_fields = Serialized(
+        default=[
+            "to_be_stored",
+        ]
     )
-    _wiz_step_stored_fields = ("to_be_stored",)
 
     to_be_stored = fields.Char()
 
@@ -59,8 +62,8 @@ class FakeWizStep3Partner(models.AbstractModel):
     _name = "fake.wiz.step3.partner"
     _inherit = "fake.wiz"
     _description = "CMS Form test wizard form step 3"
-    _form_model = "res.partner"
-    _form_model_fields = ("name",)
+    form_model_name = fields.Char(default="res.partner")
+    form_model_fields = Serialized(default=("name",))
 
 
 ALL_WIZ_KLASSES = [
diff --git a/cms_form/tests/test_controllers.py b/cms_form/tests/test_controllers.py
index 888ecfa9..428f91bf 100644
--- a/cms_form/tests/test_controllers.py
+++ b/cms_form/tests/test_controllers.py
@@ -115,7 +115,7 @@ def test_get_default_form(self):
             self.assertTrue(
                 isinstance(form, self.env["cms.form.res.partner"].__class__)
             )
-            self.assertEqual(form._form_model, "res.partner")
+            self.assertEqual(form.form_model, "res.partner")
             self.assertEqual(form.form_mode, "create")
 
     def test_get_specific_form(self):
@@ -125,7 +125,7 @@ def test_get_specific_form(self):
             self.assertTrue(
                 isinstance(form, self.env["cms.form.search.res.partner"].__class__)
             )
-            self.assertEqual(form._form_model, "res.partner")
+            self.assertEqual(form.form_model, "res.partner")
             self.assertEqual(form.form_mode, "search")
 
     def test_get_wizard_form(self):
@@ -135,7 +135,7 @@ def test_get_wizard_form(self):
             self.assertTrue(
                 isinstance(form, self.env["cms.form.res.partner"].__class__)
             )
-            self.assertEqual(form._form_model, "res.partner")
+            self.assertEqual(form.form_model, "res.partner")
             self.assertEqual(form.form_mode, "create")
 
     def test_redirect_after_success(self):
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index ae63f01e..9cc0a0e0 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -25,52 +25,54 @@ def _get_test_models():
     def test_form_init(self):
         form = self.get_form("cms.form.mixin")
         self.assertTrue(isinstance(form.request, Request))
-        self.assertTrue(isinstance(form.o_request, http.HttpRequest))
+        self.assertTrue(isinstance(form.o_request, http.Request))
 
     def test_form_init_overrides(self):
         overrides = dict(
-            model="res.partner",
-            mode="foo",
-            fields_whitelist=("name",),
-            fields_blacklist=("country_id",),
-            fields_attributes=(
+            form_model_name="res.partner",
+            form_mode="foo",
+            form_fields_whitelist=("name",),
+            form_fields_blacklist=("country_id",),
+            form_fields_attributes=(
                 "string",
                 "type",
             ),
-            wrapper_extra_css_klass="foo",
-            extra_css_klass="baz",
+            form_wrapper_extra_css_klass="foo",
+            form_extra_css_klass="baz",
         )
         form = self.get_form("cms.form.mixin", **overrides)
         for k, v in overrides.items():
-            self.assertEqual(getattr(form, "_form_" + k), v)
+            self.assertEqual(form[k], v)
 
     def test_form_mode(self):
         form = self.get_form("cms.form.mixin")
         self.assertEqual(form.form_mode, "create")
         form = self.get_form("cms.form.mixin", main_object=object())
         self.assertEqual(form.form_mode, "edit")
-        form = self.get_form("cms.form.mixin", mode="custom")
+        form = self.get_form("cms.form.mixin", form_mode="custom")
         self.assertEqual(form.form_mode, "custom")
 
     def test_fields_load(self):
         form = self.get_form("cms.form.res.partner")
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertEqual(len(fields), 3)
         self.assertTrue("name" in list(fields.keys()))
         self.assertTrue("country_id" in list(fields.keys()))
         self.assertTrue("custom" in list(fields.keys()))
 
         # whitelist
-        form = self.get_form("cms.form.res.partner", fields_whitelist=("name",))
-        fields = form.form_fields()
+        form = self.get_form("cms.form.res.partner", form_fields_whitelist=("name",))
+        fields = form.form_fields_get()
         self.assertEqual(len(fields), 1)
         self.assertTrue("name" in list(fields.keys()))
         self.assertTrue("country_id" not in list(fields.keys()))
         self.assertTrue("custom" not in list(fields.keys()))
 
         # blacklist
-        form = self.get_form("cms.form.res.partner", fields_blacklist=("country_id",))
-        fields = form.form_fields()
+        form = self.get_form(
+            "cms.form.res.partner", form_fields_blacklist=("country_id",)
+        )
+        fields = form.form_fields_get()
         self.assertEqual(len(fields), 2)
         self.assertTrue("name" in list(fields.keys()))
         self.assertTrue("country_id" not in list(fields.keys()))
@@ -79,9 +81,9 @@ def test_fields_load(self):
     def test_fields_order(self):
         form = self.get_form(
             "cms.form.res.partner",
-            fields_order=["name", "custom", "country_id"],
+            form_fields_order=["name", "custom", "country_id"],
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertEqual(list(fields.keys())[0], "name")
         self.assertEqual(list(fields.keys())[1], "custom")
         self.assertEqual(list(fields.keys())[2], "country_id")
@@ -89,16 +91,23 @@ def test_fields_order(self):
         # change order
         form = self.get_form(
             "cms.form.res.partner",
-            fields_order=["country_id", "name", "custom"],
+            form_fields_order=["country_id", "name", "custom"],
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertEqual(list(fields.keys())[0], "country_id")
         self.assertEqual(list(fields.keys())[1], "name")
         self.assertEqual(list(fields.keys())[2], "custom")
 
+    def test_form_fields_get(self):
+        form = self.get_form("cms.form.res.partner")
+        fields = form.form_fields_get()
+        # must include ONLY non tech fields and model fields
+        expected = ["name", "country_id", "custom"]
+        self.assertEqual(sorted(fields.keys()), sorted(expected))
+
     def test_fields_attributes(self):
         form = self.get_form("cms.form.res.partner")
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         # this one is required in partner model
         self.assertTrue(fields["name"]["required"])
         # this one is forced to required in our custom form
@@ -107,50 +116,50 @@ def test_fields_attributes(self):
     def test_fields_defaults(self):
         form = self.get_form("cms.form.res.partner")
         self.env["ir.default"].set("res.partner", "name", "DEFAULT NAME")
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertEqual(fields["name"]["_default"], "DEFAULT NAME")
         self.assertEqual(fields["custom"]["_default"], "I am your default")
 
     def test_fields_hidden(self):
-        form = self.get_form("cms.form.res.partner", fields_hidden=("country_id",))
+        form = self.get_form("cms.form.res.partner", form_fields_hidden=("country_id",))
         # get all fields (default)
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertListEqual(sorted(fields.keys()), ["country_id", "custom", "name"])
         # country is flagged as hidden
         self.assertTrue(fields["country_id"]["hidden"])
         # get only visible
-        fields = form.form_fields(hidden=False)
+        fields = form.form_fields_get(hidden=False)
         self.assertListEqual(sorted(fields.keys()), ["custom", "name"])
         # get only hidden
-        fields = form.form_fields(hidden=True)
+        fields = form.form_fields_get(hidden=True)
         self.assertListEqual(sorted(fields.keys()), ["country_id"])
         self.assertTrue(fields["country_id"]["hidden"])
 
     def test_fields_hidden_keep_order(self):
         form = self.get_form(
             "cms.form.res.partner",
-            fields_hidden=("country_id",),
-            fields_order=["country_id", "name", "custom"],
+            form_fields_hidden=("country_id",),
+            form_fields_order=["country_id", "name", "custom"],
         )
-        fields = form.form_fields(hidden=False)
+        fields = form.form_fields_get(hidden=False)
         self.assertListEqual(list(fields.keys()), ["name", "custom"])
         form = self.get_form(
             "cms.form.res.partner",
-            fields_hidden=("country_id",),
-            fields_order=["country_id", "custom", "name"],
+            form_fields_hidden=("country_id",),
+            form_fields_order=["country_id", "custom", "name"],
         )
-        fields = form.form_fields(hidden=False)
+        fields = form.form_fields_get(hidden=False)
         self.assertListEqual(list(fields.keys()), ["custom", "name"])
 
     def test_subfields(self):
         form = self.get_form(
             "cms.form.res.partner",
-            sub_fields={
+            form_sub_fields={
                 "name": {"_all": ("custom",)},
                 "do_not_exists": {"_all": ("foo",)},  # skipped
             },
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         self.assertEqual(
             fields["name"]["subfields"], {"_all": {"custom": fields["custom"]}}
         )
@@ -158,24 +167,24 @@ def test_subfields(self):
 
     def test_fields_binary(self):
         form = self.get_form(
-            "cms.form.res.partner", model_fields=["name", "image_1024"]
+            "cms.form.res.partner", form_model_fields=["name", "image_1024"]
         )
         self.assertEqual(list(form.form_file_fields.keys()), ["image_1024"])
 
     def test_fields_protected(self):
-        group = self.env.ref("website.group_website_designer")
+        group = self.env.ref("base.group_system")
         user = self.env.ref("base.user_demo")
         # user does not have the group
         self.assertNotIn(group, user.groups_id)
         form = self.get_form("cms.form.protected.fields", sudo_uid=user.id)
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         # field is skipped
         self.assertEqual(list(fields.keys()), ["nogroup"])
         # now add the group
         user.write({"groups_id": [(4, group.id)]})
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         # now we get protected field too
-        self.assertEqual(list(fields.keys()), ["ihaveagroup", "nogroup"])
+        self.assertEqual(sorted(fields.keys()), sorted(["ihaveagroup", "nogroup"]))
 
     def test_get_loader(self):
         form = self.get_form("cms.form.test_fields")
@@ -190,22 +199,32 @@ def test_get_loader(self):
             ),
             None,
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         for fname, loader in expected.items():
             self.assertEqual(loader, form.form_get_loader(fname, fields[fname]))
 
-        def custom_loader(*pa, **ka):
+        def custom_loader(self, *pa, **ka):
             return pa, ka
 
-        # by type
-        form._form_load_char = custom_loader
-        form._form_load_integer = custom_loader
-        form._form_load_float = custom_loader
-        # by name
-        form._form_load_a_many2many = custom_loader
-
-        for fname in ("a_char", "a_number", "a_float", "a_many2many"):
-            self.assertEqual(custom_loader, form.form_get_loader(fname, fields[fname]))
+        with (
+            mock.patch.object(
+                type(form), "_form_load_char", custom_loader, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_load_integer", custom_loader, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_load_float", custom_loader, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_load_a_many2many", custom_loader, create=True
+            ),
+        ):
+            for fname in ("a_char", "a_number", "a_float", "a_many2many"):
+                self.assertEqual(
+                    custom_loader.__name__,
+                    form.form_get_loader(fname, fields[fname]).__name__,
+                )
 
     def test_get_extractor(self):
         form = self.get_form("cms.form.test_fields")
@@ -220,24 +239,35 @@ def test_get_extractor(self):
             ),
             None,
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         for fname, loader in expected.items():
             self.assertEqual(loader, form.form_get_extractor(fname, fields[fname]))
 
-        def custom_extractor(*pa, **ka):
+        def custom_extractor(self, *pa, **ka):
             return pa, ka
 
-        # by type
-        form._form_extract_char = custom_extractor
-        form._form_extract_integer = custom_extractor
-        form._form_extract_float = custom_extractor
-        # by name
-        form._form_extract_a_many2many = custom_extractor
-
-        for fname in ("a_char", "a_number", "a_float", "a_many2many"):
-            self.assertEqual(
-                custom_extractor, form.form_get_extractor(fname, fields[fname])
-            )
+        with (
+            mock.patch.object(
+                type(form), "_form_extract_char", custom_extractor, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_extract_integer", custom_extractor, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_extract_integer", custom_extractor, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_extract_float", custom_extractor, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_extract_a_many2many", custom_extractor, create=True
+            ),
+        ):
+            for fname in ("a_char", "a_number", "a_float", "a_many2many"):
+                self.assertEqual(
+                    custom_extractor.__name__,
+                    form.form_get_extractor(fname, fields[fname]).__name__,
+                )
 
     def test_load_defaults(self):
         # create mode, no main_object
@@ -300,7 +330,7 @@ def test_extract_from_request(self):
             self.assertEqual(expected[k], v)
         # read mode
         form = self.get_form(
-            "cms.form.test_fields", req=request, extract_value_mode="read"
+            "cms.form.test_fields", req=request, form_extract_value_mode="read"
         )
         values = form.form_extract_values()
         expected.update({"a_many2many": [1, 2, 3], "a_one2many": [4, 5, 6]})
@@ -349,13 +379,19 @@ def test_extract_from_request_custom_extractor(self):
         # write mode
         form = self.get_form("cms.form.test_fields", req=request)
 
-        def custom_extractor(form, fname, value, **request_values):
+        def custom_extractor(self, form, fname, value, **request_values):
             return "custom for: " + fname
 
         # by type
-        form._form_extract_a_char = custom_extractor
-        form._form_extract_a_number = custom_extractor
-        values = form.form_extract_values()
+        with (
+            mock.patch.object(
+                type(form), "_form_extract_a_char", custom_extractor, create=True
+            ),
+            mock.patch.object(
+                type(form), "_form_extract_a_number", custom_extractor, create=True
+            ),
+        ):
+            values = form.form_extract_values()
         expected = {
             "a_char": "custom for: a_char",
             "a_number": "custom for: a_number",
@@ -473,7 +509,7 @@ def test_get_widget(self):
             "a_many2many": "cms.form.widget.many2many",
             "a_one2many": "cms.form.widget.one2many",
         }
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         for fname, widget_model in expected.items():
             self.assertEqual(
                 widget_model, form.form_get_widget_model(fname, fields[fname])
@@ -487,7 +523,7 @@ def test_wrapper_css_klass(self):
         form = self.get_form("cms.form.res.partner")
         expected = "cms_form_wrapper cms_form_res_partner " "res_partner mode_create"
         self.assertEqual(form.form_wrapper_css_klass, expected)
-        form._form_wrapper_extra_css_klass = "foo"
+        form.form_wrapper_extra_css_klass = "foo"
         expected = (
             "cms_form_wrapper cms_form_res_partner " "res_partner foo mode_create"
         )
@@ -496,7 +532,7 @@ def test_wrapper_css_klass(self):
     def test_css_klass(self):
         form = self.get_form("cms.form.res.partner")
         self.assertEqual(form.form_css_klass, "form-horizontal")
-        form._form_extra_css_klass = "cool"
+        form.form_extra_css_klass = "cool"
         self.assertEqual(form.form_css_klass, "form-horizontal cool")
         form.form_display_mode = "vertical"
         self.assertEqual(form.form_css_klass, "form-vertical cool")
diff --git a/cms_form/tests/test_form_cms.py b/cms_form/tests/test_form_cms.py
index 4af6aada..c0dac91f 100644
--- a/cms_form/tests/test_form_cms.py
+++ b/cms_form/tests/test_form_cms.py
@@ -14,14 +14,18 @@ class TestCMSForm(FormTestCase):
     @staticmethod
     def _get_test_models():
         from .fake_models.fake_fields_form import FakeFieldsForm
-        from .fake_models.fake_partner_channel_form import FakePartnerChannelForm
+        from .fake_models.fake_partner_channel_form import (
+            FakePartnerRelatedForm,
+            FakePartnerRelModel,
+        )
         from .fake_models.fake_partner_form import FakePartnerForm
         from .fake_models.fake_pub_model_form import FakePubModel, FakePubModelForm
 
         return (
             FakePartnerForm,
             FakeFieldsForm,
-            FakePartnerChannelForm,
+            FakePartnerRelatedForm,
+            FakePartnerRelModel,
             FakePubModel,
             FakePubModelForm,
         )
@@ -42,12 +46,10 @@ def test_form_base_attrs(self):
         self.assertEqual(form.form_title, 'Edit "%s"' % partner.name)
         # now edit a record that has a m2o as rec name
         partner.name = "Johnny"
-        partner_channel = self.env["mail.channel.partner"].create(
+        partner_rel = self.env[self.FakePartnerRelModel._name].create(
             {"partner_id": partner.id}
         )
-        form = self.get_form(
-            "cms.form.mail.channel.partner", main_object=partner_channel
-        )
+        form = self.get_form(self.FakePartnerRelatedForm._name, main_object=partner_rel)
         self.assertEqual(form.form_title, 'Edit "Johnny"')
 
     def test_form_special_attrs_getter_setter(self):
@@ -116,7 +118,7 @@ def test_validate(self):
         request = fake_request(form_data=data)
         required = ("a_many2one", "a_many2many")
         form = self.get_form(
-            "cms.form.test_fields", req=request, required_fields=required
+            "cms.form.test_fields", req=request, form_required_fields=required
         )
         errors, errors_message = form.form_validate()
         self.assertEqual(
@@ -143,7 +145,7 @@ def test_create_or_update(self):
         }
         request = fake_request(form_data=data, method="POST")
         form = self.get_form(
-            "cms.form.res.partner", req=request, required_fields=("name",)
+            "cms.form.res.partner", req=request, form_required_fields=("name",)
         )
         form.form_process()
         main_object = form.main_object
@@ -160,7 +162,7 @@ def test_create_or_update(self):
             "cms.form.res.partner",
             req=request,
             main_object=main_object,
-            required_fields=("name",),
+            form_required_fields=("name",),
         )
         form.form_process()
         self.assertEqual(main_object.name, data["name"])
diff --git a/cms_form/tests/test_form_permission.py b/cms_form/tests/test_form_permission.py
index 58fd194a..fdd18da7 100644
--- a/cms_form/tests/test_form_permission.py
+++ b/cms_form/tests/test_form_permission.py
@@ -90,14 +90,20 @@ def test_form_check_permission_no_ws_mixin_can_edit(self):
 
     def test_form_check_permission_no_record_no_model_can_edit_create(self):
         form = self.get_form(self.FakePartnerForm._name, main_object=None)
-        form._form_model = None
+        form.form_model_name = None
         self.assertTrue(form._can_edit())
         self.assertTrue(form._can_create())
 
     def test_form_check_permission_form_cannot_edit(self):
-        form = self.get_form(self.FakePartnerForm._name, main_object=self.record)
-        with mock.patch.object(type(self.record), "check_access_rights") as patched:
+        form = self.get_form(self.FakePartnerForm._name)
+        with mock.patch.object(
+            type(self.record), "check_access_rights", spec=True
+        ) as patched:
             patched.side_effect = exceptions.AccessError("boom")
             with self.assertRaises(exceptions.AccessError):
+                # FIXME: for some reason entering this ctx manager and exiting
+                # wipes the main_object thus I have to set it twice
+                form.main_object = self.record
                 form._can_edit()
+            form.main_object = self.record
             self.assertFalse(form._can_edit(raise_exception=False))
diff --git a/cms_form/tests/test_form_render.py b/cms_form/tests/test_form_render.py
index 50d64d32..45705b8e 100644
--- a/cms_form/tests/test_form_render.py
+++ b/cms_form/tests/test_form_render.py
@@ -27,7 +27,7 @@ def test_render_form_attrs(self):
         }
         self.assert_match_attrs(node.attrib, expected_attrs)
 
-    def test_render_form_fields(self):
+    def test_render_form_fields_get(self):
         form = self.get_form("cms.form.test_fields")
         html = form.form_render()
         node = self.to_xml_node(html)[0]
@@ -46,7 +46,7 @@ def test_render_form_fields(self):
 
     def test_field_wrapper_attrs(self):
         form = self.get_form("cms.form.test_fields")
-        form_fields = form.form_fields()
+        form_fields = form.form_fields_get()
         html = form.form_render()
         node = self.to_xml_node(html)[0]
         expected_fields = (
@@ -66,7 +66,7 @@ def test_field_wrapper_attrs(self):
                 form.form_make_field_wrapper_klass(fname, form_fields[fname]),
             )
 
-    def test_render_form_fieldsets(self):
+    def test_render_form_fieldsets_get(self):
         form = self.get_form("cms.form.test_fieldsets")
         html = form.form_render()
         node = self.to_xml_node(html)[0]
@@ -85,7 +85,7 @@ def test_render_form_fieldsets(self):
         self.assertEqual(len(node[0].xpath("//input|//select")), len(expected_fields))
         self.assert_match_inputs(node, expected_fields)
         # and they are organized by fieldset
-        for fset in form.form_fieldsets():
+        for fset in form.form_fieldsets_get():
             fset_node = node.xpath('//fieldset[@id="%s"]' % fset["id"])[0]
             if fset.get("title"):
                 legend_node = fset_node.find("legend")
diff --git a/cms_form/tests/test_form_search.py b/cms_form/tests/test_form_search.py
index 1a7edf41..6a7367bd 100644
--- a/cms_form/tests/test_form_search.py
+++ b/cms_form/tests/test_form_search.py
@@ -27,6 +27,10 @@ def setUpClass(cls):
         super().setUpClass()
         cls._setup_records()
 
+    def tearDown(self):
+        self.FakeSearchPartnerForm._set_test_record_ids([])
+        super().tearDown()
+
     @classmethod
     def _setup_records(cls):
         cls.partner_model = cls.env["res.partner"].with_context(tracking_disable=True)
@@ -77,7 +81,7 @@ def get_search_form(self, data, form_model="cms.form.search.res.partner", **kw):
         request = fake_request(form_data=data)
         form = self.get_form(form_model, req=request, **kw)
         # restrict search results to these ids
-        form.test_record_ids = self.expected_partners_ids
+        self.FakeSearchPartnerForm._set_test_record_ids(self.expected_partners_ids)
         return form
 
     def test_form_base_attrs(self):
@@ -87,8 +91,8 @@ def test_form_base_attrs(self):
 
     def test_search_domain(self):
         form = self.get_search_form({})
-        form.test_record_ids = []
-        form._form_search_domain_rules = {
+        self.FakeSearchPartnerForm._set_test_record_ids([])
+        form.form_search_domain_rules = {
             "float_field": lambda field, value, search_values: (
                 "float_field",
                 ">",
@@ -110,7 +114,7 @@ def mock_fields(form):
                 "m2m_field": {"type": "many2many"},
             }
 
-        with mock.patch.object(type(form), "form_fields", mock_fields):
+        with mock.patch.object(type(form), "form_fields_get", mock_fields):
             search_values = {
                 "char_field": "foo",
                 "text_field": "",
@@ -175,7 +179,7 @@ def test_search(self):
         self.assert_results(form, 1, self.expected_partners[4:])
 
     def test_search_no_result(self):
-        form = self.get_search_form({}, show_results_no_submit=False)
+        form = self.get_search_form({}, form_show_results_no_submit=False)
         form.form_process()
         self.assertEqual(form.form_search_results, {})
 
@@ -247,7 +251,7 @@ def test_search_custom_rules(self):
         }
         form = self.get_search_form(
             data,
-            search_domain_rules={"country_id": ("country_id.name", "ilike", "")},
+            form_search_domain_rules={"country_id": ("country_id.name", "ilike", "")},
         )
         form.form_process()
         self.assert_results(form, 2, self.expected_partners[:2])
diff --git a/cms_form/tests/test_form_wizard.py b/cms_form/tests/test_form_wizard.py
index c015647e..8eadbab0 100644
--- a/cms_form/tests/test_form_wizard.py
+++ b/cms_form/tests/test_form_wizard.py
@@ -55,7 +55,7 @@ def test_wiz_base_attrs(self):
     def test_wiz_use_session_by_default(self):
         req = fake_request(session=self.session)
         form = self.get_form("cms.form.wizard", req=req)
-        self.assertEqual(form._wiz_storage.__class__.__name__, "OpenERPSession")
+        self.assertEqual(form._wiz_storage.__class__.__name__, "Session")
 
     def test_wiz_configure_steps(self):
         form = self.get_form("cms.form.wizard")
@@ -149,7 +149,10 @@ def test_wiz_stored_fields(self):
             "to_be_stored": "Whatever",
         }
         req = fake_request(form_data=data, method="POST")
-        form = self.get_form(self.FakeWizStep2Partner._name, req=req)
+        form = self.get_form(
+            self.FakeWizStep2Partner._name,
+            req=req,
+        )
         main_object = form.form_create_or_update()
         self.assertEqual(main_object.name, "John Doe")
         step_values = form.wiz_load_step()
@@ -161,8 +164,12 @@ def test_wiz_stored_fields_all(self):
             "to_be_stored": "Whatever",
         }
         req = fake_request(form_data=data, method="POST")
-        form = self.get_form(self.FakeWizStep2Partner._name, req=req)
-        form._wiz_step_stored_fields = "all"
+        form = self.get_form(
+            self.FakeWizStep2Partner._name,
+            req=req,
+            form_step_store_all_fields=True,
+            form_step_stored_fields="[]",
+        )
         main_object = form.form_create_or_update()
         self.assertEqual(main_object.name, "John Doe")
         step_values = form.wiz_load_step()
diff --git a/cms_form/tests/utils.py b/cms_form/tests/utils.py
index 8cd4acb1..b87c62d9 100644
--- a/cms_form/tests/utils.py
+++ b/cms_form/tests/utils.py
@@ -24,7 +24,6 @@ def fake_request(
     session=None,
 ):
     data = urllib.parse.urlencode(form_data or {})
-    query_string = query_string or ""
     content_type = content_type or "application/x-www-form-urlencoded"
     # werkzeug request
     w_req = Request.from_values(
diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index dd4223c0..6ecb53d0 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -23,7 +23,7 @@ def _get_test_models():
 
     def test_widget_init(self):
         form = get_form(self.env, "cms.form.res.partner")
-        field = form.form_fields()["custom"]
+        field = form.form_fields_get()["custom"]
         widget = self.get_widget("custom", field, form=form)
         self.assertEqual(widget.w_form, form)
         self.assertEqual(widget.w_form_model, form.form_model)
@@ -78,6 +78,6 @@ def test_subfields_get(self):
             "cms.form.res.partner",
             sub_fields={"name": {"_all": ("custom",)}},
         )
-        fields = form.form_fields()
+        fields = form.form_fields_get()
         widget = self.get_widget("name", fields["name"], form=form)
         self.assertEqual(widget.w_subfields_by_value(), {"custom": fields["custom"]})
diff --git a/cms_form/tests/widgets/test_widget_binary.py b/cms_form/tests/widgets/test_widget_binary.py
index 9211e9df..c11a6666 100644
--- a/cms_form/tests/widgets/test_widget_binary.py
+++ b/cms_form/tests/widgets/test_widget_binary.py
@@ -1,6 +1,9 @@
 # Copyright 2019 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-from odoo.addons.cms_form.tests.utils import b64_as_stream, fake_file_from_request
+from odoo.addons.cms_form.tests.utils import (  # pylint: disable=W7950
+    b64_as_stream,
+    fake_file_from_request,
+)
 
 from .common import TestWidgetCase, fake_field, fake_form
 
diff --git a/cms_form/utils.py b/cms_form/utils.py
index 11fdad8f..5d013cb1 100644
--- a/cms_form/utils.py
+++ b/cms_form/utils.py
@@ -79,5 +79,5 @@ def data_merge(a, b):
     except TypeError as e:  # pragma: no cover
         raise TypeError(
             '"{}" in key "{}" when merging "{}" into "{}"'.format(e, key, b, a)
-        )
+        ) from e
     return a

From 2178b34b3dfda5c1df291125af4f94af973475e0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 11 Jul 2023 16:32:20 +0200
Subject: [PATCH 04/69] cms_form: fix status msg add after rollback

When the transaction is rolled back due to an pg error
use a new env to be able to inject the status message
otherwise a dead request will be used.
---
 cms_form/models/cms_form.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index 55fc77e9..727220ba 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -1,6 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
+
 import psycopg2 as pg
 
 from odoo import _, exceptions, fields, models
@@ -178,6 +179,8 @@ def form_create_or_update(self):
     def form_process_POST(self, render_values):
         """Process POST requests."""
         errors, errors_message = self.form_validate()
+        # Do not flush to keep the caches of current in memory objects
+        savepoint = self.env.cr.savepoint(flush=False)
         if not errors:
             try:
                 self.form_create_or_update()
@@ -200,7 +203,7 @@ def form_process_POST(self, render_values):
                 errors_message["_integrity"] = "<br />".join(
                     [x for x in str(err).split("\n") if x.strip()]
                 )
-
+        savepoint.rollback()
         # TODO: how to handle validation error on create?
         # If you use @api.constrains to validate fields' value
         # the check happens only AFTER the record has been created.
@@ -218,9 +221,11 @@ def form_process_POST(self, render_values):
         if orm_error:
             msg = errors_message.get("_validation") or errors_message.get("_integrity")
             if msg:
-                self.add_status_message(msg, kind="danger", title=None)
+                self.add_status_message(
+                    msg, kind="danger", title=None, dismissible=False
+                )
         render_values.update({"errors": errors, "errors_message": errors_message})
         return render_values
 
     def add_status_message(self, msg, **kw):
-        self.env["ir.http"].add_status_message(msg, request=self.request, **kw)
+        self.env["ir.http"].add_status_message(msg, request=self.o_request, **kw)

From d5d3a214e563b2b43add8b2fab4fc220af8b3a4e Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 12 Jul 2023 08:49:41 +0200
Subject: [PATCH 05/69] cms_form: mig widgets

---
 cms_form/models/widgets/widget_binary.py      |  5 +--
 cms_form/models/widgets/widget_boolean.py     |  5 +--
 cms_form/models/widgets/widget_date.py        | 19 +++++++-----
 cms_form/models/widgets/widget_hidden.py      |  5 +--
 cms_form/models/widgets/widget_many2one.py    |  8 +++--
 cms_form/models/widgets/widget_mixin.py       | 31 ++++++-------------
 cms_form/models/widgets/widget_numeric.py     |  2 +-
 cms_form/models/widgets/widget_selection.py   | 22 ++++++++++---
 cms_form/models/widgets/widget_text.py        | 10 +++---
 cms_form/models/widgets/widget_x2many.py      |  3 ++
 cms_form/templates/widgets.xml                |  2 +-
 cms_form/tests/widgets/test_widget_base.py    |  4 +--
 cms_form/tests/widgets/test_widget_date.py    | 17 +++++-----
 cms_form/tests/widgets/test_widget_float.py   | 13 ++++----
 cms_form/tests/widgets/test_widget_integer.py | 13 ++++----
 .../tests/widgets/test_widget_selection.py    |  7 ++---
 16 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index c512e8d9..0b396e36 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -5,7 +5,7 @@
 
 import werkzeug
 
-from odoo import models
+from odoo import fields, models
 from odoo.tools import pycompat
 from odoo.tools.mimetypes import guess_mimetype
 
@@ -89,4 +89,5 @@ class ImageWidget(models.AbstractModel):
     _name = "cms.form.widget.image"
     _inherit = "cms.form.widget.binary.mixin"
     _description = "CMS Form image widget"
-    _w_template = "cms_form.field_widget_image"
+
+    w_template = fields.Char(default="cms_form.field_widget_image")
diff --git a/cms_form/models/widgets/widget_boolean.py b/cms_form/models/widgets/widget_boolean.py
index bb1c714b..ba6f8e6b 100644
--- a/cms_form/models/widgets/widget_boolean.py
+++ b/cms_form/models/widgets/widget_boolean.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 from ... import utils
 from ..fields import Serialized
@@ -11,9 +11,10 @@ class BooleanWidget(models.AbstractModel):
     _name = "cms.form.widget.boolean"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form boolean widget"
-    _w_template = "cms_form.field_widget_boolean"
 
+    w_template = fields.Char(default="cms_form.field_widget_boolean")
     w_true_values = Serialized(default=utils.TRUE_VALUES)
+    w_field_value = fields.Boolean()
 
     def widget_init(self, form, fname, field, **kw):
         widget = super().widget_init(form, fname, field, **kw)
diff --git a/cms_form/models/widgets/widget_date.py b/cms_form/models/widgets/widget_date.py
index 0d649a70..dd819a5a 100644
--- a/cms_form/models/widgets/widget_date.py
+++ b/cms_form/models/widgets/widget_date.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 from ... import utils
 
@@ -11,19 +11,24 @@ class DateWidget(models.AbstractModel):
     _name = "cms.form.widget.date"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form date widget"
-    _w_template = "cms_form.field_widget_date"
 
+    w_template = fields.Char(default="cms_form.field_widget_date")
     # Both default to current lang format.
-    w_placeholder = ""
-    w_date_format = ""
+    w_placeholder = fields.Char(default="")
+    w_date_format = fields.Char(default="")
+    # change type of field
+    w_field_value = fields.Date(default=None)
+    w_default_today = fields.Boolean(default=True)
 
     def widget_init(self, form, fname, field, **kw):
         widget = super().widget_init(form, fname, field, **kw)
-        if "defaultToday" not in widget.w_data:
+        w_data = widget.w_data
+        if "defaultToday" not in w_data:
             # set today's date by default
-            widget.w_data["defaultToday"] = True
+            w_data["defaultToday"] = widget.w_default_today
         if kw.get("format", widget.w_date_format):
-            widget.w_data["dp"] = {"format": kw.get("format", widget.w_date_format)}
+            w_data["dp"] = {"format": kw.get("format", widget.w_date_format)}
+        widget.w_data = w_data
         widget.w_placeholder = kw.get("placeholder", widget.w_placeholder)
         return widget
 
diff --git a/cms_form/models/widgets/widget_hidden.py b/cms_form/models/widgets/widget_hidden.py
index 7e0ecd45..4f22af4a 100644
--- a/cms_form/models/widgets/widget_hidden.py
+++ b/cms_form/models/widgets/widget_hidden.py
@@ -1,14 +1,15 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 
 class HiddenWidget(models.AbstractModel):
     _name = "cms.form.widget.hidden"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form hidden widget"
-    _w_template = "cms_form.field_widget_hidden"
+
+    w_template = fields.Char(default="cms_form.field_widget_hidden")
 
     @property
     def w_html_fname(self):
diff --git a/cms_form/models/widgets/widget_many2one.py b/cms_form/models/widgets/widget_many2one.py
index caa76976..62161ed1 100644
--- a/cms_form/models/widgets/widget_many2one.py
+++ b/cms_form/models/widgets/widget_many2one.py
@@ -6,6 +6,7 @@
 from odoo import fields, models
 
 from ... import utils
+from ..fields import Serialized
 
 
 class M2OWidget(models.AbstractModel):
@@ -14,6 +15,7 @@ class M2OWidget(models.AbstractModel):
     _description = "CMS Form M2O widget"
 
     w_template = fields.Char(default="cms_form.field_widget_m2o")
+    w_field_value = fields.Integer()
 
     @property
     def w_option_items(self):
@@ -50,9 +52,11 @@ class M2OMultiWidget(models.AbstractModel):
     _name = "cms.form.widget.many2one.multi"
     _inherit = "cms.form.widget.many2one"
     _description = "CMS Form M2O multi widget"
-    _w_template = "cms_form.field_widget_m2o_multi"
+
+    w_template = fields.Char(default="cms_form.field_widget_m2o_multi")
     # TODO: not used ATM
-    w_display_field = "display_name"
+    w_display_field = fields.Char(default="display_name")
+    w_field_value = Serialized(default=[])
 
     def m2o_to_form(self, value, **req_values):
         if not value:
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 475a4dfa..aa6d8ed0 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -19,52 +19,39 @@ class Widget(models.AbstractModel):
     # TODO: would be better to have python obj fields
     w_form = fields.Binary(store=False)
     w_record = fields.Binary(store=False)
-    main_object = fields.Binary(store=False)
     w_field = fields.Binary(store=False)
+    w_subfields = fields.Binary(default={}, store=False)
 
     w_template = fields.Char(default="")
     w_css_klass = fields.Char(default="")
 
     w_fname = fields.Char(default="")
-    w_field_value = Serialized(default=None)
+    w_field_value = fields.Char(default="")
     w_data = Serialized(default={})
-    w_subfields = Serialized(default={})
-
-    def widget_init(
-        self,
-        form,
-        fname,
-        field,
-        data=None,
-        subfields=None,
-        template="",
-        css_klass="",
-        **kw
-    ):
+
+    def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
         vals = {
             "w_form": form,
+            "w_record": form.main_object,
             "w_fname": fname,
             "w_field": field,
             "w_field_value": form.form_render_values.get("form_data", {}).get(fname),
             "w_data": data or {},
             "w_subfields": subfields or field.get("subfields", {}),
-            "w_template": template,
-            "w_css_klass": css_klass,
         }
+        for k in ("template", "css_klass"):
+            if kw.get(k):
+                vals[f"w_{k}"] = kw[k]
         widget = self.new(vals)
         return widget
 
     def render(self):
-        return self.env.ref(self.w_template).render({"widget": self})
+        return self.env["ir.qweb"]._render(self.w_template, {"widget": self})
 
     @property
     def w_form_model(self):
         return self.w_form.form_model
 
-    @property
-    def w_record(self):
-        return self.w_form.main_object
-
     @property
     def w_form_values(self):
         return self.w_form.form_render_values
diff --git a/cms_form/models/widgets/widget_numeric.py b/cms_form/models/widgets/widget_numeric.py
index 9a74de40..8d5c4905 100644
--- a/cms_form/models/widgets/widget_numeric.py
+++ b/cms_form/models/widgets/widget_numeric.py
@@ -1,7 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 from ... import utils
 
diff --git a/cms_form/models/widgets/widget_selection.py b/cms_form/models/widgets/widget_selection.py
index 7e895fca..0af7e437 100644
--- a/cms_form/models/widgets/widget_selection.py
+++ b/cms_form/models/widgets/widget_selection.py
@@ -1,14 +1,17 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
+
+from ..fields import Serialized
 
 
 class SelectionWidget(models.AbstractModel):
     _name = "cms.form.widget.selection"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form selection widget"
-    _w_template = "cms_form.field_widget_selection"
+
+    w_template = fields.Char(default="cms_form.field_widget_selection")
 
     def w_extract(self, **req_values):
         # Handle case where sel options are integers.
@@ -17,6 +20,9 @@ def w_extract(self, **req_values):
         # and a widget field name. In any case we should be careful
         # and not brake existing forms/widgets.
         value = super().w_extract(**req_values)
+        return self.cast_field_value(value)
+
+    def cast_field_value(self, value):
         first_value = None
         # use `get` as you might want to use the selection widget
         # for non-Selection fields and just pass options via `w_option_items`.
@@ -36,15 +42,23 @@ def w_option_items(self):
             {"value": x[0], "label": x[1]} for x in self.w_field.get("selection", [])
         ]
 
+    def is_option_selected(self, opt_item):
+        return (
+            "selected"
+            if opt_item["value"] == self.cast_field_value(self.w_field_value)
+            else None
+        )
+
 
 class RadioSelectionWidget(models.AbstractModel):
     _name = "cms.form.widget.radio"
     _inherit = "cms.form.widget.selection"
     _description = "CMS Form radio widget"
-    _w_template = "cms_form.field_widget_radio_selection"
+
+    w_template = fields.Char(default="cms_form.field_widget_radio_selection")
     # you can define help message per each options
     # opt value: help msg (can be html too)
-    w_options_help = {}
+    w_options_help = Serialized(default={})
 
     def widget_init(self, form, fname, field, **kw):
         widget = super(RadioSelectionWidget, self).widget_init(form, fname, field, **kw)
diff --git a/cms_form/models/widgets/widget_text.py b/cms_form/models/widgets/widget_text.py
index f3d33ea8..f8223fe4 100644
--- a/cms_form/models/widgets/widget_text.py
+++ b/cms_form/models/widgets/widget_text.py
@@ -1,22 +1,24 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-from odoo import models
+from odoo import fields, models
 
 
 class CharWidget(models.AbstractModel):
     _name = "cms.form.widget.char"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form char widget"
-    _w_template = "cms_form.field_widget_char"
+
+    w_template = fields.Char(default="cms_form.field_widget_char")
 
 
 class TextWidget(models.AbstractModel):
     _name = "cms.form.widget.text"
     _inherit = "cms.form.widget.mixin"
-    _w_template = "cms_form.field_widget_text"
     _description = "CMS Form text widget"
-    w_maxlength = None
+
+    w_template = fields.Char(default="cms_form.field_widget_text")
+    w_maxlength = fields.Integer()
 
     def widget_init(self, form, fname, field, **kw):
         widget = super().widget_init(form, fname, field, **kw)
diff --git a/cms_form/models/widgets/widget_x2many.py b/cms_form/models/widgets/widget_x2many.py
index f5615e32..182679aa 100644
--- a/cms_form/models/widgets/widget_x2many.py
+++ b/cms_form/models/widgets/widget_x2many.py
@@ -5,6 +5,8 @@
 
 from odoo import fields, models
 
+from ..fields import Serialized
+
 
 class X2MWidget(models.AbstractModel):
     _name = "cms.form.widget.x2m.mixin"
@@ -12,6 +14,7 @@ class X2MWidget(models.AbstractModel):
     _description = "CMS Form X2M widget"
 
     w_template = fields.Char(default="cms_form.field_widget_x2m")
+    w_field_value = Serialized(default=None)
 
     # TODO: rename all widget-specific methods like:
     #    `x2many_to_form` -> `_w_orm_to_form`
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 64d77b82..f519ed21 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -58,7 +58,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         <xpath expr="//t[@t-foreach]/option" position="replace">
             <option
                 t-att-value="opt_item['value']"
-                t-att-selected="'selected' if opt_item['value'] == widget.w_field_value else None"
+                t-att-selected="widget.is_option_selected(opt_item)"
             >
                 <t t-esc="opt_item['label']" />
             </option>
diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index 6ecb53d0..620a5a43 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -31,7 +31,7 @@ def test_widget_init(self):
         self.assertEqual(widget.w_form_values, form.form_render_values)
         self.assertEqual(widget.w_fname, "custom")
         self.assertDictEqual(widget.w_field, field)
-        self.assertEqual(widget.w_field_value, None)
+        self.assertEqual(widget.w_field_value, False)
         self.assertEqual(widget.w_data, {})
         self.assertEqual(widget.w_subfields, {})
 
@@ -76,7 +76,7 @@ def test_subfields_get(self):
         form = get_form(
             self.env,
             "cms.form.res.partner",
-            sub_fields={"name": {"_all": ("custom",)}},
+            form_sub_fields={"name": {"_all": ("custom",)}},
         )
         fields = form.form_fields_get()
         widget = self.get_widget("name", fields["name"], form=form)
diff --git a/cms_form/tests/widgets/test_widget_date.py b/cms_form/tests/widgets/test_widget_date.py
index 0ac9c4cf..3389d407 100644
--- a/cms_form/tests/widgets/test_widget_date.py
+++ b/cms_form/tests/widgets/test_widget_date.py
@@ -6,15 +6,14 @@
 
 
 class TestWidgetDate(TestWidgetCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.form = fake_form(a_date_field="2019-01-12", type="date")
-        cls.w_name, cls.w_field = fake_field("a_date_field")
-        cls.widget = cls.get_widget(
-            cls.w_name,
-            cls.w_field,
-            form=cls.form,
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(a_date_field="2019-01-12", type="date")
+        self.w_name, self.w_field = fake_field("a_date_field")
+        self.widget = self.get_widget(
+            self.w_name,
+            self.w_field,
+            form=self.form,
             widget_model="cms.form.widget.date",
         )
 
diff --git a/cms_form/tests/widgets/test_widget_float.py b/cms_form/tests/widgets/test_widget_float.py
index 887a177c..4d5a24a8 100644
--- a/cms_form/tests/widgets/test_widget_float.py
+++ b/cms_form/tests/widgets/test_widget_float.py
@@ -4,14 +4,13 @@
 
 
 class TestWidgetFloat(TestWidgetCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
+    def setUp(self):
+        super().setUp()
         form = fake_form(a_float_field=2.0)
-        cls.w_name, cls.w_field = fake_field("a_float_field", type="float")
-        cls.widget = cls.get_widget(
-            cls.w_name,
-            cls.w_field,
+        self.w_name, self.w_field = fake_field("a_float_field", type="float")
+        self.widget = self.get_widget(
+            self.w_name,
+            self.w_field,
             form=form,
             widget_model="cms.form.widget.float",
         )
diff --git a/cms_form/tests/widgets/test_widget_integer.py b/cms_form/tests/widgets/test_widget_integer.py
index 5eb7d176..30ad67a8 100644
--- a/cms_form/tests/widgets/test_widget_integer.py
+++ b/cms_form/tests/widgets/test_widget_integer.py
@@ -10,14 +10,13 @@ class TestWidgetInteger(TestWidgetCase):
     # Of course we have to switch to `w_html_fname` approach as hidden widget.
     # This implies that we test w/ a full request too.
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
+    def setUp(self):
+        super().setUp()
         form = fake_form(an_int_field=10)
-        cls.w_name, cls.w_field = fake_field("an_int_field", type="integer")
-        cls.widget = cls.get_widget(
-            cls.w_name,
-            cls.w_field,
+        self.w_name, self.w_field = fake_field("an_int_field", type="integer")
+        self.widget = self.get_widget(
+            self.w_name,
+            self.w_field,
             form=form,
             widget_model="cms.form.widget.integer",
         )
diff --git a/cms_form/tests/widgets/test_widget_selection.py b/cms_form/tests/widgets/test_widget_selection.py
index a97a5737..a8464e4d 100644
--- a/cms_form/tests/widgets/test_widget_selection.py
+++ b/cms_form/tests/widgets/test_widget_selection.py
@@ -4,10 +4,9 @@
 
 
 class TestWidgetSelection(TestWidgetCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.form = fake_form(
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(
             # fake defaults
             selection_char_field="opt1",
             selection_integer_field=2,

From 17530b35c233bcda3b120bcd3ba676a177963620 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 12 Jul 2023 09:46:12 +0200
Subject: [PATCH 06/69] cms_form: make Serialized field fail gracefully

---
 cms_form/models/fields.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/fields.py b/cms_form/models/fields.py
index 37e8c54b..477231f7 100644
--- a/cms_form/models/fields.py
+++ b/cms_form/models/fields.py
@@ -1,10 +1,12 @@
 # Copyright 2023 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-
 import json
+import logging
 
 from odoo.addons.base_sparse_field.models.fields import Serialized as BaseSerialized
 
+_logger = logging.getLogger(__name__)
+
 
 class Serialized(BaseSerialized):
     """Better implementation of Serialized field.
@@ -22,5 +24,12 @@ def convert_to_record(self, value, record):
         # you must use a string (eg: "[]" or "{}")
         value = value if value is not None else default
         if isinstance(value, str):
-            return json.loads(value)
+            try:
+                return json.loads(value)
+            except ValueError:
+                _logger.error("%s got bad json string: %s", self.name, value)
+                # Likely a string that is not convert-able.
+                # Consider using a special encoder/decoder.
+                return value
+
         return value

From 5701facb76c4e0f355e9291b825104b897cfa780 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 12 Jul 2023 10:28:34 +0200
Subject: [PATCH 07/69] cms_form: add TODO for templates

---
 cms_form/templates/form.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 49a2e83f..d41565c4 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -3,6 +3,7 @@
 Copyright 2017 Simone Orsi
 License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
+<!-- TODO: rework w/ latest bootstrap markup and split in more files -->
 <odoo>
     <template id="form_wrapper" name="CMS form wrapper">
         <t t-set="title" t-value="form.form_title" />

From 3ed16589a04c2aa55c150f1064cc15997fa2a951 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 13 Jul 2023 12:55:13 +0200
Subject: [PATCH 08/69] cms_form: ease custom widget declaration

You can now use form_widget={...} field attribute
to provide your own widget for the form.
---
 cms_form/models/cms_form_mixin.py             | 45 ++++++++++++++-----
 cms_form/models/cms_search_form.py            |  4 +-
 .../tests/fake_models/fake_fields_form.py     | 17 +++++++
 .../fake_models/fake_search_partner_form.py   | 10 ++---
 cms_form/tests/test_form_base.py              | 20 ++++++---
 cms_form/tests/widgets/common.py              |  2 +-
 6 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index b367c35c..ea76825d 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -399,12 +399,7 @@ def form_update_fields_attributes(self, _fields):
                 _fields[fname]["hidden"] = True
             _fields[fname]["widget"] = self.form_get_widget(fname, field)
 
-    @property
-    def form_widgets(self):
-        """Return a mapping between field name and widget model."""
-        return {}
-
-    def form_get_widget_model(self, fname, field):
+    def _form_get_default_widget_model(self, fname, field):
         """Retrieve widget model name."""
         if field.get("hidden"):
             # special case
@@ -414,13 +409,43 @@ def form_get_widget_model(self, fname, field):
             model_key = "cms.form.widget." + key
             if model_key in self.env:
                 widget_model = model_key
-        return self.form_widgets.get(fname, widget_model)
+        return widget_model
 
     def form_get_widget(self, fname, field, **kw):
         """Retrieve and initialize widget."""
-        return self.env[self.form_get_widget_model(fname, field)].widget_init(
-            self, fname, field, **kw
-        )
+        specific_widget = self._form_get_specific_widget(fname, field, **kw)
+        if specific_widget:
+            return specific_widget
+        model = self._form_get_default_widget_model(fname, field)
+        return self.env[model].widget_init(self, fname, field, **kw)
+
+    def _form_get_specific_widget(self, fname, field, **kw):
+        """Retrieve and initialize fields' specific widgets.
+
+        Form fields' can declare custom widgets using `form_widget` attribute.
+        Properties:
+
+        `resolver`: callable that returns a widget already initialized (optional)
+        `model`: widget model if no `resolver` is passed (mandatory)
+        `options`: dictionary or callable to resolve widget's options
+        """
+        widget_conf = {}
+        if fname in self._fields:
+            # Note: a custom widget for a field on the related model
+            # can come only from an override of the field in the form.
+            widget_conf = getattr(self._fields[fname], "form_widget", {})
+        if not widget_conf:
+            return None
+        if widget_conf.get("resolver"):
+            return widget_conf["resolver"](self, fname, field, **kw)
+        try:
+            model = widget_conf["model"]
+        except KeyError:
+            model = self._form_get_default_widget_model(fname, field)
+        options = widget_conf.get("options", {})
+        if options and callable(options):
+            options = options(self, fname, field, **kw)
+        return self.env[model].widget_init(self, fname, field, **options)
 
     @property
     def form_file_fields(self):
diff --git a/cms_form/models/cms_search_form.py b/cms_form/models/cms_search_form.py
index 8b7bc631..7d3a0e02 100644
--- a/cms_form/models/cms_search_form.py
+++ b/cms_form/models/cms_search_form.py
@@ -73,9 +73,9 @@ def form_update_fields_attributes(self, _fields):
             field["required"] = False
         return res
 
-    def form_get_widget_model(self, fname, field):
+    def _form_get_default_widget_model(self, fname, field):
         """Search via related field needs a simple char widget."""
-        res = super().form_get_widget_model(fname, field)
+        res = super()._form_get_default_widget_model(fname, field)
         if fname in self.form_search_domain_rules:
             res = "cms.form.widget.char"
         return res
diff --git a/cms_form/tests/fake_models/fake_fields_form.py b/cms_form/tests/fake_models/fake_fields_form.py
index 61fd6bfe..4f90be4a 100644
--- a/cms_form/tests/fake_models/fake_fields_form.py
+++ b/cms_form/tests/fake_models/fake_fields_form.py
@@ -4,6 +4,12 @@
 from odoo import fields, models
 
 
+class FakeFloatWidget(models.AbstractModel):
+
+    _name = "cms.form.test_fields.widget.float"
+    _inherit = "cms.form.widget.float"
+
+
 class FakeFieldsForm(models.AbstractModel):
     """A test model form."""
 
@@ -38,3 +44,14 @@ def _form_validate_a_float(self, value, **request_values):
     def _form_validate_char(self, value, **request_values):
         """Specific validator for all `char` fields."""
         return not len(value) > 8, "Text length must be greater than 8!"
+
+
+class FakeFieldsForm2(models.AbstractModel):
+    """A test model form."""
+
+    _name = "cms.form.test_fields2"
+    _inherit = "cms.form.test_fields"
+
+    a_float_with_another_widget = fields.Float(
+        form_widget={"model": FakeFloatWidget._name}
+    )
diff --git a/cms_form/tests/fake_models/fake_search_partner_form.py b/cms_form/tests/fake_models/fake_search_partner_form.py
index c56c7aff..62ca0e74 100644
--- a/cms_form/tests/fake_models/fake_search_partner_form.py
+++ b/cms_form/tests/fake_models/fake_search_partner_form.py
@@ -47,9 +47,7 @@ class FakeSearchPartnerFormMulti(models.AbstractModel):
     _description = "CMS Form test partner search multi form"
 
     form_search_fields_multi = Serialized(default=("country_id",))
-
-    @property
-    def form_widgets(self):
-        res = super().form_widgets
-        res.update({"country_id": "cms.form.widget.many2one.multi"})
-        return res
+    country_id = fields.Many2one(
+        comodel_name="res.country",
+        form_widget={"model": "cms.form.widget.many2one.multi"},
+    )
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index 9cc0a0e0..617e2fb2 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -14,13 +14,23 @@
 class TestFormBase(FormTestCase):
     @staticmethod
     def _get_test_models():
-        from .fake_models.fake_fields_form import FakeFieldsForm
+        from .fake_models.fake_fields_form import (
+            FakeFieldsForm,
+            FakeFieldsForm2,
+            FakeFloatWidget,
+        )
         from .fake_models.fake_partner_form import FakePartnerForm
         from .fake_models.fake_partner_form_protected_fields import (
             FakePartnerFormProtectedFields,
         )
 
-        return (FakeFieldsForm, FakePartnerForm, FakePartnerFormProtectedFields)
+        return (
+            FakeFieldsForm,
+            FakeFieldsForm2,
+            FakeFloatWidget,
+            FakePartnerForm,
+            FakePartnerFormProtectedFields,
+        )
 
     def test_form_init(self):
         form = self.get_form("cms.form.mixin")
@@ -500,7 +510,7 @@ def test_form_process_POST(self):
             )
 
     def test_get_widget(self):
-        form = self.get_form("cms.form.test_fields")
+        form = self.get_form("cms.form.test_fields2")
         expected = {
             "a_char": "cms.form.widget.char",
             "a_number": "cms.form.widget.integer",
@@ -508,12 +518,10 @@ def test_get_widget(self):
             "a_many2one": "cms.form.widget.many2one",
             "a_many2many": "cms.form.widget.many2many",
             "a_one2many": "cms.form.widget.one2many",
+            "a_float_with_another_widget": self.FakeFloatWidget._name,
         }
         fields = form.form_fields_get()
         for fname, widget_model in expected.items():
-            self.assertEqual(
-                widget_model, form.form_get_widget_model(fname, fields[fname])
-            )
             self.assertEqual(
                 form.form_get_widget(fname, fields[fname]).__class__,
                 self.env[widget_model].__class__,
diff --git a/cms_form/tests/widgets/common.py b/cms_form/tests/widgets/common.py
index ce70f9da..f20a4d96 100644
--- a/cms_form/tests/widgets/common.py
+++ b/cms_form/tests/widgets/common.py
@@ -48,7 +48,7 @@ def get_widget(env, fname, field, form=None, widget_model=None, **kw):
     if not form:
         form = fake_form()
     if not widget_model:
-        widget_model = form.form_get_widget_model(fname, field)
+        widget_model = form._form_get_default_widget_model(fname, field)
     return env[widget_model].widget_init(form, fname, field, **kw)
 
 

From cb4b4845c4003b0bf2fff29cd5141ef12fdcc737 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 13 Jul 2023 12:56:11 +0200
Subject: [PATCH 09/69] cms_form: add _form_fields_attributes_get

Centralize lookup for attributes via private api
---
 cms_form/models/cms_form_mixin.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index ea76825d..364e1364 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -283,6 +283,9 @@ def form_fields_get(self, hidden=None):
             return filtered
         return _fields
 
+    def _form_fields_attributes_get(self):
+        return self.form_fields_attributes or []
+
     @tools.cache("self")
     def _form_fields_get(self):
         """Retrieve form fields ready to be used.
@@ -294,20 +297,21 @@ def _form_fields_get(self):
         Blacklisted fields are skipped.
         Whitelisted fields are loaded only.
         """
+        attributes = self._form_fields_attributes_get()
         _all_fields = OrderedDict()
         # load model fields
         _model_fields = {}
         if self.form_model_name:
             _model_fields = self.form_model.fields_get(
                 self.form_model_fields,
-                attributes=self.form_fields_attributes,
+                attributes=attributes,
             )
             # inject defaults
             defaults = self.form_model.default_get(self.form_model_fields)
             for k, v in defaults.items():
                 _model_fields[k]["_default"] = v
         # load form fields
-        _form_fields = self.fields_get(attributes=self.form_fields_attributes)
+        _form_fields = self.fields_get(attributes=attributes)
         # inject defaults
         for k, v in self.default_get(list(_form_fields.keys())).items():
             _form_fields[k]["_default"] = v

From d405d4f1ba9897bb106b30081de26e7b2915b95b Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 13 Jul 2023 12:56:49 +0200
Subject: [PATCH 10/69] cms_form: fix url tests

---
 cms_form/tests/test_form_cms.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cms_form/tests/test_form_cms.py b/cms_form/tests/test_form_cms.py
index c0dac91f..34034f98 100644
--- a/cms_form/tests/test_form_cms.py
+++ b/cms_form/tests/test_form_cms.py
@@ -74,7 +74,9 @@ def test_next_url(self):
         # edit a record: get to its ws URL
         record = self.env["fake.publishable"].create({"name": "Baz"})
         form = self.get_form("cms.form.fake.publishable", main_object=record)
-        self.assertEqual(form.form_next_url(), "/publishable/%d" % record.id)
+        self.assertEqual(
+            form.form_next_url(), "/cms/view/fake.publishable/%d" % record.id
+        )
         # edit a record that has an URL but got redirect in request
         request = fake_request(query_string="redirect=/sorry/go/here")
         form = self.get_form(
@@ -95,7 +97,9 @@ def test_cancel_url(self):
         # edit a record: get to its ws URL
         record = self.env["fake.publishable"].create({"name": "Baz"})
         form = self.get_form("cms.form.fake.publishable", main_object=record)
-        self.assertEqual(form.form_cancel_url(), "/publishable/%d" % record.id)
+        self.assertEqual(
+            form.form_cancel_url(), "/cms/view/fake.publishable/%d" % record.id
+        )
         # edit a record that has an URL but got redirect in request
         request = fake_request(query_string="redirect=/sorry/go/here")
         form = self.get_form(

From 51b806c8aa091b19b2a8381566c5e9ab453631d0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 13 Jul 2023 14:00:19 +0200
Subject: [PATCH 11/69] cms_form: x2m widget defaults to []

---
 cms_form/models/widgets/widget_x2many.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/models/widgets/widget_x2many.py b/cms_form/models/widgets/widget_x2many.py
index 182679aa..79d4087c 100644
--- a/cms_form/models/widgets/widget_x2many.py
+++ b/cms_form/models/widgets/widget_x2many.py
@@ -14,7 +14,7 @@ class X2MWidget(models.AbstractModel):
     _description = "CMS Form X2M widget"
 
     w_template = fields.Char(default="cms_form.field_widget_x2m")
-    w_field_value = Serialized(default=None)
+    w_field_value = Serialized(default=[])
 
     # TODO: rename all widget-specific methods like:
     #    `x2many_to_form` -> `_w_orm_to_form`

From c36d676d9cd766631fa8595fca6cf7449d5efa8e Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 09:20:03 +0200
Subject: [PATCH 12/69] cms_form: add form_fname_pattern

Allows forms to customize the html name of each widget.
Very handy in case you want to combine multiple forms together.
---
 cms_form/models/cms_form_mixin.py             |  2 ++
 cms_form/models/widgets/widget_binary.py      | 10 +++++-----
 cms_form/models/widgets/widget_hidden.py      |  4 ++--
 cms_form/models/widgets/widget_many2one.py    |  2 +-
 cms_form/models/widgets/widget_mixin.py       | 12 +++++++++---
 cms_form/models/widgets/widget_x2many.py      |  2 +-
 cms_form/templates/widgets.xml                | 18 +++++++++---------
 cms_form/tests/widgets/test_widget_base.py    | 14 ++++++++++++++
 cms_form/tests/widgets/test_widget_integer.py |  2 +-
 9 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 364e1364..39216cec 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -154,6 +154,8 @@ class CMSFormMixin(models.AbstractModel):
     form_ajax_onchange = fields.Boolean(form_tech=True, default=False)
     # jQuery selector to find container of search results
     form_content_selector = fields.Char(form_tech=True, default=".form_content")
+    # used to interpolate widgets' html field name
+    form_fname_pattern = fields.Char(form_tech=True, default="")
 
     def _valid_field_parameter(self, field, name):
         res = super()._valid_field_parameter(field, name)
diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index 0b396e36..b9f23a98 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -51,15 +51,15 @@ def w_extract(self, **req_values):
         return self.form_to_binary(value, **req_values)
 
     def form_to_binary(self, value, **req_values):
-        if self.w_fname not in req_values:
+        if self.html_fname not in req_values:
             return None
         _value = False
-        keepcheck_flag = req_values.get(self.w_fname + "_keepcheck")
+        keepcheck_flag = req_values.get(self.html_fname + "_keepcheck")
         if not keepcheck_flag or keepcheck_flag == "yes":
             # no flag or flag marked as "keep current value"
             # prevent discarding image
-            req_values.pop(self.w_fname, None)
-            req_values.pop(self.w_fname + "_keepcheck", None)
+            req_values.pop(self.html_fname, None)
+            req_values.pop(self.html_fname + "_keepcheck", None)
             return None
         if value:
             if hasattr(value, "read"):
@@ -74,7 +74,7 @@ def form_to_binary(self, value, **req_values):
     def w_check_empty_value(self, value, **req_values):
         if isinstance(value, werkzeug.datastructures.FileStorage):
             has_value = bool(value.filename)
-            keep_flag = req_values.get(self.w_fname + "_keepcheck")
+            keep_flag = req_values.get(self.html_fname + "_keepcheck")
             if not has_value and keep_flag == "yes":
                 # no value, but we want to preserve existing one
                 return False
diff --git a/cms_form/models/widgets/widget_hidden.py b/cms_form/models/widgets/widget_hidden.py
index 4f22af4a..a8c9e182 100644
--- a/cms_form/models/widgets/widget_hidden.py
+++ b/cms_form/models/widgets/widget_hidden.py
@@ -12,7 +12,7 @@ class HiddenWidget(models.AbstractModel):
     w_template = fields.Char(default="cms_form.field_widget_hidden")
 
     @property
-    def w_html_fname(self):
+    def html_fname(self):
         """Field name for final HTML markup."""
         # TODO: use this for all fields and get rid of custom w_extract
         # where possible
@@ -28,4 +28,4 @@ def w_html_fname(self):
                 marshaller = ":int"
             elif isinstance(first_value, float):
                 marshaller = ":float"
-        return self.w_fname + marshaller
+        return super().html_fname + marshaller
diff --git a/cms_form/models/widgets/widget_many2one.py b/cms_form/models/widgets/widget_many2one.py
index 62161ed1..621edbf6 100644
--- a/cms_form/models/widgets/widget_many2one.py
+++ b/cms_form/models/widgets/widget_many2one.py
@@ -61,7 +61,7 @@ class M2OMultiWidget(models.AbstractModel):
     def m2o_to_form(self, value, **req_values):
         if not value:
             return json.dumps([])
-        if isinstance(value, str) and value == req_values.get(self.w_fname):
+        if isinstance(value, str) and value == req_values.get(self.html_fname):
             value = self.w_comodel.browse(
                 # TODO: we should allow customizations of fields to read
                 self.w_ids_from_input(value)
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index aa6d8ed0..d0cf5e09 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -29,13 +29,19 @@ class Widget(models.AbstractModel):
     w_field_value = fields.Char(default="")
     w_data = Serialized(default={})
 
+    @property
+    def html_fname(self):
+        if self.w_form.form_fname_pattern:
+            return self.w_form.form_fname_pattern.format(widget=self)
+        return self.w_fname
+
     def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
         vals = {
             "w_form": form,
             "w_record": form.main_object,
-            "w_fname": fname,
             "w_field": field,
             "w_field_value": form.form_render_values.get("form_data", {}).get(fname),
+            "w_fname": fname,
             "w_data": data or {},
             "w_subfields": subfields or field.get("subfields", {}),
         }
@@ -63,12 +69,12 @@ def w_load(self, **req_values):
         if self.w_record and self.w_fname in self.w_record:
             value = self.w_record[self.w_fname] or value
         # maybe a POST request with new values: override item value
-        value = req_values.get(self.w_fname, value)
+        value = req_values.get(self.html_fname, value)
         return value
 
     def w_extract(self, **req_values):
         """Extract value from form submit."""
-        return req_values.get(self.w_fname)
+        return req_values.get(self.html_fname)
 
     def w_check_empty_value(self, value, **req_values):
         # `None` values are meant to be ignored as not changed
diff --git a/cms_form/models/widgets/widget_x2many.py b/cms_form/models/widgets/widget_x2many.py
index 79d4087c..f665adbb 100644
--- a/cms_form/models/widgets/widget_x2many.py
+++ b/cms_form/models/widgets/widget_x2many.py
@@ -42,7 +42,7 @@ def x2many_to_form(self, value, **req_values):
             ids = value.ids
         elif isinstance(value, str):
             ids = self.w_ids_from_input(value)
-        req_val = self.w_ids_from_input(req_values.get(self.w_fname, ""))
+        req_val = self.w_ids_from_input(req_values.get(self.html_fname, ""))
         if req_val:
             # request value take precedence
             ids = req_val[:]
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index f519ed21..5ef2cf10 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -9,7 +9,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             type="text"
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-id="widget.w_fname"
-            t-att-name="widget.w_fname"
+            t-att-name="widget.html_fname"
             t-att-value="widget.w_field_value"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
@@ -21,7 +21,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             type="hidden"
             t-attf-class="#{widget.w_css_klass}"
             t-att-id="widget.w_fname"
-            t-att-name="widget.w_html_fname"
+            t-att-name="widget.html_fname"
             t-att-value="widget.w_field_value"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
@@ -31,7 +31,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         <select
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-id="widget.w_fname"
-            t-att-name="widget.w_fname"
+            t-att-name="widget.html_fname"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
         >
@@ -74,7 +74,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                     <label t-attf-for="#{widget.w_fname}_#{opt_item_index}">
                         <input
                             type="radio"
-                            t-att-name="widget.w_fname"
+                            t-att-name="widget.html_fname"
                             t-attf-id="#{widget.w_fname}_#{opt_item_index}"
                             t-att-value="opt_item['value']"
                             t-att-checked="'checked' if opt_item['value'] == widget.w_field_value else None"
@@ -101,7 +101,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         <input
             type="text"
             t-att-id="widget.w_fname"
-            t-att-name="widget.w_fname"
+            t-att-name="widget.html_fname"
             t-attf-class="form-control js_select2_m2m_widget #{widget.w_css_klass}"
             t-attf-data-init-value="#{widget.w_field_value}"
             t-att-value="widget.w_field_value or widget.w_fname"
@@ -138,7 +138,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             <!-- This will hold server-side value -->
             <input
                 type="hidden"
-                t-att-name="widget.w_fname"
+                t-att-name="widget.html_fname"
                 t-att-id="widget.w_fname"
                 t-att-value="widget.w_field_value"
             />
@@ -153,7 +153,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
     otherwise the whole text area is not rendered at all when value is empty.
     -->
         <textarea
-            t-att-name="widget.w_fname"
+            t-att-name="widget.html_fname"
             t-att-id="widget.w_fname"
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-required="widget.w_field['required'] and '1' or None"
@@ -176,7 +176,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
     <template id="field_widget_boolean" name="CMS form boolean field widget">
         <input
             type="checkbox"
-            t-att-name="widget.w_fname"
+            t-att-name="widget.html_fname"
             t-att-id="widget.w_fname"
             t-att-checked="'checked' if widget.w_field_value else None"
             t-attf-class="form-control #{widget.w_css_klass}"
@@ -190,7 +190,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 capture="camera"
                 accept="image/*"
                 t-att-id="widget.w_fname"
-                t-att-name="widget.w_fname"
+                t-att-name="widget.html_fname"
                 class="form-control"
             />
             <t t-if="widget.w_field_value">
diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index 620a5a43..b59f2e43 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -81,3 +81,17 @@ def test_subfields_get(self):
         fields = form.form_fields_get()
         widget = self.get_widget("name", fields["name"], form=form)
         self.assertEqual(widget.w_subfields_by_value(), {"custom": fields["custom"]})
+
+    def test_html_name(self):
+        form = get_form(self.env, "cms.form.res.partner")
+        for fname, field in form.form_fields_get().items():
+            widget = self.get_widget(fname, field, form=form)
+            self.assertEqual(widget.html_fname, fname)
+        form = get_form(
+            self.env,
+            "cms.form.res.partner",
+            form_fname_pattern="pre_{widget.w_fname}_post",
+        )
+        for fname, field in form.form_fields_get().items():
+            widget = self.get_widget(fname, field, form=form)
+            self.assertEqual(widget.html_fname, f"pre_{fname}_post")
diff --git a/cms_form/tests/widgets/test_widget_integer.py b/cms_form/tests/widgets/test_widget_integer.py
index 30ad67a8..dbe8b7ba 100644
--- a/cms_form/tests/widgets/test_widget_integer.py
+++ b/cms_form/tests/widgets/test_widget_integer.py
@@ -7,7 +7,7 @@ class TestWidgetInteger(TestWidgetCase):
 
     # TODO: test extraction and conversion to proper field value
     # on EVERY widget and not just rely on the marshallers.
-    # Of course we have to switch to `w_html_fname` approach as hidden widget.
+    # Of course we have to switch to `html_fname` approach as hidden widget.
     # This implies that we test w/ a full request too.
 
     def setUp(self):

From 655dddca5a0d1136a914c55d8eacc678f65de1a4 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 09:21:02 +0200
Subject: [PATCH 13/69] cms_form: improve tests.utils.fake_form

---
 cms_form/tests/widgets/common.py                | 13 ++++++-------
 cms_form/tests/widgets/test_widget_binary.py    |  1 -
 cms_form/tests/widgets/test_widget_boolean.py   |  2 +-
 cms_form/tests/widgets/test_widget_date.py      |  2 +-
 cms_form/tests/widgets/test_widget_float.py     |  2 +-
 cms_form/tests/widgets/test_widget_hidden.py    |  8 ++++----
 cms_form/tests/widgets/test_widget_integer.py   |  2 +-
 cms_form/tests/widgets/test_widget_many2one.py  |  5 ++++-
 cms_form/tests/widgets/test_widget_radio.py     |  1 +
 cms_form/tests/widgets/test_widget_selection.py |  1 +
 cms_form/tests/widgets/test_widget_text.py      |  8 ++++----
 cms_form/tests/widgets/test_widget_x2many.py    |  7 ++++++-
 12 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/cms_form/tests/widgets/common.py b/cms_form/tests/widgets/common.py
index f20a4d96..4f97b2f9 100644
--- a/cms_form/tests/widgets/common.py
+++ b/cms_form/tests/widgets/common.py
@@ -1,21 +1,20 @@
 # Copyright 2018 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-from unittest import mock
 
 from odoo.tests.common import TransactionCase
 
 from ..common import HTMLRenderMixin
+from ..utils import fake_request
 
 
-def fake_form(main_object=None, **data):
+def fake_form(env, main_object=None, **data):
     """Get a mocked fake form.
 
     :param data: kw args for setting form values
     """
-    form = mock.MagicMock(name="FakeForm")
-    form_values = mock.PropertyMock(return_value={"form_data": data})
-    type(form).form_render_values = form_values
-    form.main_object = main_object
+    form = env["cms.form"].form_init(
+        fake_request(), main_object=main_object, form_data=data
+    )
     return form
 
 
@@ -46,7 +45,7 @@ def get_widget(env, fname, field, form=None, widget_model=None, **kw):
     """
     assert form or widget_model
     if not form:
-        form = fake_form()
+        form = fake_form(env)
     if not widget_model:
         widget_model = form._form_get_default_widget_model(fname, field)
     return env[widget_model].widget_init(form, fname, field, **kw)
diff --git a/cms_form/tests/widgets/test_widget_binary.py b/cms_form/tests/widgets/test_widget_binary.py
index c11a6666..85227b3c 100644
--- a/cms_form/tests/widgets/test_widget_binary.py
+++ b/cms_form/tests/widgets/test_widget_binary.py
@@ -45,7 +45,6 @@ class TestWidgetBinary(TestWidgetCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.partner = cls.env["res.partner"].search([], limit=1)
-        cls.form = fake_form(main_object=cls.partner)
         cls.maxDiff = None
 
     # TODO: we have only an image widget ATM -> add a file widget and test it
diff --git a/cms_form/tests/widgets/test_widget_boolean.py b/cms_form/tests/widgets/test_widget_boolean.py
index d26567e1..1da033de 100644
--- a/cms_form/tests/widgets/test_widget_boolean.py
+++ b/cms_form/tests/widgets/test_widget_boolean.py
@@ -6,7 +6,7 @@
 class TestWidgetBoolean(TestWidgetCase):
     def _get_widget(self, field_value=False):
         """Initialize form w/ given value and return the widget."""
-        form = fake_form(a_boolean_field=field_value)
+        form = fake_form(self.env, a_boolean_field=field_value)
         w_name, w_field = fake_field(
             "a_boolean_field",
             type="boolean",
diff --git a/cms_form/tests/widgets/test_widget_date.py b/cms_form/tests/widgets/test_widget_date.py
index 3389d407..4c8dd237 100644
--- a/cms_form/tests/widgets/test_widget_date.py
+++ b/cms_form/tests/widgets/test_widget_date.py
@@ -8,7 +8,7 @@
 class TestWidgetDate(TestWidgetCase):
     def setUp(self):
         super().setUp()
-        self.form = fake_form(a_date_field="2019-01-12", type="date")
+        self.form = fake_form(self.env, a_date_field="2019-01-12", type="date")
         self.w_name, self.w_field = fake_field("a_date_field")
         self.widget = self.get_widget(
             self.w_name,
diff --git a/cms_form/tests/widgets/test_widget_float.py b/cms_form/tests/widgets/test_widget_float.py
index 4d5a24a8..4426f52c 100644
--- a/cms_form/tests/widgets/test_widget_float.py
+++ b/cms_form/tests/widgets/test_widget_float.py
@@ -6,7 +6,7 @@
 class TestWidgetFloat(TestWidgetCase):
     def setUp(self):
         super().setUp()
-        form = fake_form(a_float_field=2.0)
+        form = fake_form(self.env, a_float_field=2.0)
         self.w_name, self.w_field = fake_field("a_float_field", type="float")
         self.widget = self.get_widget(
             self.w_name,
diff --git a/cms_form/tests/widgets/test_widget_hidden.py b/cms_form/tests/widgets/test_widget_hidden.py
index 36d3c7d7..160af936 100644
--- a/cms_form/tests/widgets/test_widget_hidden.py
+++ b/cms_form/tests/widgets/test_widget_hidden.py
@@ -4,10 +4,10 @@
 
 
 class TestWidgetHidden(TestWidgetCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.form = fake_form(
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(
+            self.env,
             # fake defaults
             char_field="abc",
             int_field=5,
diff --git a/cms_form/tests/widgets/test_widget_integer.py b/cms_form/tests/widgets/test_widget_integer.py
index dbe8b7ba..0deddf1b 100644
--- a/cms_form/tests/widgets/test_widget_integer.py
+++ b/cms_form/tests/widgets/test_widget_integer.py
@@ -12,7 +12,7 @@ class TestWidgetInteger(TestWidgetCase):
 
     def setUp(self):
         super().setUp()
-        form = fake_form(an_int_field=10)
+        form = fake_form(self.env, an_int_field=10)
         self.w_name, self.w_field = fake_field("an_int_field", type="integer")
         self.widget = self.get_widget(
             self.w_name,
diff --git a/cms_form/tests/widgets/test_widget_many2one.py b/cms_form/tests/widgets/test_widget_many2one.py
index bd45a78f..fed38f01 100644
--- a/cms_form/tests/widgets/test_widget_many2one.py
+++ b/cms_form/tests/widgets/test_widget_many2one.py
@@ -10,7 +10,10 @@ class TestWidgetM2O(TestWidgetCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.partners = cls.env["res.partner"].search([], limit=4)
-        cls.form = fake_form(
+
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(self.env,
             # fake defaults
             m2o_field=cls.partners.ids[0],
         )
diff --git a/cms_form/tests/widgets/test_widget_radio.py b/cms_form/tests/widgets/test_widget_radio.py
index fd408786..b2fc3b44 100644
--- a/cms_form/tests/widgets/test_widget_radio.py
+++ b/cms_form/tests/widgets/test_widget_radio.py
@@ -8,6 +8,7 @@ class TestWidgetRadio(TestWidgetCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.form = fake_form(
+            cls.env,
             # fake defaults
             radio_field="opt2",
         )
diff --git a/cms_form/tests/widgets/test_widget_selection.py b/cms_form/tests/widgets/test_widget_selection.py
index a8464e4d..d427f096 100644
--- a/cms_form/tests/widgets/test_widget_selection.py
+++ b/cms_form/tests/widgets/test_widget_selection.py
@@ -7,6 +7,7 @@ class TestWidgetSelection(TestWidgetCase):
     def setUp(self):
         super().setUp()
         self.form = fake_form(
+            self.env,
             # fake defaults
             selection_char_field="opt1",
             selection_integer_field=2,
diff --git a/cms_form/tests/widgets/test_widget_text.py b/cms_form/tests/widgets/test_widget_text.py
index ad36bedc..15335d67 100644
--- a/cms_form/tests/widgets/test_widget_text.py
+++ b/cms_form/tests/widgets/test_widget_text.py
@@ -9,10 +9,10 @@
 
 
 class TestWidgetTxt(TestWidgetCase):
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.form = fake_form(
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(
+            self.env,
             a_char_field="Just a string",
             a_text_field=TXT,
         )
diff --git a/cms_form/tests/widgets/test_widget_x2many.py b/cms_form/tests/widgets/test_widget_x2many.py
index 998bd5a5..99e065dd 100644
--- a/cms_form/tests/widgets/test_widget_x2many.py
+++ b/cms_form/tests/widgets/test_widget_x2many.py
@@ -10,7 +10,11 @@ class TestWidgetX2M(TestWidgetCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.partners = cls.env["res.partner"].search([], limit=4)
-        cls.form = fake_form(
+
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(
+            self.env,
             # fake defaults
             # behavior of o2m or m2m ATM is the same
             m2m_field=cls.partners.ids[0:2],
@@ -79,6 +83,7 @@ def test_widget_x2many_base_load_from_record(self):
         categs = self.env["res.partner.category"].search([], limit=3)
         partner = self.partners[0]
         form = fake_form(
+            self.env,
             # category_id=categs,
             main_object=partner,
         )

From 52ee0e613cd68ae2485ce3b7373e429c8d62820a Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 09:41:47 +0200
Subject: [PATCH 14/69] cms_form: add some todos

---
 cms_form/models/cms_form_mixin.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 39216cec..865dc4b2 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -476,6 +476,8 @@ def form_get_request_values(self):
         res.update({k: v for k, v in self.request.files.items()})
         return res
 
+    # TODO: rename to form_load
+    # TODO: adapt signature to form_extract (eg: kw args)
     def form_load_defaults(self, main_object=None, request_values=None):
         """Load default values.
 
@@ -514,6 +516,7 @@ def form_get_loader(self, fname, field, main_object=None, value=None, **req_valu
         loader = getattr(self, "_form_load_" + fname, loader)
         return loader
 
+    # TODO: rename to form_extract
     def form_extract_values(self, **request_values):
         """Extract values from request form."""
         request_values = request_values or self.form_get_request_values()

From 6e6e2e07f2ff49bc35a525482930457fe33cc0c9 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 12:17:00 +0200
Subject: [PATCH 15/69] cms_form: refactor marshaller as class

---
 cms_form/marshallers.py | 214 ++++++++++++++++++++++------------------
 cms_form/utils.py       |   6 +-
 2 files changed, 120 insertions(+), 100 deletions(-)

diff --git a/cms_form/marshallers.py b/cms_form/marshallers.py
index 3a8f8d4b..c6d163ab 100644
--- a/cms_form/marshallers.py
+++ b/cms_form/marshallers.py
@@ -2,6 +2,11 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
 import html
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import Any
+
+from . import utils
 
 
 def marshal_request_values(values):
@@ -16,101 +21,116 @@ def marshal_request_values(values):
     """
     # TODO: add docs
     # TODO: support combinations like `:list:int` or `:dict:int`
-    res = {}
-    for k, v in values.items():
-        if k in ("csrf_token",):
-            continue
-        if k.endswith(":esc"):
-            k, v = marshal_esc(values, k, v)
-            res[k] = v
-            continue
-        # fields w/ multiple values
-        if k.endswith(":list"):
-            k, v = marshal_list(values, k, v)
-            res[k] = v
-            continue
-        if k.endswith(":dict"):
-            k, v = marshal_dict(values, k, v)
+    return Marshaller(values).marshall()
+
+
+@dataclass
+class Todo:
+    okey: str
+    oval: Any
+    handlers: list[Callable]
+
+
+class Marshaller:
+    def __init__(self, req_values):
+        self.req_values = req_values
+        self.todos = []
+        self.skip_keys = {"csrf_token"}
+        self._collect_todo()
+
+    def _add_todo(self, orig_key, orig_value, *handlers):
+        self.todos.append(Todo(okey=orig_key, oval=orig_value, handlers=handlers))
+
+    def _collect_todo(self):
+        for k, v in self.req_values.items():
+            if k in self.skip_keys:
+                continue
+            for operator, handler in self._marshallers():
+                if k.endswith(operator):
+                    self._add_todo(k, v, handler)
+                    continue
+            # plain
+            self._add_todo(k, v, self.marshal_plain)
+
+    def _marshallers(self):
+        return (
+            (":esc", self.marshal_esc),
+            (":list", self.marshal_list),
+            (":dict", self.marshal_dict),
+            (":int", self.marshal_int),
+            (":float", self.marshal_float),
+        )
+
+    def marshall(self):
+        res = {}
+        for todo in self.todos:
+            k, v = todo.okey, todo.oval
+            for handler in todo.handlers:
+                k, v = handler(k, v)
             res[k] = v
-            continue
-        if k.endswith(":int"):
-            k, v = marshal_int(values, k, v)
-            res[k] = v
-            continue
-        if k.endswith(":float"):
-            k, v = marshal_float(values, k, v)
-            res[k] = v
-            continue
-        res[k] = v
-    return res
-
-
-def marshal_esc(values, orig_key, orig_value):
-    """Transform `foo:esc` inputs to escaped value."""
-    k = orig_key[: -len(":esc")]
-    v = html.escape(orig_value)
-    return k, v
-
-
-def marshal_list(values, orig_key, orig_value):
-    """Transform `foo:list` inputs to list of values."""
-    k = orig_key[: -len(":list")]
-    v = values.getlist(orig_key)
-    return k, v
-
-
-def marshal_int(values, orig_key, orig_value):
-    """Transform `foo:int` inputs to integer values."""
-    k = orig_key[: -len(":int")]
-    v = int(orig_value) if orig_value and orig_value.isdigit() else orig_value
-    return k, v
-
-
-def marshal_float(values, orig_key, orig_value):
-    """Transform `foo:float` inputs to float values."""
-    k = orig_key[: -len(":float")]
-    try:
-        v = float(orig_value.replace(",", "."))
-    except (ValueError, TypeError):
-        v = orig_value
-    return k, v
-
-
-def marshal_dict(values, orig_key, orig_value):
-    """Transform `foo:dict` inputs to dictionary values.
-
-    `orig_key` must be formatted like:
-
-        `$fname.$dict_key:dict`
-
-    Every request key matching `$fname` prefix
-    will be merged into a dict whereas keys will match all `$dict_key`.
-
-    Example:
-
-        values = [
-            ('foo.a:dict', '1'),
-            ('foo.b:dict', '2'),
-            ('foo.c:dict', '3'),
-        ]
-
-        will be translated to:
-
-        values['foo'] = {
-            'a': '1',
-            'b': '2',
-            'c': '3',
-        }
-
-    """
-    res = {}
-    key = orig_key.split(".")[0]
-    for _k, _v in values.items():
-        # get all the keys matching fname
-        if not _k.startswith(key):
-            continue
-        # TODO: `__` will be to support extra marshallers, like:
-        # foo.1:dict:int -> get a dictionary w/ integer values
-        full_key, _, __ = _k.partition(":dict")
-        res[full_key.split(".")[-1]] = _v
-    return key, res
+        return res
+
+    def marshal_plain(self, orig_key, orig_value):
+        """No transform."""
+        return orig_key, orig_value
+
+    def marshal_esc(self, orig_key, orig_value):
+        """Transform `foo:esc` inputs to escaped value."""
+        k = orig_key[: -len(":esc")]
+        v = html.escape(orig_value)
+        return k, v
+
+    def marshal_list(self, orig_key, orig_value):
+        """Transform `foo:list` inputs to list of values."""
+        k = orig_key[: -len(":list")]
+        v = self.req_values.getlist(orig_key)
+        return k, v
+
+    def marshal_int(self, orig_key, orig_value):
+        """Transform `foo:int` inputs to integer values."""
+        k = orig_key[: -len(":int")]
+        return k, utils.safe_to_integer(orig_value)
+
+    def marshal_float(self, orig_key, orig_value):
+        """Transform `foo:float` inputs to float values."""
+        k = orig_key[: -len(":float")]
+        return k, utils.safe_to_float(orig_value)
+
+    def marshal_dict(self, orig_key, orig_value):
+        """Transform `foo:dict` inputs to dictionary values.
+
+        `orig_key` must be formatted like:
+
+            `$fname.$dict_key:dict`
+
+        Every request key matching `$fname` prefix
+        will be merged into a dict whereas keys will match all `$dict_key`.
+
+        Example:
+
+            values = [
+                ('foo.a:dict', '1'),
+                ('foo.b:dict', '2'),
+                ('foo.c:dict', '3'),
+            ]
+
+            will be translated to:
+
+            values['foo'] = {
+                'a': '1',
+                'b': '2',
+                'c': '3',
+            }
+
+        """
+        res = {}
+        key = orig_key.split(".")[0]
+        for _k, _v in self.req_values.items():
+            # get all the keys matching fname
+            if not _k.startswith(key):
+                continue
+            # TODO: `__` will be to support extra marshallers, like:
+            # foo.1:dict:int -> get a dictionary w/ integer values
+            full_key, _, __ = _k.partition(":dict")
+            res[full_key.split(".")[-1]] = _v
+        return key, res
diff --git a/cms_form/utils.py b/cms_form/utils.py
index 5d013cb1..be13276f 100644
--- a/cms_form/utils.py
+++ b/cms_form/utils.py
@@ -6,14 +6,14 @@ def safe_to_integer(value, **kw):
     """Convert to integer safely."""
     try:
         return int(value)
-    except (ValueError, TypeError):
+    except (ValueError, TypeError, AttributeError):
         return None
 
 
 def safe_to_float(value, **kw):
     try:
-        return float(value)
-    except (ValueError, TypeError):
+        return float(value.replace(",", "."))
+    except (ValueError, TypeError, AttributeError):
         return None
 
 

From e808041a67e7dbb904c9c226aed17551bd930274 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:04:52 +0200
Subject: [PATCH 16/69] cms_form: add :dict:list marshaller

Transform  inputs to list of dict values
---
 cms_form/marshallers.py            | 60 ++++++++++++++++++++++++++++++
 cms_form/tests/test_marshallers.py | 28 ++++++++++++++
 2 files changed, 88 insertions(+)

diff --git a/cms_form/marshallers.py b/cms_form/marshallers.py
index c6d163ab..1c107199 100644
--- a/cms_form/marshallers.py
+++ b/cms_form/marshallers.py
@@ -55,6 +55,7 @@ def _collect_todo(self):
     def _marshallers(self):
         return (
             (":esc", self.marshal_esc),
+            (":dict:list", self.marshal_dict_list),
             (":list", self.marshal_list),
             (":dict", self.marshal_dict),
             (":int", self.marshal_int),
@@ -134,3 +135,62 @@ def marshal_dict(self, orig_key, orig_value):
             full_key, _, __ = _k.partition(":dict")
             res[full_key.split(".")[-1]] = _v
         return key, res
+
+    def marshal_dict_list(self, orig_key, orig_value):
+        """Transform `foo:dict:list` inputs to list of dict values.
+
+        `orig_key` must be formatted like:
+
+            `$fname.$index.$dict_key:dict:list`
+
+        Every request key matching `$fname` prefix
+        will be merged into a list of dicts whereas keys will match all `$dict_key`
+        and the position in the list will match $index.
+
+        Example:
+
+            values = [
+                ("b.1.x:dict:list", "b1x"),
+                ("b.1.y:dict:list", "b1y"),
+                ("b.2.x:dict:list", "b2x"),
+                ("b.2.y:dict:list", "b2y"),
+            ]
+
+            will be translated to:
+
+            values['b'] = [
+                {
+                    'x': 'b1x',
+                    'y': 'b1y',
+                },
+                {
+                    'x': 'b2x',
+                    'y': 'b2y',
+                },
+            }
+
+        """
+        res = []
+
+        def parse_key(key):
+            main_key, index, inner_key = key[: -len(":dict:list")].split(".")
+            if not index.isdigit():
+                raise ValueError(":dict:list requires an integer index")
+            return main_key, int(index), inner_key
+
+        main_key, index, inner_key = parse_key(orig_key)
+        by_index = {}
+        for _k, _v in self.req_values.items():
+            # get all the keys matching fname
+            if not _k.startswith(f"{main_key}."):
+                continue
+            self.skip_keys.add(_k)
+            __, index, inner_key = parse_key(_k)
+            by_index.setdefault(index, []).append((inner_key, _v))
+        #  by_index = {0: [(x, xv), (y, yv)]}
+        for __, values in sorted(by_index.items()):
+            item = {}
+            for inner_key, value in values:
+                item[inner_key] = value
+            res.append(item)
+        return main_key, res
diff --git a/cms_form/tests/test_marshallers.py b/cms_form/tests/test_marshallers.py
index 8be49005..6ab6fbce 100644
--- a/cms_form/tests/test_marshallers.py
+++ b/cms_form/tests/test_marshallers.py
@@ -80,3 +80,31 @@ def test_marshal_esc(self):
         marshalled = marshallers.marshal_request_values(data)
         self.assertEqual(marshalled["a"], "&lt;span&gt;I&#x27;m bad&lt;/span&gt;")
         self.assertEqual(marshalled["b"], "<span>I'm bad but I don't care</span>")
+
+    def test_marshal_dict_list(self):
+        data = MultiDict(
+            [
+                ("a", "1"),
+                ("b.1.x:dict:list", "b1x"),
+                ("b.1.y:dict:list", "b1y"),
+                ("b.1.z:dict:list", "b1z"),
+                ("b.2.x:dict:list", "b2x"),
+                ("b.2.y:dict:list", "b2y"),
+                ("b.2.z:dict:list", "b2z"),
+                ("b.3.x:dict:list", "b3x"),
+                ("b.3.y:dict:list", "b3y"),
+                ("b.3.z:dict:list", "b3z"),
+                ("c", "3"),
+            ]
+        )
+        marshalled = marshallers.marshal_request_values(data)
+        self.assertEqual(marshalled["a"], "1")
+        self.assertEqual(
+            marshalled["b"],
+            [
+                {"x": "b1x", "y": "b1y", "z": "b1z"},
+                {"x": "b2x", "y": "b2y", "z": "b2z"},
+                {"x": "b3x", "y": "b3y", "z": "b3z"},
+            ],
+        )
+        self.assertEqual(marshalled["c"], "3")

From 1acd7a30e55da753051cf17ceaf2943997e3a4a8 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:05:26 +0200
Subject: [PATCH 17/69] cms_form: fix/imp request test utils

---
 cms_form/tests/test_form_cms.py | 10 +++++---
 cms_form/tests/utils.py         | 41 ++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/cms_form/tests/test_form_cms.py b/cms_form/tests/test_form_cms.py
index 34034f98..8e09a990 100644
--- a/cms_form/tests/test_form_cms.py
+++ b/cms_form/tests/test_form_cms.py
@@ -7,7 +7,7 @@
 from odoo.tools import mute_logger
 
 from .common import FormTestCase
-from .utils import fake_request
+from .utils import fake_request, mock_request
 
 
 class TestCMSForm(FormTestCase):
@@ -175,7 +175,9 @@ def test_create_or_update(self):
     def test_create_or_update_with_errors(self):
         request = fake_request(form_data={}, method="POST")
         form = self.get_form("cms.form.res.partner", req=request)
-        with mute_logger("odoo.sql_db"):
+        with mute_logger("odoo.sql_db"), mock_request(
+            self.env, httprequest=request.httprequest
+        ):
             values = form.form_process_POST({})
         self.assertFalse(form.form_success)
         self.assertTrue(
@@ -183,7 +185,9 @@ def test_create_or_update_with_errors(self):
             "_integrity" in values["errors"]
             or "_validation" in values["errors"]
         )
-        with mock.patch.object(type(form), "form_create_or_update") as mocked:
+        with mock.patch.object(
+            type(form), "form_create_or_update"
+        ) as mocked, mock_request(self.env, httprequest=request.httprequest):
             random_msg = (
                 "Error while validating constraint\n"
                 "\nEnd Date cannot be set before Start Date.\nNone"
diff --git a/cms_form/tests/utils.py b/cms_form/tests/utils.py
index b87c62d9..4a71cfcc 100644
--- a/cms_form/tests/utils.py
+++ b/cms_form/tests/utils.py
@@ -12,8 +12,11 @@
 
 from odoo import api, http
 from odoo.tests.common import get_db_name
+from odoo.tools import DotDict
 from odoo.tools._vendor.sessions import SessionStore
 
+from odoo.addons.website.tools import MockRequest
+
 
 def fake_request(
     form_data=None,
@@ -34,15 +37,51 @@ def fake_request(
         content_type=content_type,
         method=method,
     )
-    w_req.session = session if session is not None else mock.MagicMock()
     # odoo request
     o_req = http.Request(w_req)
     o_req.csrf_token = mock.MagicMock()
     o_req.httprequest = w_req
+    o_req.session = session if session is not None else mock.MagicMock()
     o_req.__testing__ = True
     return o_req
 
 
+@contextmanager
+def mock_request(
+    env,
+    request=None,
+    httprequest=None,
+    extra_headers=None,
+    request_attrs=None,
+    httprequest_attrs=None,
+    **kw
+):
+    # TODO: refactor this ctx mngr from website to:
+    # - make it independent
+    # - use real request and session as per fake_request above
+    with MockRequest(env, **kw) as mocked_request:
+        if httprequest:
+            if isinstance(httprequest, dict):
+                httprequest = DotDict(httprequest)
+            mocked_request.httprequest = httprequest
+        headers = {}
+        headers.update(extra_headers or {})
+        mocked_request.httprequest.headers = headers
+        request_attrs = request_attrs or {}
+        for k, v in request_attrs.items():
+            setattr(mocked_request, k, v)
+        httprequest_attrs = httprequest_attrs or {}
+        for k in ("args", "form", "files", "_cms_form_files_processed"):
+            if k not in httprequest_attrs:
+                httprequest_attrs[k] = {}
+        for k, v in httprequest_attrs.items():
+            setattr(mocked_request.httprequest, k, v)
+        mocked_request.make_response = lambda data, **kw: data
+        mocked_request.registry._init_modules = set()
+        mocked_request.session.touch = lambda: True
+        yield mocked_request
+
+
 class FakeSessionStore(SessionStore):
     def delete(self, session):
         session.clear()

From a12afbd207e51b3545f12f65a2e01e3f02bb8389 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:06:31 +0200
Subject: [PATCH 18/69] cms_form: fix controllers rendering and tests

---
 cms_form/controllers/main.py       | 12 ++----
 cms_form/tests/test_controllers.py | 61 +++++++++++++++---------------
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/cms_form/controllers/main.py b/cms_form/controllers/main.py
index 4ec8a7f2..f12b782e 100644
--- a/cms_form/controllers/main.py
+++ b/cms_form/controllers/main.py
@@ -21,10 +21,7 @@ def get_template(self, form, **kw):
         Can be overridden straight in the form
         using the attribute `form_wrapper_template`.
         """
-        template = self.template
-
-        if getattr(form, "form_wrapper_template", None):
-            template = form.form_wrapper_template
+        template = form.form_wrapper_template or self.template
 
         if not template:
             raise NotImplementedError("You must provide a template!")
@@ -215,8 +212,5 @@ def ajax(self, model, model_id=None, **kw):
         return self.make_response_ajax(model, **kw)
 
     def _make_response_ajax_content(self, response):
-        return (
-            request.env.ref(response.qcontext["form"].form_search_results_template)
-            .render(response.qcontext)
-            .decode("utf8")
-        )
+        template = response.qcontext["form"].form_search_results_template
+        return request.env["ir.qweb"]._render(template, response.qcontext)
diff --git a/cms_form/tests/test_controllers.py b/cms_form/tests/test_controllers.py
index 428f91bf..631a9272 100644
--- a/cms_form/tests/test_controllers.py
+++ b/cms_form/tests/test_controllers.py
@@ -3,18 +3,15 @@
 
 import os
 import unittest
-from contextlib import contextmanager
-from unittest import mock
 
 from ..controllers import main
-from .common import FormHttpTestCase
-from .utils import fake_request
+from .common import FormHttpTestCase, FormTestCase
+from .utils import fake_request, mock_request
 
 IMPORT = "odoo.addons.cms_form.controllers.main"
 
 
-@unittest.skipIf(os.getenv("SKIP_HTTP_CASE"), "HTTP case disabled.")
-class TestControllers(FormHttpTestCase):
+class TestControllersAPI(FormTestCase):
     @staticmethod
     def _get_test_models():
         from .fake_models.fake_partner_form import FakePartnerForm
@@ -28,27 +25,14 @@ def setUp(self):
         self.form_controller = main.CMSFormController()
         self.form_search_controller = main.CMSSearchFormController()
         self.form_wiz_controller = main.CMSWizardFormController()
-        self.authenticate("admin", "admin")
-
-    @contextmanager
-    def mock_assets(self, req=None):
-        """Mocks some stuff like request."""
-        with mock.patch("%s.request" % IMPORT) as request:
-            faked = req or fake_request()
-            request.session = self.session
-            request.env = self.env
-            request.httprequest = faked.httprequest
-            yield {
-                "request": request,
-            }
 
     def test_get_template(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             form = self.form_controller.get_form("res.partner")
             # default
             self.assertEqual(
                 self.form_controller.get_template(form),
-                "cms_form.form_wrapper",
+                "cms_form.portal_form_wrapper",
             )
             # custom on form
             form.form_wrapper_template = "foo.baz"
@@ -59,7 +43,7 @@ def test_get_template(self):
                 self.form_controller.get_template(form)
 
     def test_get_render_values(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             form = self.form_controller.get_form("res.partner")
             # default, no main object
             self.assertEqual(
@@ -95,47 +79,47 @@ def test_get_render_values(self):
             )
 
     def test_get_no_form(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             # we do not have a specific form for res.groups
             # and cms form is not enabled on partner model
             with self.assertRaises(NotImplementedError):
                 self.form_controller.get_form("res.groups")
 
     def test_get_form_no_model_no_main_object(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             form = self.form_controller.get_form(
                 None, form_model_key=self.FakePartnerForm._name
             )
             self.assertEqual(form.main_object, self.env[self.FakePartnerForm._name])
 
     def test_get_default_form(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             # we have one for res.partner
             form = self.form_controller.get_form("res.partner")
             self.assertTrue(
                 isinstance(form, self.env["cms.form.res.partner"].__class__)
             )
-            self.assertEqual(form.form_model, "res.partner")
+            self.assertEqual(form.form_model_name, "res.partner")
             self.assertEqual(form.form_mode, "create")
 
     def test_get_specific_form(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             # we have a specific form here
             form = self.form_search_controller.get_form("res.partner")
             self.assertTrue(
                 isinstance(form, self.env["cms.form.search.res.partner"].__class__)
             )
-            self.assertEqual(form.form_model, "res.partner")
+            self.assertEqual(form.form_model_name, "res.partner")
             self.assertEqual(form.form_mode, "search")
 
     def test_get_wizard_form(self):
-        with self.mock_assets():
+        with mock_request(self.env):
             # we have a specific form here
             form = self.form_wiz_controller.get_form("res.partner")
             self.assertTrue(
                 isinstance(form, self.env["cms.form.res.partner"].__class__)
             )
-            self.assertEqual(form.form_model, "res.partner")
+            self.assertEqual(form.form_model_name, "res.partner")
             self.assertEqual(form.form_mode, "create")
 
     def test_redirect_after_success(self):
@@ -143,7 +127,7 @@ def test_redirect_after_success(self):
             form_data={"name": "John"},
             method="POST",
         )
-        with self.mock_assets(req=req):
+        with mock_request(self.env, httprequest=req.httprequest):
             partner = self.env.ref("base.res_partner_12")
             response = self.form_controller.make_response(
                 "res.partner", model_id=partner.id
@@ -155,6 +139,21 @@ def test_redirect_after_success(self):
             else:
                 self.assertEqual(response.location, "/")
 
+
+@unittest.skipIf(os.getenv("SKIP_HTTP_CASE"), "HTTP case disabled.")
+class TestControllersRender(FormHttpTestCase):
+    def setUp(self):
+        super().setUp()
+        self.authenticate("admin", "admin")
+
+    @staticmethod
+    def _get_test_models():
+        from .fake_models.fake_partner_form import FakePartnerForm
+        from .fake_models.fake_search_partner_form import FakeSearchPartnerForm
+        from .fake_models.fake_wizard_form import ALL_WIZ_KLASSES
+
+        return ALL_WIZ_KLASSES + [FakePartnerForm, FakeSearchPartnerForm]
+
     def _check_rendering(self, dom, form_model, model, mode, extra_klass=""):
         """Check default markup for form and form wrapper."""
         # test wrapper klass

From 23ba478be7b90581bfbac912e727793acad12305 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:07:11 +0200
Subject: [PATCH 19/69] cms_form: fix usage of t-raw in tmpl

---
 cms_form/models/cms_form_mixin.py |  2 +-
 cms_form/templates/form.xml       | 12 ++++++------
 cms_form/templates/widgets.xml    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 865dc4b2..0d86489d 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -559,7 +559,7 @@ def form_render(self, **kw):
 
         To render the form simply do:
 
-            <t t-raw="form.form_render()" />
+            <t t-out="form.form_render()" />
         """
         values = self.form_render_values.copy()
         values.update(kw)
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index d41565c4..a5c1efd8 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -17,7 +17,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 <t t-if="form.form_description">
                     <p class="form_description" t-esc="form.form_description" />
                 </t>
-                <t t-raw="form.form_render()" />
+                <t t-out="form.form_render()" />
             </div>
         </div>
     </template>
@@ -57,7 +57,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-att-for="fname"
                 t-esc="field['string']"
             >Name</label>
-            <t t-raw="widget.render()" />
+            <t t-out="widget.render()" />
             <t t-if="field.get('help')">
                 <t t-call="cms_form.base_form_field_help_block" />
             </t>
@@ -68,8 +68,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
     </template>
     <template id="base_form_field_help_block" name="CMS form field help block">
         <div class="help-block">
-            <!-- use `raw` to allow injecting html stuff here -->
-            <t t-raw="field['help']" />
+            <!-- use `out` to allow injecting html stuff here -->
+            <t t-out="field['help']" />
         </div>
     </template>
     <template id="base_form_field_error_block" name="CMS form field error block">
@@ -211,9 +211,9 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         inherit_id="cms_form.form_wrapper"
         primary="True"
     >
-        <xpath expr="//t[@t-raw]" position="replace">
+        <xpath expr="//t[@t-out]" position="replace">
             <t t-if="form.form_show_search_form">
-                <t t-raw="form.form_render()" />
+                <t t-out="form.form_render()" />
             </t>
             <div class="form_content">
                 <t t-call="{{ form.form_search_results_template  }}" />
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 5ef2cf10..904fe65d 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -83,12 +83,12 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                         <span t-esc="opt_item['label']" />
                     </label>
                     <t t-if="opt_item.get('help')">
-                        <div class="help-block" t-raw="opt_item.get('help')" />
+                        <div class="help-block" t-out="opt_item.get('help')" />
                     </t>
                     <t t-if="widget.w_options_help.get(opt_item['value'])">
                         <div
                             class="help-block"
-                            t-raw="widget.w_options_help.get(opt_item['value'])"
+                            t-out="widget.w_options_help.get(opt_item['value'])"
                         />
                     </t>
                 </div>

From c70d167a297616af0936632a1094122d12f6a7e9 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:25:18 +0200
Subject: [PATCH 20/69] cms_form: do not break if model has no url field

---
 cms_form/models/cms_form.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index 727220ba..07294be2 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -68,7 +68,7 @@ def form_next_url(self, main_object=None):
             # redirect overridden
             return self.request.args.get("redirect")
         main_object = main_object or self.main_object
-        if main_object and main_object.url:
+        if main_object and "url" in main_object._fields:
             return main_object.url
         return "/"
 
@@ -78,7 +78,7 @@ def form_cancel_url(self, main_object=None):
             # redirect overridden
             return self.request.args.get("redirect")
         main_object = main_object or self.main_object
-        if main_object and main_object.url:
+        if main_object and "url" in main_object._fields:
             return main_object.url
         return self.request.referrer or "/"
 

From 94b70457502353f4bf17cf989dfef35b1a740cf0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:26:09 +0200
Subject: [PATCH 21/69] cms_form: add field for wrapper template

---
 cms_form/models/cms_form_mixin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 0d86489d..989a926c 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -44,6 +44,7 @@ class CMSFormMixin(models.AbstractModel):
         form_tech=True, store=False, compute="_compute_form_render_values"
     )
     # / special fields
+    form_wrapper_template = fields.Char(form_tech=True, default="")
     form_template = fields.Char(form_tech=True, default="cms_form.base_form")
     form_fields_template = fields.Char(
         form_tech=True, default="cms_form.base_form_fields"

From f524dbd74f11407d21db361382a0c3e5f24ae101 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:27:23 +0200
Subject: [PATCH 22/69] cms_form: fix wizard storage

---
 cms_form/models/cms_form_wizard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 6c5acaf7..3e47685d 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -48,7 +48,7 @@ def _wiz_storage_key(self):
 
     @property
     def _wiz_storage(self):
-        return self.request.session
+        return self.o_request.session
 
     def wiz_storage_get(self):
         if not self._wiz_storage.get(self._wiz_storage_key):

From 019e2bec6c04765c47c9df0cc0be15449cd25ef6 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 14 Jul 2023 16:28:57 +0200
Subject: [PATCH 23/69] cms_form: wizard load defaults from storage

---
 cms_form/models/cms_form_wizard.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 3e47685d..575f2134 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -176,3 +176,20 @@ def _prepare_step_values_to_store(self, values, extra_values):
             if fname in values:
                 step_values[fname] = values[fname]
         return step_values
+
+    # TODO: tests
+    def form_load_defaults(self, main_object=None, request_values=None):
+        # Override to load values from the storage
+        defaults = super().form_load_defaults(
+            main_object=main_object, request_values=request_values
+        )
+        request_values = request_values or {}
+        step_values = self.wiz_load_step()
+        if step_values:
+            for fname in self.form_fields_get().keys():
+                if fname in request_values:
+                    # req value has precedence
+                    continue
+                if fname in step_values:
+                    defaults[fname] = step_values[fname]
+        return defaults

From 935d568aac7f57e3d3198fdc00acb47d1a459017 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 18 Jul 2023 16:04:02 +0200
Subject: [PATCH 24/69] cms_form: introduce form_data field

---
 cms_form/models/cms_form_mixin.py          | 5 +++--
 cms_form/models/widgets/widget_mixin.py    | 6 ++++--
 cms_form/tests/test_form_base.py           | 7 ++-----
 cms_form/tests/widgets/test_widget_base.py | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 989a926c..afdb9014 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -43,6 +43,7 @@ class CMSFormMixin(models.AbstractModel):
     form_render_values = fields.Binary(
         form_tech=True, store=False, compute="_compute_form_render_values"
     )
+    form_data = Serialized(form_tech=True, default={})
     # / special fields
     form_wrapper_template = fields.Char(form_tech=True, default="")
     form_template = fields.Char(form_tech=True, default="cms_form.base_form")
@@ -172,7 +173,6 @@ def _get_render_values(self):
             # TODO: default for BInary field is "False" but we need "None"
             "main_object": self.main_object or None,
             "form": self,
-            "form_data": {},
             "errors": {},
             "errors_messages": {},
         }
@@ -205,6 +205,8 @@ def form_init(self, request, main_object=None, **kw):
         form_kw = {k: v for k, v in kw.items() if k in self._fields}
         vals.update(form_kw)
         form = self.new(vals)
+        if "form_data" not in vals:
+            form.form_data = form.form_load_defaults()
         return form
 
     def form_check_permission(self, raise_exception=True):
@@ -582,7 +584,6 @@ def form_process(self, **kw):
         """
         render_values = self.form_render_values
         render_values.update(kw)
-        render_values["form_data"] = self.form_load_defaults()
         handler = getattr(self, "form_process_" + self.request.method.upper())
         self.form_render_values = dict(render_values, **handler(render_values))
 
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index d0cf5e09..2d395ca6 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -40,7 +40,6 @@ def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
             "w_form": form,
             "w_record": form.main_object,
             "w_field": field,
-            "w_field_value": form.form_render_values.get("form_data", {}).get(fname),
             "w_fname": fname,
             "w_data": data or {},
             "w_subfields": subfields or field.get("subfields", {}),
@@ -48,6 +47,9 @@ def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
         for k in ("template", "css_klass"):
             if kw.get(k):
                 vals[f"w_{k}"] = kw[k]
+        field_value = form.form_data.get(fname, kw.get("field_value"))
+        if field_value:
+            vals["w_field_value"] = field_value
         widget = self.new(vals)
         return widget
 
@@ -60,7 +62,7 @@ def w_form_model(self):
 
     @property
     def w_form_values(self):
-        return self.w_form.form_render_values
+        return self.w_form.form_data
 
     def w_load(self, **req_values):
         """Load value for current field in current request."""
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index 617e2fb2..af2fe3e3 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -420,7 +420,6 @@ def test_form_process_GET(self):
             {
                 "main_object": None,
                 "form": form,
-                "form_data": {},
                 "errors": {},
                 "errors_messages": {},
             },
@@ -442,10 +441,10 @@ def test_form_process_GET(self):
                 "a_number": None,
                 "a_one2many": "[]",
             }
+            self.assertEqual(form.form_data, default_form_data)
             expected = {
                 "main_object": None,
                 "form": form,
-                "form_data": default_form_data,
                 "errors": {},
                 "errors_messages": {},
             }
@@ -459,7 +458,6 @@ def test_form_process_GET(self):
                     "extra_key2": "baz",
                     "main_object": None,
                     "form": form,
-                    "form_data": default_form_data,
                     "errors": {},
                     "errors_messages": {},
                 },
@@ -485,10 +483,10 @@ def test_form_process_POST(self):
                 "a_number": None,
                 "a_one2many": "[]",
             }
+            self.assertEqual(form.form_data, default_form_data)
             expected = {
                 "main_object": None,
                 "form": form,
-                "form_data": default_form_data,
                 "errors": {},
                 "errors_messages": {},
             }
@@ -503,7 +501,6 @@ def test_form_process_POST(self):
                     "extra_key4": "baz",
                     "main_object": None,
                     "form": form,
-                    "form_data": default_form_data,
                     "errors": {},
                     "errors_messages": {},
                 },
diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index b59f2e43..a3ba01fe 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -28,7 +28,7 @@ def test_widget_init(self):
         self.assertEqual(widget.w_form, form)
         self.assertEqual(widget.w_form_model, form.form_model)
         self.assertEqual(widget.w_record, form.main_object)
-        self.assertEqual(widget.w_form_values, form.form_render_values)
+        self.assertEqual(widget.w_form_values, form.form_data)
         self.assertEqual(widget.w_fname, "custom")
         self.assertDictEqual(widget.w_field, field)
         self.assertEqual(widget.w_field_value, False)

From ca1c3b67917af9d583454776798707eb58e0023f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 18 Jul 2023 16:04:23 +0200
Subject: [PATCH 25/69] cms_form: add form_get_current_widget

---
 cms_form/models/cms_form_mixin.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index afdb9014..205c283e 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -428,6 +428,9 @@ def form_get_widget(self, fname, field, **kw):
         model = self._form_get_default_widget_model(fname, field)
         return self.env[model].widget_init(self, fname, field, **kw)
 
+    def form_get_current_widget(self, fname):
+        return self.form_fields_get()[fname]["widget"]
+
     def _form_get_specific_widget(self, fname, field, **kw):
         """Retrieve and initialize fields' specific widgets.
 

From 076e157070043e592fa3c13f7bfe7b3f7904ee42 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 18 Jul 2023 16:05:37 +0200
Subject: [PATCH 26/69] cms_form: fix wizard session store

Before this change the session was not stored at all on the filesystem
---
 cms_form/models/cms_form_wizard.py | 8 ++++++++
 cms_form/tests/test_form_wizard.py | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 575f2134..8800e451 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -58,6 +58,12 @@ def wiz_storage_get(self):
             )
         return self._wiz_storage[self._wiz_storage_key]
 
+    def wiz_storage_set(self, storage):
+        self.o_request.session.update({self._wiz_storage_key: storage})
+        # Important: ensure the session is stored (will be flagged as dirty)
+        # Mandatory since v16 when storing nested objs.
+        self.o_request.session.touch()
+
     DEFAULT_STORAGE_KEYS = {
         "steps": {},
         "current": 1,
@@ -155,7 +161,9 @@ def wiz_save_step(self, values, step=None):
         if step not in storage["steps"]:
             # safely re-init step
             storage["steps"][step] = {}
+
         storage["steps"][step].update(values)
+        self.wiz_storage_set(storage)
 
     def wiz_load_step(self, step=None):
         step = step or self.wiz_current_step()
diff --git a/cms_form/tests/test_form_wizard.py b/cms_form/tests/test_form_wizard.py
index 8eadbab0..4873b93f 100644
--- a/cms_form/tests/test_form_wizard.py
+++ b/cms_form/tests/test_form_wizard.py
@@ -4,6 +4,9 @@
 from .common import FormSessionTestCase
 from .utils import fake_request
 
+# TODO: add tests w/ real session
+# to make sure there's no regression between versions
+
 
 class TestCMSFormWizard(FormSessionTestCase):
     @staticmethod

From 11b2f6d161ff1ad0795339a6c82a2079509c1f49 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 18 Jul 2023 16:08:56 +0200
Subject: [PATCH 27/69] cms_form: widget mixin default to no value

---
 cms_form/models/widgets/widget_mixin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 2d395ca6..0ac160d1 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -26,7 +26,7 @@ class Widget(models.AbstractModel):
     w_css_klass = fields.Char(default="")
 
     w_fname = fields.Char(default="")
-    w_field_value = fields.Char(default="")
+    w_field_value = fields.Char()
     w_data = Serialized(default={})
 
     @property

From 8578b43796d52efa75cb38ac3d075338fb8470b2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 16:56:19 +0200
Subject: [PATCH 28/69] cms_form: add readonly form mode

---
 cms_form/models/widgets/widget_mixin.py | 5 +++++
 cms_form/templates/form.xml             | 2 +-
 cms_form/templates/widgets.xml          | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 0ac160d1..a44a9ec4 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -27,6 +27,7 @@ class Widget(models.AbstractModel):
 
     w_fname = fields.Char(default="")
     w_field_value = fields.Char()
+    w_readonly = fields.Boolean()
     w_data = Serialized(default={})
 
     @property
@@ -35,6 +36,10 @@ def html_fname(self):
             return self.w_form.form_fname_pattern.format(widget=self)
         return self.w_fname
 
+    @property
+    def html_readonly(self):
+        return self.w_form.form_mode == "readonly" or self.w_readonly
+
     def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
         vals = {
             "w_form": form,
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index a5c1efd8..7a146f62 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -183,7 +183,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             `form .form-group.field-required label.control-label::after{ content: '*'}`
             You'll get the symbol here, with proper legend
         -->
-                <t t-if="form.form_mode != 'search'">
+                <t t-if="form.form_mode not in ('search', 'readonly')">
                     <div class="form-group field-required">
                         <p class="field-required-legend"><label
                                 class="control-label"
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 904fe65d..e6b4ae4a 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -14,6 +14,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
             t-att-placeholder="widget.w_field['string'] + '...'"
+            t-att-readonly="widget.html_readonly or None"
         />
     </template>
     <template id="field_widget_hidden" name="CMS form hidden field">
@@ -34,6 +35,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-name="widget.html_fname"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
+            t-att-readonly="widget.html_readonly or None"
         >
             <option class="empty_item" value="">
                 <t t-esc="widget.w_field['string'] + '...'" />
@@ -79,6 +81,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                             t-att-value="opt_item['value']"
                             t-att-checked="'checked' if opt_item['value'] == widget.w_field_value else None"
                             t-att-required="widget.w_field['required'] and '1' or None"
+                            t-att-readonly="widget.html_readonly or None"
                         />
                         <span t-esc="opt_item['label']" />
                     </label>
@@ -111,6 +114,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-placeholder="widget.w_field['string'] + '...'"
             t-att-data-domain="widget.w_field.get('domain') or '[]'"
             t-att-required="widget.w_field['required'] and '1' or None"
+            t-att-readonly="widget.html_readonly or None"
         />
     </template>
     <template
@@ -134,6 +138,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-att-placeholder="widget.w_placeholder"
                 t-att-data-params='widget.w_data_json()'
                 t-att-required="widget.w_field['required'] and '1' or None"
+                t-att-readonly="widget.html_readonly or None"
             />
             <!-- This will hold server-side value -->
             <input
@@ -170,6 +175,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-attf-id="#{widget.w_fname}_counter"
                 t-attf-name="#{widget.w_fname}_counter"
                 class="form-control text-counter"
+                t-att-readonly="widget.html_readonly or None"
             />
         </t>
     </template>
@@ -181,6 +187,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-checked="'checked' if widget.w_field_value else None"
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-required="widget.w_field['required'] and '1' or None"
+            t-att-readonly="widget.html_readonly or None"
         />
     </template>
     <template id="field_widget_image" name="CMS form image field widget">
@@ -192,6 +199,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 t-att-id="widget.w_fname"
                 t-att-name="widget.html_fname"
                 class="form-control"
+                t-att-readonly="widget.html_readonly or None"
             />
             <t t-if="widget.w_field_value">
                 <t t-set="prefix" t-value="widget.w_fname" />

From 85a7024cd1d4a5c232dac89d234c0a7d5f6063c2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 16:58:29 +0200
Subject: [PATCH 29/69] cms_form: merge fields rather than replace

Form fields have precedence over model fields.
However, it's handy to override just few params
instead of the whole field.
---
 cms_form/models/cms_form_mixin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 205c283e..24339e64 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -322,7 +322,8 @@ def _form_fields_get(self):
             _form_fields[k]["_default"] = v
         _all_fields.update(_model_fields)
         # form fields override model fields
-        _all_fields.update(_form_fields)
+        # TODO: add tests
+        _all_fields = utils.data_merge(_all_fields, _form_fields)
         # exclude blacklisted
         for fname in self.form_fields_blacklist:
             # make it fail if passing wrong field name

From 1fdd1989056de82fab0e2f2c1665e64718cc59c0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 17:00:27 +0200
Subject: [PATCH 30/69] cms_form: support form_hidden attribute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Form fields can now be hidden via ´form_hidden' attr.
---
 cms_form/models/cms_form_mixin.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 24339e64..6e05a470 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -405,10 +405,17 @@ def form_update_fields_attributes(self, _fields):
         for fname, field in _fields.items():
             if fname in self.form_required_fields:
                 _fields[fname]["required"] = True
-            if fname in self.form_fields_hidden:
+            if self._form_is_field_hidden(fname, field):
                 _fields[fname]["hidden"] = True
             _fields[fname]["widget"] = self.form_get_widget(fname, field)
 
+    def _form_is_field_hidden(self, fname, field):
+        return (
+            fname in self.form_fields_hidden
+            or fname in self._fields
+            and getattr(self._fields[fname], "form_hidden", False)
+        )
+
     def _form_get_default_widget_model(self, fname, field):
         """Retrieve widget model name."""
         if field.get("hidden"):

From c653c9bc6d5cd5735a65817a7407d583e5e92329 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 17:01:26 +0200
Subject: [PATCH 31/69] cms_form: add ctrl to render portion of forms

---
 cms_form/controllers/main.py       | 31 ++++++++++++++++++++++++++++++
 cms_form/tests/common.py           |  8 +++++++-
 cms_form/tests/test_controllers.py | 31 ++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/cms_form/controllers/main.py b/cms_form/controllers/main.py
index f12b782e..268589ae 100644
--- a/cms_form/controllers/main.py
+++ b/cms_form/controllers/main.py
@@ -136,6 +136,37 @@ def cms_form(self, model, model_id=None, **kw):
         """Handle a `form` route."""
         return self.make_response(model, model_id=model_id, **kw)
 
+    @http.route(
+        [
+            "/cms/render/form/<string:form_model>",
+            "/cms/render/form/<string:form_model>/<int:model_id>",
+        ],
+        type="json",
+        auth="user",
+        website=True,
+        # FIXME
+        csfr=False,
+    )
+    def cms_form_render(self, form_model, model_id=None, **kw):
+        kw["form_model_key"] = form_model
+        data = request.get_json_data()
+        process_form = data.get("process", kw.pop("process", False))
+        widget_params = data.get("widget_params", kw.pop("widget_params", {}))
+        if widget_params:
+            kw["form_model_fields"] = list(widget_params)
+        form = self.get_form(None, model_id=model_id, **kw)
+        form.form_check_permission()
+        if process_form:
+            form.form_process()
+        by_widget = {}
+        for fname, params in widget_params.items():
+            widget = form.form_get_current_widget(fname)
+            widget.update(params)
+            by_widget[fname] = widget.render()
+        if by_widget:
+            return {"by_widget": by_widget}
+        return {"form": form.form_render()}
+
 
 class WizardFormControllerMixin(FormControllerMixin):
 
diff --git a/cms_form/tests/common.py b/cms_form/tests/common.py
index a047d10a..08e613ec 100644
--- a/cms_form/tests/common.py
+++ b/cms_form/tests/common.py
@@ -131,7 +131,13 @@ def tearDown(self):
 
     def html_get(self, url):
         resp = self.url_open(url, timeout=30)
-        return html.document_fromstring(resp.content)
+        return self.parse_html(resp.content)
+
+    def parse_html(self, content, fragment=False):
+        parser = html.document_fromstring
+        if fragment:
+            parser = html.fragment_fromstring
+        return parser(content)
 
     def get_form(self, form_model, **kw):
         return get_form(self.env, form_model, **kw)
diff --git a/cms_form/tests/test_controllers.py b/cms_form/tests/test_controllers.py
index 631a9272..7e7acfe2 100644
--- a/cms_form/tests/test_controllers.py
+++ b/cms_form/tests/test_controllers.py
@@ -1,6 +1,7 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
+import json
 import os
 import unittest
 
@@ -225,3 +226,33 @@ def test_default_wiz_rendering(self):
             "wizard",
             extra_klass="fake_wiz",
         )
+        # TODO: check more (paging etc)
+
+    def test_render_only_form(self):
+        url = self.base_url() + "/cms/render/form/cms.form.res.partner"
+        resp = self.url_open(
+            url,
+            data=json.dumps({"widget_params": {}}),
+            headers={"Content-Type": "application/json"},
+            timeout=30,
+        )
+        form = resp.json()["result"]["form"]
+        dom = self.parse_html(form, fragment=True)
+        self.assertTrue(dom.tag == "form")
+        data_form = json.loads(dom.attrib["data-form"])
+        self.assertEqual(data_form["model"], "res.partner")
+
+    def test_render_only_form_widget(self):
+        url = self.base_url() + "/cms/render/form/cms.form.res.partner"
+        resp = self.url_open(
+            url,
+            data=json.dumps({"widget_params": {"custom": {}}}),
+            headers={"Content-Type": "application/json"},
+            timeout=30,
+        )
+        by_widget = resp.json()["result"]["by_widget"]
+        dom = self.parse_html(by_widget["custom"], fragment=True)
+        self.assertTrue(dom.tag == "input")
+        self.assertEqual(dom.attrib["id"], "custom")
+        self.assertEqual(dom.attrib["name"], "custom")
+        self.assertEqual(dom.attrib["value"], "oh yeah!")

From 2640344b45b77bdfe6e8c4499f3e33dc67e1aa07 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 17:02:06 +0200
Subject: [PATCH 32/69] cms_form: support wizard form reset on demand

---
 cms_form/models/cms_form_wizard.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 8800e451..285222d9 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -32,6 +32,7 @@ class CMSFormWizard(models.AbstractModel):
     # You can pass a list of fields if you don't want to store them all.
     form_step_stored_fields = Serialized(form_tech=True, default=[])
     form_step_store_all_fields = fields.Boolean(form_tech=True, default=True)
+    form_reset = fields.Boolean(form_tech=True, default=False)
 
     def _get_form_mode(self):
         return "wizard"
@@ -51,12 +52,15 @@ def _wiz_storage(self):
         return self.o_request.session
 
     def wiz_storage_get(self):
-        if not self._wiz_storage.get(self._wiz_storage_key):
+        self._wiz_storage_prepare()
+        return self._wiz_storage[self._wiz_storage_key]
+
+    def _wiz_storage_prepare(self, reset=False):
+        if not self._wiz_storage.get(self._wiz_storage_key) or reset:
             # use `deepcopy` to not reference steps' dict
             self._wiz_storage[self._wiz_storage_key] = deepcopy(
                 self.DEFAULT_STORAGE_KEYS
             )
-        return self._wiz_storage[self._wiz_storage_key]
 
     def wiz_storage_set(self, storage):
         self.o_request.session.update({self._wiz_storage_key: storage})
@@ -73,6 +77,9 @@ def wiz_storage_set(self, storage):
 
     def form_init(self, request, main_object=None, page=1, wizard=None, **kw):
         form = super().form_init(request, main_object=main_object, **kw)
+        if form.form_reset:
+            form._wiz_storage_prepare(reset=True)
+            form.form_reset = False
         form.wiz_init(page=page, **kw)
         return form
 

From fc8e67094584163db10801bc3e37e504d871934f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 17:03:28 +0200
Subject: [PATCH 33/69] cms_form: add wizard.is_final_step_process helper

Very helpful to know if the submit action is the last one
and the wizard is meant to do is final job.
---
 cms_form/models/cms_form_wizard.py | 4 ++++
 cms_form/templates/form.xml        | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 285222d9..ecd67619 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -180,6 +180,10 @@ def form_after_create_or_update(self, values, extra_values):
         step_values = self._prepare_step_values_to_store(values, extra_values)
         self.wiz_save_step(step_values)
 
+    def is_final_step_process(self):
+        # Helper method to determine if the submot action is the last one
+        return self.request.form.get("wiz_submit") == "process"
+
     def _prepare_step_values_to_store(self, values, extra_values):
         values = values.copy()
         values.update(extra_values)
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 7a146f62..c0475996 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -338,6 +338,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 <t t-else="">
                     <button
                         type="submit"
+                        name="wiz_submit"
+                        value="process"
                         class="btn btn-primary pull-right"
                     >Submit</button>
                 </t>

From 87f26f3043d85b8335a2735678bfccbdcf0891e9 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 20 Jul 2023 17:03:56 +0200
Subject: [PATCH 34/69] cms_form: widget mixin ease json data conversion

---
 cms_form/models/widgets/widget_mixin.py    | 6 +++++-
 cms_form/tests/widgets/test_widget_date.py | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index a44a9ec4..778e4298 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -100,4 +100,8 @@ def w_subfields_by_value(self, value="_all"):
         return self.w_subfields.get(value, {})
 
     def w_data_json(self):
-        return json.dumps(self.w_data, sort_keys=True)
+        data = dict(self.w_data, name=self.html_fname)
+        return self._data_to_json(data)
+
+    def _data_to_json(self, data):
+        return json.dumps(data, sort_keys=True)
diff --git a/cms_form/tests/widgets/test_widget_date.py b/cms_form/tests/widgets/test_widget_date.py
index 4c8dd237..c2884dc5 100644
--- a/cms_form/tests/widgets/test_widget_date.py
+++ b/cms_form/tests/widgets/test_widget_date.py
@@ -34,7 +34,7 @@ def test_widget_date_input(self):
         # TODO: check on json params on other widgets too
         self.assertEqual(
             json.loads(node_input_disp[0].attrib["data-params"]),
-            {"defaultToday": True},
+            {"defaultToday": True, "name": "a_date_field"},
         )
         # and the real one holding the value which is hidden
         node_input = self.find_input_name(node, self.w_name)
@@ -70,7 +70,7 @@ def test_widget_date_input_custom_dp_attrs(self):
         self.assertEqual(widget.w_placeholder, "Custom")
         self.assertEqual(
             widget.w_data_json(),
-            '{"defaultToday": true, "dp": {"format": "%m.%Y"}}',
+            '{"defaultToday": true, "dp": {"format": "%m.%Y"}, "name": "a_date_field"}',
         )
 
     def test_widget_date_input_all_elems(self):

From 2a3fe44f192cd156d7c1f402589a3fe3df33eb44 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 09:16:34 +0200
Subject: [PATCH 35/69] cms_form: fix wiz last step next url

When the user submits the last page of the wiz
if the main_object is set and has an URL,
redirect to it right away.
---
 cms_form/models/cms_form_wizard.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index ecd67619..f673a8fb 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -151,6 +151,14 @@ def form_next_url(self, main_object=None):
             step = self.wiz_next_step()
         else:
             step = self.wiz_prev_step()
+
+        main_object = main_object or self.main_object
+        if (
+            main_object
+            and "url" in main_object._fields
+            and self.is_final_step_process()
+        ):
+            return main_object.url
         if not step:
             # fallback to page 1
             step = 1

From b37b0c5dc92cdc2d17b8d1eaf1969696fbef4208 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 09:16:56 +0200
Subject: [PATCH 36/69] cms_form: cms.form add mesage after all hooks

---
 cms_form/models/cms_form.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index 07294be2..d1beeb55 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -170,10 +170,10 @@ def form_create_or_update(self):
         else:
             self._form_create(write_values)
             msg = self.form_msg_success_created
-        if msg:
-            self.add_status_message(msg)
         # post hook
         self.form_after_create_or_update(write_values, extra_values)
+        if msg:
+            self.add_status_message(msg)
         return self.main_object
 
     def form_process_POST(self, render_values):

From febab12c68c874f67ac81ab78daaf50376739223 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 09:17:15 +0200
Subject: [PATCH 37/69] cms_form: add TODO to fix widget ids

---
 cms_form/templates/widgets.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index e6b4ae4a..af325007 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -5,6 +5,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 -->
 <odoo>
     <template id="field_widget_char" name="CMS form text field widget">
+        <!-- FIXME: `id` must be removed and use as data attr to avoid multiple el w/ same id -->
         <input
             type="text"
             t-attf-class="form-control #{widget.w_css_klass}"

From db3df8ecc4dc586a91b42bed2b2052ca3f025256 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 11:37:30 +0200
Subject: [PATCH 38/69] cms_form: fix warning for exc attribute

---
 cms_form/models/cms_form.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/cms_form.py b/cms_form/models/cms_form.py
index d1beeb55..52334348 100644
--- a/cms_form/models/cms_form.py
+++ b/cms_form/models/cms_form.py
@@ -196,7 +196,11 @@ def form_process_POST(self, render_values):
                 # u'Error while validating constraint\n
                 #    \nEnd Date cannot be set before Start Date.\nNone'
                 errors_message["_validation"] = "<br />".join(
-                    [x for x in err.name.replace("None", "").split("\n") if x.strip()]
+                    [
+                        x
+                        for x in err.args[0].replace("None", "").split("\n")
+                        if x.strip()
+                    ]
                 )
             except (pg.IntegrityError, pg.OperationalError) as err:
                 errors["_integrity"] = True

From 0ba444ba0d936a42500d9853dfd37d43172a38e2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 11:39:04 +0200
Subject: [PATCH 39/69] cms_form: wipe wiz storage after last step complete

---
 cms_form/models/cms_form_wizard.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index f673a8fb..2c461bf9 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -187,6 +187,9 @@ def wiz_load_step(self, step=None):
     def form_after_create_or_update(self, values, extra_values):
         step_values = self._prepare_step_values_to_store(values, extra_values)
         self.wiz_save_step(step_values)
+        if self.is_final_step_process():
+            # Wipe session data when done
+            self._wiz_storage_prepare(reset=True)
 
     def is_final_step_process(self):
         # Helper method to determine if the submot action is the last one

From 14f53a33758cdf5ef00fcc2599be7670a0064d90 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 24 Jul 2023 11:39:33 +0200
Subject: [PATCH 40/69] cms_form: fix wrapper tmpl id

---
 cms_form/templates/form.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index c0475996..8c900eac 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -7,7 +7,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 <odoo>
     <template id="form_wrapper" name="CMS form wrapper">
         <t t-set="title" t-value="form.form_title" />
-        <div id="wrap" t-att-class="form.form_wrapper_css_klass">
+        <div t-att-class="form.form_wrapper_css_klass">
             <div class="container">
                 <t t-if="form.form_title">
                     <h2>

From e55deeabbf2c46ba020792583dc4509f7b786269 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 25 Jul 2023 09:26:10 +0200
Subject: [PATCH 41/69] cms_form: fix wiz btn position

---
 cms_form/templates/form.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 8c900eac..fabcbcb8 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -332,7 +332,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                         type="submit"
                         name="wiz_submit"
                         value="next"
-                        class="btn btn-primary btn-next pull-right"
+                        class="btn btn-primary btn-next float-end"
                     >Next</button>
                 </t>
                 <t t-else="">
@@ -340,7 +340,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                         type="submit"
                         name="wiz_submit"
                         value="process"
-                        class="btn btn-primary pull-right"
+                        class="btn btn-primary float-end"
                     >Submit</button>
                 </t>
                 <t t-if="form.wiz_prev_step()">
@@ -348,7 +348,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                         type="submit"
                         name="wiz_submit"
                         value="prev"
-                        class="btn btn-primary btn-prev pull-left"
+                        class="btn btn-primary btn-prev float-start"
                     >Prev</button>
                 </t>
             </div>

From 9ac46c83a0a4b7891685be4f188a0ea8b5666f3f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 25 Jul 2023 15:55:44 +0200
Subject: [PATCH 42/69] cms_form: fix session de-serialization

Depending of the type of session storage data might be serialized (eg: using Redis as session storage).
When this happens steps keys might be converted to strings
and the wizard won't be able to reload steps' data.
---
 cms_form/models/cms_form_wizard.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 2c461bf9..ea1b03b5 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -53,7 +53,13 @@ def _wiz_storage(self):
 
     def wiz_storage_get(self):
         self._wiz_storage_prepare()
-        return self._wiz_storage[self._wiz_storage_key]
+        storage = self._wiz_storage[self._wiz_storage_key]
+        if "steps" in storage:
+            # Depending of the type of session storage data might be serialized.
+            # When this happens steps keys might be converted to strings.
+            # Ensure we always get integers.
+            storage["steps"] = {int(k): v for k, v in storage["steps"].items()}
+        return storage
 
     def _wiz_storage_prepare(self, reset=False):
         if not self._wiz_storage.get(self._wiz_storage_key) or reset:

From f17a508d843cc4d967afe51bbc2d74105c42f746 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Thu, 3 Aug 2023 16:18:24 +0200
Subject: [PATCH 43/69] cms_form: add search no result tmpl

---
 cms_form/models/cms_search_form.py | 13 +++++++++++++
 cms_form/templates/form.xml        |  8 ++++++++
 2 files changed, 21 insertions(+)

diff --git a/cms_form/models/cms_search_form.py b/cms_form/models/cms_search_form.py
index 7d3a0e02..445eb782 100644
--- a/cms_form/models/cms_search_form.py
+++ b/cms_form/models/cms_search_form.py
@@ -21,6 +21,9 @@ class CMSFormSearch(models.AbstractModel):
     form_search_results_template = fields.Char(
         form_tech=True, default="cms_form.search_results"
     )
+    form_no_search_results_template = fields.Char(
+        form_tech=True, default="cms_form.no_search_results"
+    )
     form_method = fields.Char(form_tech=True, default="GET")
     # you might want to just list items based on a predefined query
     # if this flag is false the search form won't be rendered
@@ -46,6 +49,9 @@ class CMSFormSearch(models.AbstractModel):
 
     # make it computed
     form_title = fields.Char(form_tech=True, compute="_compute_form_title")
+    form_no_result_msg = fields.Char(
+        form_tech=True, compute="_compute_form_no_result_msg"
+    )
 
     def _get_form_mode(self):
         return "search"
@@ -62,6 +68,13 @@ def _get_form_title(self):
             title = _("Search %s") % name
         return title
 
+    def _compute_form_no_result_msg(self):
+        for rec in self:
+            rec.form_no_result_msg = rec._get_form_no_result_msg()
+
+    def _get_form_no_result_msg(self):
+        return _("No items")
+
     def form_check_permission(self):
         """Just searching, nothing to check here."""
         return True
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index fabcbcb8..087d035d 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -216,6 +216,9 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
                 <t t-out="form.form_render()" />
             </t>
             <div class="form_content">
+                <t t-if="not form.form_search_results['count']">
+                    <t t-call="{{ form.form_no_search_results_template  }}" />
+                </t>
                 <t t-call="{{ form.form_search_results_template  }}" />
             </div>
         </xpath>
@@ -286,6 +289,11 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </t>
         </div>
     </template>
+    <template id="no_search_results" name="CMS form no search results">
+        <div class="text-center mb32" t-if="form.form_no_result_msg">
+            <p t-out="form.form_no_result_msg" />
+        </div>
+    </template>
     <template
         id="wizard_form_wrapper"
         name="CMS wizard form wrapper"

From 7f9e8890895716e4663bae56a9c207353fc773b2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 4 Aug 2023 14:18:24 +0200
Subject: [PATCH 44/69] cms_form: fix widget.mixin extract corner case

---
 cms_form/models/widgets/widget_mixin.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 778e4298..6c98ee1a 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -81,7 +81,12 @@ def w_load(self, **req_values):
 
     def w_extract(self, **req_values):
         """Extract value from form submit."""
-        return req_values.get(self.html_fname)
+        value = req_values.get(self.html_fname)
+        if isinstance(value, str) and value == "None":
+            # Corner case for when field values are set as None in the request.
+            # Odoo request will convert the value to a string.
+            value = None
+        return value
 
     def w_check_empty_value(self, value, **req_values):
         # `None` values are meant to be ignored as not changed

From 85bd3ac9dc6ae5473f17ed83d716782c0609085f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 11 Sep 2023 10:26:52 +0200
Subject: [PATCH 45/69] cms_form: widget init allow direct fields init

---
 cms_form/models/widgets/widget_mixin.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 6c98ee1a..cddaa330 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -49,8 +49,12 @@ def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
             "w_data": data or {},
             "w_subfields": subfields or field.get("subfields", {}),
         }
+        for k, v in kw.items():
+            if k in self._fields:
+                vals[k] = v
         for k in ("template", "css_klass"):
             if kw.get(k):
+                # TODO: deprecate
                 vals[f"w_{k}"] = kw[k]
         field_value = form.form_data.get(fname, kw.get("field_value"))
         if field_value:

From f5aa3e25e0cf253fa5392bfd6a98f406a8553234 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 11 Sep 2023 10:29:59 +0200
Subject: [PATCH 46/69] cms_form: support mix/max for numeric widgets

---
 cms_form/models/widgets/widget_numeric.py | 29 ++++++++++++++++++++++-
 cms_form/models/widgets/widget_text.py    |  1 +
 cms_form/templates/widgets.xml            | 13 +++++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/cms_form/models/widgets/widget_numeric.py b/cms_form/models/widgets/widget_numeric.py
index 8d5c4905..02326206 100644
--- a/cms_form/models/widgets/widget_numeric.py
+++ b/cms_form/models/widgets/widget_numeric.py
@@ -6,9 +6,36 @@
 from ... import utils
 
 
+class NumericWidgetMixin(models.AbstractModel):
+    _name = "cms.form.widget.numeric.mixin"
+    _inherit = "cms.form.widget.char"
+    _description = "CMS Form numeric mixin widget"
+
+    w_template = fields.Char(default="cms_form.field_widget_numeric")
+    w_input_type = fields.Char(default="number")
+    w_input_min = fields.Char(default="")
+    w_input_max = fields.Char(default="")
+
+    def _num_value_to_attr(self, value):
+        """Safely convert numeric value for html attr rendering."""
+        if value is False or value is None:
+            return None
+        if isinstance(value, str) and not value.isdigit():
+            return None
+        return str(value)
+
+    @property
+    def html_input_min(self):
+        return self._num_value_to_attr(self.w_input_min)
+
+    @property
+    def html_input_max(self):
+        return self._num_value_to_attr(self.w_input_max)
+
+
 class IntegerWidget(models.AbstractModel):
     _name = "cms.form.widget.integer"
-    _inherit = "cms.form.widget.char"
+    _inherit = "cms.form.widget.numeric.mixin"
     _description = "CMS Form integer widget"
 
     def w_extract(self, **req_values):
diff --git a/cms_form/models/widgets/widget_text.py b/cms_form/models/widgets/widget_text.py
index f8223fe4..398bbdf5 100644
--- a/cms_form/models/widgets/widget_text.py
+++ b/cms_form/models/widgets/widget_text.py
@@ -10,6 +10,7 @@ class CharWidget(models.AbstractModel):
     _description = "CMS Form char widget"
 
     w_template = fields.Char(default="cms_form.field_widget_char")
+    w_input_type = fields.Char(default="text")
 
 
 class TextWidget(models.AbstractModel):
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index af325007..7b531b15 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -7,7 +7,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
     <template id="field_widget_char" name="CMS form text field widget">
         <!-- FIXME: `id` must be removed and use as data attr to avoid multiple el w/ same id -->
         <input
-            type="text"
+            t-att-type="widget.w_input_type"
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-id="widget.w_fname"
             t-att-name="widget.html_fname"
@@ -18,6 +18,17 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-readonly="widget.html_readonly or None"
         />
     </template>
+    <template
+        id="field_widget_numeric"
+        primary="True"
+        inherit_id="cms_form.field_widget_char"
+        name="CMS form numeric field widget"
+    >
+        <input position="attributes">
+          <attribute name="t-att-min">widget.html_input_min</attribute>
+          <attribute name="t-att-max">widget.html_input_max</attribute>
+        </input>
+    </template>
     <template id="field_widget_hidden" name="CMS form hidden field">
         <input
             type="hidden"

From cad9ef8ac764f99563409512105d1d0e2ed771b0 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 11 Sep 2023 10:30:37 +0200
Subject: [PATCH 47/69] cms_form: allow txt input pattern validation

---
 cms_form/models/widgets/widget_text.py | 1 +
 cms_form/templates/widgets.xml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cms_form/models/widgets/widget_text.py b/cms_form/models/widgets/widget_text.py
index 398bbdf5..88af65d8 100644
--- a/cms_form/models/widgets/widget_text.py
+++ b/cms_form/models/widgets/widget_text.py
@@ -11,6 +11,7 @@ class CharWidget(models.AbstractModel):
 
     w_template = fields.Char(default="cms_form.field_widget_char")
     w_input_type = fields.Char(default="text")
+    w_valid_pattern = fields.Char(help="Used to validate inputs with `pattern` attr")
 
 
 class TextWidget(models.AbstractModel):
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 7b531b15..4c9f8e49 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -16,6 +16,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-data-params='widget.w_data_json()'
             t-att-placeholder="widget.w_field['string'] + '...'"
             t-att-readonly="widget.html_readonly or None"
+            t-att-pattern="widget.w_valid_pattern"
         />
     </template>
     <template

From c47a7b53827abca0b82fdc617ff2ddd4cf7d4027 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 13 Sep 2023 13:41:37 +0200
Subject: [PATCH 48/69] cms_form: allow custom field wrapper tmpl and class by
 widget

---
 cms_form/models/cms_form_mixin.py         | 20 +++++++++++++---
 cms_form/models/widgets/widget_boolean.py |  2 ++
 cms_form/models/widgets/widget_mixin.py   |  2 ++
 cms_form/templates/form.xml               | 25 ++++++++++++++++++-
 cms_form/tests/test_form_base.py          | 29 ++++++++++-------------
 5 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 6e05a470..6ea4e8cc 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -50,6 +50,9 @@ class CMSFormMixin(models.AbstractModel):
     form_fields_template = fields.Char(
         form_tech=True, default="cms_form.base_form_fields"
     )
+    form_fields_wrapper_template = fields.Char(
+        form_tech=True, compute="_compute_form_fields_wrapper_template", readonly=False
+    )
     form_buttons_template = fields.Char(
         form_tech=True, default="cms_form.base_form_buttons"
     )
@@ -189,6 +192,15 @@ def _get_form_mode(self):
             return "edit"
         return "create"
 
+    _form_field_wrapper_template_pattern = (
+        "cms_form.form_{form.form_display_mode}_field_wrapper"
+    )
+
+    def _compute_form_fields_wrapper_template(self):
+        pattern = self._form_field_wrapper_template_pattern
+        for rec in self:
+            rec.form_fields_wrapper_template = pattern.format(form=rec)
+
     def form_init(self, request, main_object=None, **kw):
         """Initalize a form instance.
 
@@ -416,6 +428,9 @@ def _form_is_field_hidden(self, fname, field):
             and getattr(self._fields[fname], "form_hidden", False)
         )
 
+    def form_get_field_wrapper_template(self, fname, field):
+        return field["widget"].w_wrapper_template or self.form_fields_wrapper_template
+
     def _form_get_default_widget_model(self, fname, field):
         """Retrieve widget model name."""
         if field.get("hidden"):
@@ -577,9 +592,6 @@ def form_render(self, **kw):
         """
         values = self.form_render_values.copy()
         values.update(kw)
-        values["field_wrapper_template"] = "cms_form.form_{}_field_wrapper".format(
-            self.form_display_mode
-        )
         return self.env["ir.qweb"]._render(self.form_template, values)
 
     def form_process(self, **kw):
@@ -657,6 +669,8 @@ def form_make_field_wrapper_klass(self, fname, field, **kw):
             klass.append("field-required")
         if kw.get("errors", {}).get(fname):
             klass.append("has-error")
+        if field["widget"].w_wrapper_css_klass:
+            klass.append(field["widget"].w_wrapper_css_klass)
         return " ".join(klass).format(fname=fname, **field)
 
     def _form_json_info(self):
diff --git a/cms_form/models/widgets/widget_boolean.py b/cms_form/models/widgets/widget_boolean.py
index ba6f8e6b..2a9c28ce 100644
--- a/cms_form/models/widgets/widget_boolean.py
+++ b/cms_form/models/widgets/widget_boolean.py
@@ -13,6 +13,8 @@ class BooleanWidget(models.AbstractModel):
     _description = "CMS Form boolean widget"
 
     w_template = fields.Char(default="cms_form.field_widget_boolean")
+    w_wrapper_template = fields.Char(default="cms_form.form_field_label_after_wrapper")
+    w_wrapper_css_klass = fields.Char(default="form-check")
     w_true_values = Serialized(default=utils.TRUE_VALUES)
     w_field_value = fields.Boolean()
 
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index cddaa330..ec320c89 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -23,7 +23,9 @@ class Widget(models.AbstractModel):
     w_subfields = fields.Binary(default={}, store=False)
 
     w_template = fields.Char(default="")
+    w_wrapper_template = fields.Char(default="")
     w_css_klass = fields.Char(default="")
+    w_wrapper_css_klass = fields.Char(default="")
 
     w_fname = fields.Char(default="")
     w_field_value = fields.Char()
diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 087d035d..284f11c3 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -66,6 +66,27 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </t>
         </div>
     </template>
+    <template
+        id="form_field_label_after_wrapper"
+        name="CMS form field wrapper with label after"
+    >
+        <div
+            t-att-class="form.form_make_field_wrapper_klass(fname, field, errors=errors)"
+        >
+            <t t-out="widget.render()" />
+            <label
+                class="control-label"
+                t-att-for="fname"
+                t-esc="field['string']"
+            >Name</label>
+            <t t-if="field.get('help')">
+                <t t-call="cms_form.base_form_field_help_block" />
+            </t>
+            <t t-if="errors.get(fname)">
+                <t t-call="cms_form.base_form_field_error_block" />
+            </t>
+        </div>
+    </template>
     <template id="base_form_field_help_block" name="CMS form field help block">
         <div class="help-block">
             <!-- use `out` to allow injecting html stuff here -->
@@ -103,7 +124,9 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             <!-- this template is computed in `form_render`
       based on `form_display_mode`
       -->
-            <t t-call="{{ field_wrapper_template }}">
+            <t
+                t-call="{{ form.form_get_field_wrapper_template(fname, form_fields[fname]) }}"
+            >
                 <t t-set="field" t-value="form_fields[fname]" />
                 <t t-set="widget" t-value="field['widget']" />
             </t>
diff --git a/cms_form/tests/test_form_base.py b/cms_form/tests/test_form_base.py
index af2fe3e3..de320761 100644
--- a/cms_form/tests/test_form_base.py
+++ b/cms_form/tests/test_form_base.py
@@ -544,30 +544,27 @@ def test_css_klass(self):
 
     def test_field_wrapper_css_klass(self):
         form = self.get_form("cms.form.res.partner")
+        field = form.form_fields_get()["custom"]
         self.assertEqual(
-            form.form_make_field_wrapper_klass(
-                "foo_field", {"type": "char", "required": False}
-            ),
-            "form-group form-field field-char field-foo_field",
+            form.form_make_field_wrapper_klass("custom", field),
+            "form-group form-field field-char field-custom",
         )
+        field = form.form_fields_get()["country_id"]
         self.assertEqual(
-            form.form_make_field_wrapper_klass(
-                "foo_field_id", {"type": "many2one", "required": True}
-            ),
-            (
-                "form-group form-field field-many2one "
-                "field-foo_field_id field-required"
-            ),
+            form.form_make_field_wrapper_klass("country_id", field),
+            ("form-group form-field field-many2one " "field-country_id field-required"),
         )
+        field = form.form_fields_get()["custom"]
+        field["required"] = True
         self.assertEqual(
             form.form_make_field_wrapper_klass(
-                "foo_field",
-                {"type": "float", "required": True},
-                errors={"foo_field": "bad_value"},
+                "custom",
+                field,
+                errors={"custom": "bad_value"},
             ),
             (
-                "form-group form-field field-float "
-                "field-foo_field field-required has-error"
+                "form-group form-field field-char "
+                "field-custom field-required has-error"
             ),
         )
 

From ee8f3aa53793981bd6b488bacce2a820bde987ae Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 13 Sep 2023 13:43:53 +0200
Subject: [PATCH 49/69] cms_form: add widget.html_value

To proxy and ease customization of final html value
---
 cms_form/models/widgets/widget_mixin.py   |  4 ++++
 cms_form/models/widgets/widget_numeric.py |  2 +-
 cms_form/models/widgets/widget_text.py    | 20 +++++++++++++++++---
 cms_form/templates/widgets.xml            |  4 ++--
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index ec320c89..b008870a 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -42,6 +42,10 @@ def html_fname(self):
     def html_readonly(self):
         return self.w_form.form_mode == "readonly" or self.w_readonly
 
+    @property
+    def html_value(self):
+        return self.w_field_value
+
     def widget_init(self, form, fname, field, data=None, subfields=None, **kw):
         vals = {
             "w_form": form,
diff --git a/cms_form/models/widgets/widget_numeric.py b/cms_form/models/widgets/widget_numeric.py
index 02326206..f6342bca 100644
--- a/cms_form/models/widgets/widget_numeric.py
+++ b/cms_form/models/widgets/widget_numeric.py
@@ -8,7 +8,7 @@
 
 class NumericWidgetMixin(models.AbstractModel):
     _name = "cms.form.widget.numeric.mixin"
-    _inherit = "cms.form.widget.char"
+    _inherit = "cms.form.widget.char.mixin"
     _description = "CMS Form numeric mixin widget"
 
     w_template = fields.Char(default="cms_form.field_widget_numeric")
diff --git a/cms_form/models/widgets/widget_text.py b/cms_form/models/widgets/widget_text.py
index 88af65d8..2c29f8ad 100644
--- a/cms_form/models/widgets/widget_text.py
+++ b/cms_form/models/widgets/widget_text.py
@@ -4,8 +4,8 @@
 from odoo import fields, models
 
 
-class CharWidget(models.AbstractModel):
-    _name = "cms.form.widget.char"
+class CharWidgetMixin(models.AbstractModel):
+    _name = "cms.form.widget.char.mixin"
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form char widget"
 
@@ -14,14 +14,28 @@ class CharWidget(models.AbstractModel):
     w_valid_pattern = fields.Char(help="Used to validate inputs with `pattern` attr")
 
 
+class CharWidget(models.AbstractModel):
+    _name = "cms.form.widget.char"
+    _inherit = "cms.form.widget.char.mixin"
+    _description = "CMS Form char widget"
+
+    @property
+    def html_value(self):
+        return self.w_field_value.strip() if self.w_field_value else ""
+
+
 class TextWidget(models.AbstractModel):
     _name = "cms.form.widget.text"
-    _inherit = "cms.form.widget.mixin"
+    _inherit = "cms.form.widget.char.mixin"
     _description = "CMS Form text widget"
 
     w_template = fields.Char(default="cms_form.field_widget_text")
     w_maxlength = fields.Integer()
 
+    @property
+    def html_value(self):
+        return self.w_field_value.strip() if self.w_field_value else ""
+
     def widget_init(self, form, fname, field, **kw):
         widget = super().widget_init(form, fname, field, **kw)
         widget.w_maxlength = field.get("maxlength") or kw.get("maxlength")
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 4c9f8e49..817b1584 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -11,7 +11,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-id="widget.w_fname"
             t-att-name="widget.html_fname"
-            t-att-value="widget.w_field_value"
+            t-att-value="widget.html_value"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
             t-att-placeholder="widget.w_field['string'] + '...'"
@@ -36,7 +36,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-attf-class="#{widget.w_css_klass}"
             t-att-id="widget.w_fname"
             t-att-name="widget.html_fname"
-            t-att-value="widget.w_field_value"
+            t-att-value="widget.html_value"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-data-params='widget.w_data_json()'
         />

From ec882b6a47290cc7d81e5f2ecf1a1156d97f3d11 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 13 Sep 2023 13:44:20 +0200
Subject: [PATCH 50/69] cms_form: fix boolean widget class

---
 cms_form/templates/widgets.xml                | 2 +-
 cms_form/tests/widgets/test_widget_boolean.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 817b1584..37c2c395 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -198,7 +198,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-att-name="widget.html_fname"
             t-att-id="widget.w_fname"
             t-att-checked="'checked' if widget.w_field_value else None"
-            t-attf-class="form-control #{widget.w_css_klass}"
+            t-attf-class="form-check-input #{widget.w_css_klass}"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-readonly="widget.html_readonly or None"
         />
diff --git a/cms_form/tests/widgets/test_widget_boolean.py b/cms_form/tests/widgets/test_widget_boolean.py
index 1da033de..f5165a3a 100644
--- a/cms_form/tests/widgets/test_widget_boolean.py
+++ b/cms_form/tests/widgets/test_widget_boolean.py
@@ -22,7 +22,7 @@ def test_widget_boolean_input(self):
             "type": "checkbox",
             "id": "a_boolean_field",
             "name": "a_boolean_field",
-            "class": "form-control ",
+            "class": "form-check-input ",
         }
         self._test_widget_attributes(widget, "input", expected_attrs)
 
@@ -34,7 +34,7 @@ def test_widget_boolean_input_required(self):
             "type": "checkbox",
             "id": "a_boolean_field",
             "name": "a_boolean_field",
-            "class": "form-control ",
+            "class": "form-check-input ",
             "required": "1",
         }
         self._test_widget_attributes(widget, "input", expected_attrs)
@@ -46,7 +46,7 @@ def test_widget_boolean_input_checked(self):
             "type": "checkbox",
             "id": "a_boolean_field",
             "name": "a_boolean_field",
-            "class": "form-control ",
+            "class": "form-check-input ",
             "checked": "checked",
         }
         self._test_widget_attributes(widget, "input", expected_attrs)

From 5f77e8937c0e723841fe87986bdb7bbba461e20c Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 13 Sep 2023 16:34:05 +0200
Subject: [PATCH 51/69] cms_form: fix disabled checkbox

---
 cms_form/templates/widgets.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 37c2c395..0c8b842b 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -201,6 +201,19 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-attf-class="form-check-input #{widget.w_css_klass}"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-readonly="widget.html_readonly or None"
+            t-att-disabled="'disabled' if widget.html_readonly else None"
+        />
+        <!--
+          `readonly` has no effect on checkboxes. It's kept only for consistency.
+          When `disabled` is set, however, the input won't be submitted in the form.
+          Hence, an hidden field is needed.
+         -->
+         <input
+            t-if="widget.html_readonly"
+            type="hidden"
+            t-att-name="widget.html_fname"
+            t-att-id="widget.w_fname"
+            t-att-value="widget.w_field_value"
         />
     </template>
     <template id="field_widget_image" name="CMS form image field widget">

From 30de0fb489b189cca99b6f4f7a897c8d5427a663 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 13 Sep 2023 17:05:33 +0200
Subject: [PATCH 52/69] cms_form: fix textarea random white spaces

---
 cms_form/templates/widgets.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 0c8b842b..589a8e7e 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -169,6 +169,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         <!--
     XXX: in v11 `t-esc` must stay inside the textarea
     otherwise the whole text area is not rendered at all when value is empty.
+    Also, keep opening and closing tag attached to the t-esc element
+    to avoid having unwanted white spaces inside the text.
     -->
         <textarea
             t-att-name="widget.html_fname"
@@ -176,9 +178,8 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             t-attf-class="form-control #{widget.w_css_klass}"
             t-att-required="widget.w_field['required'] and '1' or None"
             t-att-maxlength="widget.w_maxlength"
-        >
-            <t t-esc="widget.w_field_value" />
-        </textarea>
+            t-att-readonly="widget.html_readonly or None"
+        ><t t-esc="widget.html_value" /></textarea>
         <t t-if="widget.w_maxlength">
             <input
                 type="text"

From 81f9ee3031f901fc9fe3a1a8e5be281f31c4d2d8 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 18 Sep 2023 13:17:27 +0200
Subject: [PATCH 53/69] cms_form: fix wiz form_load_defaults

Do not load any default for main wizard model.
Only step models need preloaded data.
---
 cms_form/models/cms_form_wizard.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index ea1b03b5..0cfaa24a 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -34,6 +34,9 @@ class CMSFormWizard(models.AbstractModel):
     form_step_store_all_fields = fields.Boolean(form_tech=True, default=True)
     form_reset = fields.Boolean(form_tech=True, default=False)
 
+    def _is_wiz_main_model(self):
+        return self._name == self._wiz_name
+
     def _get_form_mode(self):
         return "wizard"
 
@@ -216,6 +219,9 @@ def _prepare_step_values_to_store(self, values, extra_values):
     # TODO: tests
     def form_load_defaults(self, main_object=None, request_values=None):
         # Override to load values from the storage
+        if self._is_wiz_main_model():
+            # Do not load anything if we are initializing the main wiz model
+            return {}
         defaults = super().form_load_defaults(
             main_object=main_object, request_values=request_values
         )

From f2d0ce4620a22ae707b457db79d3e50ec12b4f04 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 18 Sep 2023 13:18:04 +0200
Subject: [PATCH 54/69] cms_form: add basic file widget

---
 cms_form/models/widgets/widget_binary.py |  8 ++++++++
 cms_form/templates/widgets.xml           | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index b9f23a98..1f4c70d8 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -91,3 +91,11 @@ class ImageWidget(models.AbstractModel):
     _description = "CMS Form image widget"
 
     w_template = fields.Char(default="cms_form.field_widget_image")
+
+
+class FileWidget(models.AbstractModel):
+    _name = "cms.form.widget.binary"
+    _inherit = "cms.form.widget.binary.mixin"
+    _description = "CMS Form file widget"
+
+    w_template = fields.Char(default="cms_form.field_widget_file")
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index 589a8e7e..c7a8416d 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -267,4 +267,15 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
             </t>
         </div>
     </template>
+    <template id="field_widget_file" name="CMS form image field widget">
+      <input
+            type="file"
+            t-att-name="widget.html_fname"
+            t-att-id="widget.w_fname"
+            t-attf-class="form-control #{widget.w_css_klass}"
+            t-att-required="widget.w_field['required'] and '1' or None"
+            t-att-readonly="widget.html_readonly or None"
+            t-att-disabled="'disabled' if widget.html_readonly else None"
+        />
+    </template>
 </odoo>

From 7102db0d6f6265176f522e09375386e662d778ce Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Mon, 18 Sep 2023 13:19:37 +0200
Subject: [PATCH 55/69] cms_form: fix master/slave JS

Hide the whole field block.
Fixes 2 issues:
* ensure field tech name matches
* hide the whole block, not just the input
---
 cms_form/static/src/js/master_slave.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/cms_form/static/src/js/master_slave.js b/cms_form/static/src/js/master_slave.js
index 503c428b..fd7c95fd 100644
--- a/cms_form/static/src/js/master_slave.js
+++ b/cms_form/static/src/js/master_slave.js
@@ -58,14 +58,10 @@ odoo.define("cms_form.master_slave", function (require) {
             });
         },
         handle_hide: function (slave_fname) {
-            $('[name="' + slave_fname + '"]')
-                .closest(".form-group")
-                .hide();
+            $(".field-" + slave_fname).hide();
         },
         handle_show: function (slave_fname) {
-            $('[name="' + slave_fname + '"]')
-                .closest(".form-group")
-                .show();
+            $(".field-" + slave_fname).show();
         },
         handle_readonly: function (slave_fname) {
             $('[name="' + slave_fname + '"]')

From 98d135bc8535efe739a8f7bc39c9bc13e06c4a7c Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 13:55:52 +0200
Subject: [PATCH 56/69] cms_form: add wizard.wiz_load_steps

Handy method to load all steps values at once
and merge them.
---
 cms_form/models/cms_form_wizard.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cms_form/models/cms_form_wizard.py b/cms_form/models/cms_form_wizard.py
index 0cfaa24a..3d1d74d7 100644
--- a/cms_form/models/cms_form_wizard.py
+++ b/cms_form/models/cms_form_wizard.py
@@ -193,6 +193,15 @@ def wiz_load_step(self, step=None):
         step = step or self.wiz_current_step()
         return self.wiz_storage_get()["steps"].get(step) or {}
 
+    def wiz_load_steps(self, steps=None):
+        """Load all steps data merged together."""
+        data = self.wiz_storage_get()["steps"]
+        steps = steps or data.keys()
+        res = {}
+        for step in steps:
+            res.update(data.get(step, {}))
+        return res
+
     def form_after_create_or_update(self, values, extra_values):
         step_values = self._prepare_step_values_to_store(values, extra_values)
         self.wiz_save_step(step_values)

From e4fdad2d49dad8bd58a6ff8ac7a69568afcf9cc5 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 13:57:16 +0200
Subject: [PATCH 57/69] cms_form: fix binary file value handling

---
 cms_form/models/widgets/widget_binary.py | 29 ++++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index 1f4c70d8..aace72e7 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -20,11 +20,7 @@ def w_load(self, **req_values):
         return self.binary_to_form(value, **req_values)
 
     def binary_to_form(self, value, **req_values):
-        _value = {
-            # 'value': '',
-            # 'raw_value': '',
-            # 'mimetype': '',
-        }
+        _value = None
         from_request = False
         if value:
             if isinstance(value, werkzeug.datastructures.FileStorage):
@@ -54,21 +50,24 @@ def form_to_binary(self, value, **req_values):
         if self.html_fname not in req_values:
             return None
         _value = False
-        keepcheck_flag = req_values.get(self.html_fname + "_keepcheck")
-        if not keepcheck_flag or keepcheck_flag == "yes":
+        keepcheck_flag_key = self.html_fname + "_keepcheck"
+        keepcheck_flag = req_values.get(keepcheck_flag_key)
+        # If no keepcheck flag is given the file or img is always replaced
+        if keepcheck_flag_key in req_values and keepcheck_flag == "yes":
             # no flag or flag marked as "keep current value"
             # prevent discarding image
             req_values.pop(self.html_fname, None)
-            req_values.pop(self.html_fname + "_keepcheck", None)
+            req_values.pop(keepcheck_flag_key, None)
             return None
         if value:
-            if hasattr(value, "read"):
-                file_content = value.read()
-                _value = base64.b64encode(file_content)
-                _value = pycompat.to_text(_value)
-            else:
-                # like 'data:image/jpeg;base64,jRyRuUm2VP...
-                _value = value.split(",")[-1]
+            _value = value
+            # TODO: move this to image widget
+            if isinstance(value, str):
+                if value.startswith("data:"):
+                    # like 'data:image/jpeg;base64,jRyRuUm2VP...
+                    _value = value.split(",")[-1]
+            elif isinstance(value, dict):
+                _value = value.get("value")
         return _value
 
     def w_check_empty_value(self, value, **req_values):

From f5b78c7b41b462135a3f52bab183f67ce7eb820f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 13:58:19 +0200
Subject: [PATCH 58/69] cms_form: fix widget.w_load none value

---
 cms_form/models/widgets/widget_mixin.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index b008870a..6b3ce232 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -87,6 +87,12 @@ def w_load(self, **req_values):
             value = self.w_record[self.w_fname] or value
         # maybe a POST request with new values: override item value
         value = req_values.get(self.html_fname, value)
+        if isinstance(value, str) and value == "None":
+            # Corner case for when field values are set as None in the request.
+            # Odoo request will convert the value to a string.
+            # Here we might have data stored in session (eg: wizards)
+            # or other kind of serialized value.
+            value = None
         return value
 
     def w_extract(self, **req_values):

From 49f3ba2512b6099de67df342fcb6ede5f47ce7b2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 14:31:56 +0200
Subject: [PATCH 59/69] cms_form: fix marshallers tests

---
 cms_form/tests/test_marshallers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/tests/test_marshallers.py b/cms_form/tests/test_marshallers.py
index 6ab6fbce..0311af2c 100644
--- a/cms_form/tests/test_marshallers.py
+++ b/cms_form/tests/test_marshallers.py
@@ -53,7 +53,7 @@ def test_marshal_float(self):
         self.assertEqual(marshalled["b"], 2.0)
         self.assertEqual(marshalled["c"], 3.0)
         self.assertEqual(marshalled["d"], 4.0)
-        self.assertEqual(marshalled["e"], "bad")
+        self.assertEqual(marshalled["e"], None)
 
     def test_marshal_dict(self):
         data = MultiDict(

From 4753bac6e24b09958f559007c9c54bd0001738ea Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 16:37:53 +0200
Subject: [PATCH 60/69] cms_form: fix marshaller cleanup

Original keys should be popped when transformed
---
 cms_form/marshallers.py                    | 6 +++++-
 cms_form/models/widgets/widget_binary.py   | 2 +-
 cms_form/models/widgets/widget_many2one.py | 2 +-
 cms_form/models/widgets/widget_mixin.py    | 4 ++--
 cms_form/models/widgets/widget_x2many.py   | 2 +-
 cms_form/tests/test_marshallers.py         | 3 +++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cms_form/marshallers.py b/cms_form/marshallers.py
index 1c107199..17488879 100644
--- a/cms_form/marshallers.py
+++ b/cms_form/marshallers.py
@@ -42,15 +42,19 @@ def _add_todo(self, orig_key, orig_value, *handlers):
         self.todos.append(Todo(okey=orig_key, oval=orig_value, handlers=handlers))
 
     def _collect_todo(self):
+        done = set()
         for k, v in self.req_values.items():
             if k in self.skip_keys:
                 continue
             for operator, handler in self._marshallers():
                 if k.endswith(operator):
                     self._add_todo(k, v, handler)
+                    done.add(k)
                     continue
             # plain
-            self._add_todo(k, v, self.marshal_plain)
+            if k not in done:
+                self._add_todo(k, v, self.marshal_plain)
+                done.add(k)
 
     def _marshallers(self):
         return (
diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index aace72e7..a42c1424 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -73,7 +73,7 @@ def form_to_binary(self, value, **req_values):
     def w_check_empty_value(self, value, **req_values):
         if isinstance(value, werkzeug.datastructures.FileStorage):
             has_value = bool(value.filename)
-            keep_flag = req_values.get(self.html_fname + "_keepcheck")
+            keep_flag = req_values.get(self.w_fname + "_keepcheck")
             if not has_value and keep_flag == "yes":
                 # no value, but we want to preserve existing one
                 return False
diff --git a/cms_form/models/widgets/widget_many2one.py b/cms_form/models/widgets/widget_many2one.py
index 621edbf6..62161ed1 100644
--- a/cms_form/models/widgets/widget_many2one.py
+++ b/cms_form/models/widgets/widget_many2one.py
@@ -61,7 +61,7 @@ class M2OMultiWidget(models.AbstractModel):
     def m2o_to_form(self, value, **req_values):
         if not value:
             return json.dumps([])
-        if isinstance(value, str) and value == req_values.get(self.html_fname):
+        if isinstance(value, str) and value == req_values.get(self.w_fname):
             value = self.w_comodel.browse(
                 # TODO: we should allow customizations of fields to read
                 self.w_ids_from_input(value)
diff --git a/cms_form/models/widgets/widget_mixin.py b/cms_form/models/widgets/widget_mixin.py
index 6b3ce232..09f34040 100644
--- a/cms_form/models/widgets/widget_mixin.py
+++ b/cms_form/models/widgets/widget_mixin.py
@@ -86,7 +86,7 @@ def w_load(self, **req_values):
         if self.w_record and self.w_fname in self.w_record:
             value = self.w_record[self.w_fname] or value
         # maybe a POST request with new values: override item value
-        value = req_values.get(self.html_fname, value)
+        value = req_values.get(self.w_fname, value)
         if isinstance(value, str) and value == "None":
             # Corner case for when field values are set as None in the request.
             # Odoo request will convert the value to a string.
@@ -97,7 +97,7 @@ def w_load(self, **req_values):
 
     def w_extract(self, **req_values):
         """Extract value from form submit."""
-        value = req_values.get(self.html_fname)
+        value = req_values.get(self.w_fname)
         if isinstance(value, str) and value == "None":
             # Corner case for when field values are set as None in the request.
             # Odoo request will convert the value to a string.
diff --git a/cms_form/models/widgets/widget_x2many.py b/cms_form/models/widgets/widget_x2many.py
index f665adbb..79d4087c 100644
--- a/cms_form/models/widgets/widget_x2many.py
+++ b/cms_form/models/widgets/widget_x2many.py
@@ -42,7 +42,7 @@ def x2many_to_form(self, value, **req_values):
             ids = value.ids
         elif isinstance(value, str):
             ids = self.w_ids_from_input(value)
-        req_val = self.w_ids_from_input(req_values.get(self.html_fname, ""))
+        req_val = self.w_ids_from_input(req_values.get(self.w_fname, ""))
         if req_val:
             # request value take precedence
             ids = req_val[:]
diff --git a/cms_form/tests/test_marshallers.py b/cms_form/tests/test_marshallers.py
index 0311af2c..940abe56 100644
--- a/cms_form/tests/test_marshallers.py
+++ b/cms_form/tests/test_marshallers.py
@@ -80,6 +80,7 @@ def test_marshal_esc(self):
         marshalled = marshallers.marshal_request_values(data)
         self.assertEqual(marshalled["a"], "&lt;span&gt;I&#x27;m bad&lt;/span&gt;")
         self.assertEqual(marshalled["b"], "<span>I'm bad but I don't care</span>")
+        self.assertNotIn("a:esc", marshalled)
 
     def test_marshal_dict_list(self):
         data = MultiDict(
@@ -108,3 +109,5 @@ def test_marshal_dict_list(self):
             ],
         )
         self.assertEqual(marshalled["c"], "3")
+        self.assertNotIn("b.1.x:dict:list", marshalled)
+        self.assertNotIn("b.2.y:dict:list", marshalled)

From f03043750508412977d9618bb6b550792178e79a Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 19 Sep 2023 16:56:47 +0200
Subject: [PATCH 61/69] cms_form: add :file marshaller

Rework file processing so that files come ready from request data.
---
 cms_form/marshallers.py                      | 51 +++++++++++++---
 cms_form/models/cms_form_mixin.py            | 21 ++++++-
 cms_form/models/widgets/widget_binary.py     | 62 ++++++++++----------
 cms_form/tests/test_marshallers.py           | 36 +++++++++++-
 cms_form/tests/utils.py                      | 10 +++-
 cms_form/tests/widgets/test_widget_binary.py | 53 +++++++++--------
 6 files changed, 168 insertions(+), 65 deletions(-)

diff --git a/cms_form/marshallers.py b/cms_form/marshallers.py
index 17488879..d78af851 100644
--- a/cms_form/marshallers.py
+++ b/cms_form/marshallers.py
@@ -1,26 +1,25 @@
 # Copyright 2018 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
+import base64
 import html
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any
 
+import werkzeug
+
+from odoo.tools import pycompat
+from odoo.tools.mimetypes import guess_mimetype
+
 from . import utils
 
 
 def marshal_request_values(values):
     """Transform given request values using marshallers.
 
-    Available marshallers:
-
-    * `:int` transform to integer
-    * `:float` transform to float
-    * `:list` transform to list of values
-    * `:dict` transform to dictionary of values
+    Available marshallers: see Marshaller class.
     """
-    # TODO: add docs
-    # TODO: support combinations like `:list:int` or `:dict:int`
     return Marshaller(values).marshall()
 
 
@@ -57,6 +56,8 @@ def _collect_todo(self):
                 done.add(k)
 
     def _marshallers(self):
+        # TODO: add docs
+        # TODO: support combinations like `:list:int` or `:dict:int`
         return (
             (":esc", self.marshal_esc),
             (":dict:list", self.marshal_dict_list),
@@ -64,6 +65,7 @@ def _marshallers(self):
             (":dict", self.marshal_dict),
             (":int", self.marshal_int),
             (":float", self.marshal_float),
+            (":file", self.marshal_file),
         )
 
     def marshall(self):
@@ -198,3 +200,36 @@ def parse_key(key):
                 item[inner_key] = value
             res.append(item)
         return main_key, res
+
+    def marshal_file(self, orig_key, orig_value):
+        k = orig_key[: -len(":file")]
+        value = orig_value
+        if isinstance(value, werkzeug.datastructures.FileStorage):
+            _value = self._filedata_from_filestorage(value)
+        else:
+            mimetype = guess_mimetype(value)
+            _value = {
+                "value": value,
+                "raw_value": value,
+                "mimetype": mimetype,
+                "content_type": mimetype,
+            }
+        _value["_from_request"] = True
+        return k, _value
+
+    @staticmethod
+    def _filedata_from_filestorage(fs):
+        raw_value = fs.read()
+        value = base64.b64encode(raw_value)
+        value = pycompat.to_text(value)
+        data = dict(raw_value=value, value=value)
+        for attr in (
+            "content_length",
+            "content_type",
+            "filename",
+            "headers",
+            "mimetype",
+            "mimetype_params",
+        ):
+            data[attr] = getattr(fs, attr)
+        return data
diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 6ea4e8cc..8fe887b9 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -502,7 +502,26 @@ def form_get_request_values(self):
         # normal fields
         res = marshallers.marshal_request_values(_values)
         # file fields
-        res.update({k: v for k, v in self.request.files.items()})
+        files = self.request.files
+        # Convert files always. Main reasons:
+        # * file descriptors will be consumed on 1st read.
+        #   If you access them again you won't find any info.
+        # * homegenous handling of files
+        # * no need to parse metadata down the stack as is done by the marshaller
+        parsed_files = getattr(self.request, "_cms_form_files_processed", None)
+        if files and not parsed_files:
+            _file_values = {}
+            _file_fields = self.form_file_fields
+            for fname, fobj in files.items():
+                if fname in _file_fields:
+                    # fake field name enforcing marshaller
+                    if not fname.endswith(":file"):
+                        fname = f"{fname}:file"
+                    _file_values[fname] = fobj
+            file_values = marshallers.marshal_request_values(_file_values)
+            self.request._cms_form_files_processed = file_values
+        elif parsed_files:
+            res.update(parsed_files)
         return res
 
     # TODO: rename to form_load
diff --git a/cms_form/models/widgets/widget_binary.py b/cms_form/models/widgets/widget_binary.py
index a42c1424..36036245 100644
--- a/cms_form/models/widgets/widget_binary.py
+++ b/cms_form/models/widgets/widget_binary.py
@@ -1,13 +1,11 @@
 # Copyright 2017 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
 
-import base64
 
 import werkzeug
 
 from odoo import fields, models
-from odoo.tools import pycompat
-from odoo.tools.mimetypes import guess_mimetype
+from odoo.tools.image import image_data_uri
 
 
 class BinaryWidget(models.AbstractModel):
@@ -15,33 +13,6 @@ class BinaryWidget(models.AbstractModel):
     _inherit = "cms.form.widget.mixin"
     _description = "CMS Form binary widget"
 
-    def w_load(self, **req_values):
-        value = super().w_load(**req_values)
-        return self.binary_to_form(value, **req_values)
-
-    def binary_to_form(self, value, **req_values):
-        _value = None
-        from_request = False
-        if value:
-            if isinstance(value, werkzeug.datastructures.FileStorage):
-                from_request = True
-                byte_content = value.read()
-                value = base64.b64encode(byte_content)
-                value = pycompat.to_text(value)
-            else:
-                value = pycompat.to_text(value)
-                byte_content = base64.b64decode(value)
-            mimetype = guess_mimetype(byte_content)
-            _value = {
-                "value": value,
-                "raw_value": value,
-                "mimetype": mimetype,
-                "from_request": from_request,
-            }
-            if mimetype.startswith("image/"):
-                _value["value"] = "data:{};base64,{}".format(mimetype, value)
-        return _value
-
     def w_extract(self, **req_values):
         value = super().w_extract(**req_values)
         return self.form_to_binary(value, **req_values)
@@ -91,6 +62,37 @@ class ImageWidget(models.AbstractModel):
 
     w_template = fields.Char(default="cms_form.field_widget_image")
 
+    def w_load(self, **req_values):
+        value = super().w_load(**req_values)
+        # TODO: can we get a dict here? Likely only when loading from request
+        if isinstance(value, dict) and value.get("mimetype", "").startswith("image/"):
+            val = (
+                value["value"].encode()
+                if isinstance(value["value"], str)
+                else value["value"]
+            )
+            value["value"] = image_data_uri(val)
+        elif isinstance(value, (str, bytes)):
+            bvalue = value
+            if isinstance(value, str):
+                bvalue = value.encode()
+            else:
+                value = value.decode()
+            if value.startswith("data:"):
+                raw_value = value.split(",")[-1]
+            else:
+                raw_value = value
+                value = image_data_uri(bvalue)
+            mimetype = value.split(";")[0].replace("data:", "")
+            value = {
+                "value": value,
+                "raw_value": raw_value,
+                "mimetype": mimetype,
+                "content_type": mimetype,
+                "content_lenght": len(raw_value),
+            }
+        return value
+
 
 class FileWidget(models.AbstractModel):
     _name = "cms.form.widget.binary"
diff --git a/cms_form/tests/test_marshallers.py b/cms_form/tests/test_marshallers.py
index 940abe56..d84c85f7 100644
--- a/cms_form/tests/test_marshallers.py
+++ b/cms_form/tests/test_marshallers.py
@@ -3,9 +3,10 @@
 
 import unittest
 
-from werkzeug.datastructures import MultiDict
+from werkzeug.datastructures import FileMultiDict, Headers, MultiDict
 
 from .. import marshallers
+from .utils import fake_file_from_request, file_as_stream
 
 
 class TestMarshallers(unittest.TestCase):
@@ -111,3 +112,36 @@ def test_marshal_dict_list(self):
         self.assertEqual(marshalled["c"], "3")
         self.assertNotIn("b.1.x:dict:list", marshalled)
         self.assertNotIn("b.2.y:dict:list", marshalled)
+
+    def test_marshal_file(self):
+        data = FileMultiDict()
+        content = b"a,b,c\n1,2,3\n4,5,6"
+        with file_as_stream(content) as stream:
+            data.add_file(
+                "one:file",
+                fake_file_from_request(
+                    "one",
+                    stream=stream,
+                    filename="one.csv",
+                    content_type="text/csv",
+                    content_length=len(content),
+                ),
+            )
+            marshalled = marshallers.marshal_request_values(data)
+        self.assertEqual(
+            marshalled["one"],
+            {
+                "_from_request": True,
+                "content_length": 17,
+                "content_type": "text/csv",
+                "filename": "one.csv",
+                "headers": Headers(
+                    [("Content-Type", "text/csv"), ("Content-Length", "17")]
+                ),
+                "mimetype": "text/csv",
+                "mimetype_params": {},
+                "raw_value": "YSxiLGMKMSwyLDMKNCw1LDY=",
+                "value": "YSxiLGMKMSwyLDMKNCw1LDY=",
+            },
+        )
+        self.assertNotIn("one:file", marshalled)
diff --git a/cms_form/tests/utils.py b/cms_form/tests/utils.py
index 4a71cfcc..cccd6479 100644
--- a/cms_form/tests/utils.py
+++ b/cms_form/tests/utils.py
@@ -109,13 +109,19 @@ def fake_session(env, **kw):
 
 
 @contextmanager
-def b64_as_stream(b64_content):
+def file_as_stream(content):
     stream = io.BytesIO()
-    stream.write(base64.b64decode(b64_content))
+    stream.write(content)
     stream.seek(0)
     yield stream
     stream.close()
 
 
+@contextmanager
+def b64_as_stream(b64_content):
+    with file_as_stream(base64.b64decode(b64_content)) as stream:
+        yield stream
+
+
 def fake_file_from_request(input_name, stream, **kw):
     return FileStorage(name=input_name, stream=stream, **kw)
diff --git a/cms_form/tests/widgets/test_widget_binary.py b/cms_form/tests/widgets/test_widget_binary.py
index 85227b3c..93d7fd5a 100644
--- a/cms_form/tests/widgets/test_widget_binary.py
+++ b/cms_form/tests/widgets/test_widget_binary.py
@@ -1,5 +1,6 @@
 # Copyright 2019 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
+from odoo.addons.cms_form.marshallers import Marshaller  # pylint: disable=W7950
 from odoo.addons.cms_form.tests.utils import (  # pylint: disable=W7950
     b64_as_stream,
     fake_file_from_request,
@@ -47,6 +48,10 @@ def setUpClass(cls):
         cls.partner = cls.env["res.partner"].search([], limit=1)
         cls.maxDiff = None
 
+    def setUp(self):
+        super().setUp()
+        self.form = fake_form(self.env, main_object=self.partner)
+
     # TODO: we have only an image widget ATM -> add a file widget and test it
     def test_widget_binary_base(self):
         w_name, w_field = fake_field(
@@ -99,7 +104,7 @@ def test_widget_binary_load_from_record(self):
             widget_model="cms.form.widget.image",
         )
         # test conversion
-        self.assertEqual(widget.w_load(image_1024=False), {})
+        self.assertEqual(widget.w_load(image_1024=False), False)
         # set value on partner image
         self.partner.image_1024 = TEST_IMAGE_GIF
         self.assertEqual(
@@ -108,7 +113,8 @@ def test_widget_binary_load_from_record(self):
                 "value": "data:image/png;base64,{}".format(TEST_IMAGE_GIF),
                 "raw_value": TEST_IMAGE_GIF,
                 "mimetype": "image/png",
-                "from_request": False,
+                "content_type": "image/png",
+                "content_lenght": len(TEST_IMAGE_GIF),
             },
         )
 
@@ -124,24 +130,23 @@ def test_widget_binary_load_from_request(self):
             widget_model="cms.form.widget.image",
         )
         # test conversion
-        self.assertEqual(widget.w_load(image_1024=False), {})
+        self.assertEqual(widget.w_load(image_1024=False), False)
 
         with b64_as_stream(TEST_IMAGE_JPG) as stream:
-            req_image = fake_file_from_request(
-                "image_1024",
-                stream=stream,
-                filename="foo.jpg",
-                content_type="image/jpeg",
+            req_image = Marshaller._filedata_from_filestorage(
+                fake_file_from_request(
+                    "image_1024",
+                    stream=stream,
+                    filename="foo.jpg",
+                    content_type="image/jpeg",
+                )
             )
-            self.assertEqual(
-                widget.w_load(image_1024=req_image),
-                {
-                    "value": "data:image/jpeg;base64,{}".format(TEST_IMAGE_JPG),
-                    "raw_value": TEST_IMAGE_JPG,
-                    "mimetype": "image/jpeg",
-                    "from_request": True,
-                },
+            res = widget.w_load(image_1024=req_image)
+            expected = dict(
+                req_image, value="data:image/jpg;base64,{}".format(TEST_IMAGE_JPG)
             )
+            for k, v in res.items():
+                self.assertEqual(v, expected[k], f"{k} not matching")
 
     def test_widget_binary_extract_string(self):
         w_name, w_field = fake_field(
@@ -160,7 +165,7 @@ def test_widget_binary_extract_string(self):
         # req value can come as string
         req_val = "data:image/jpeg;base64,{}".format(TEST_IMAGE_JPG)
         # value in request but no check flag -> None
-        self.assertEqual(widget.w_extract(image=req_val), None)
+        self.assertEqual(widget.w_extract(image=req_val), TEST_IMAGE_JPG)
         # value in request but keep flag is ON -> None
         self.assertEqual(widget.w_extract(image=req_val, image_keepcheck="yes"), None)
         # value in request but keep flag is ON -> None
@@ -183,14 +188,16 @@ def test_widget_binary_extract_filestorage(self):
 
         # value in request but no check flag -> None
         with b64_as_stream(TEST_IMAGE_JPG) as stream:
-            req_val = fake_file_from_request(
-                "image",
-                stream=stream,
-                filename="foo.jpg",
-                content_type="image/jpeg",
+            req_image = Marshaller._filedata_from_filestorage(
+                fake_file_from_request(
+                    "image",
+                    stream=stream,
+                    filename="foo.jpg",
+                    content_type="image/jpeg",
+                )
             )
             self.assertEqual(
-                widget.w_extract(image=req_val, image_keepcheck="no"),
+                widget.w_extract(image=req_image, image_keepcheck="no"),
                 TEST_IMAGE_JPG,
             )
 

From 87652e81c800dd0bcdfc0cf7bb8fa2bee5cf72a2 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:18:09 +0200
Subject: [PATCH 62/69] cms_form: prevent deprecate warning on perm tests

---
 cms_form/tests/test_form_permission.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms_form/tests/test_form_permission.py b/cms_form/tests/test_form_permission.py
index fdd18da7..a16457b4 100644
--- a/cms_form/tests/test_form_permission.py
+++ b/cms_form/tests/test_form_permission.py
@@ -56,7 +56,7 @@ def test_form_check_permission_cannot_create(self):
                 msg = (
                     "You are not allowed to create any record " "for the model `%s`."
                 ) % self.FakePubModel._name
-                self.assertEqual(err.name, msg)
+                self.assertEqual(err.args[0], msg)
 
     def test_form_check_permission_can_edit(self):
         form = self.get_form(self.FakePubModelForm._name, main_object=self.record)
@@ -77,7 +77,7 @@ def test_form_check_permission_cannot_edit(self):
                     self.record._name,
                     self.record.id,
                 )
-                self.assertEqual(err.name, msg)
+                self.assertEqual(err.args[0], msg)
 
     def test_form_check_permission_no_ws_mixin_can_create(self):
         form = self.get_form(self.FakeNonPubModelForm._name, main_object=None)

From e5270d085e4616f65e22d3f77d066c28c24c6b1c Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:21:42 +0200
Subject: [PATCH 63/69] cms_form: improve utils.safe_to_float

---
 cms_form/tests/test_utils.py | 2 +-
 cms_form/utils.py            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cms_form/tests/test_utils.py b/cms_form/tests/test_utils.py
index 1e46584f..1eac3b6a 100644
--- a/cms_form/tests/test_utils.py
+++ b/cms_form/tests/test_utils.py
@@ -19,7 +19,7 @@ def test_safe_to_float(self):
         self.assertEqual(utils.safe_to_float(""), None)
         self.assertEqual(utils.safe_to_float(False), 0.0)
         self.assertEqual(utils.safe_to_float("abc"), None)
-        self.assertEqual(utils.safe_to_float("10,0"), None)
+        self.assertEqual(utils.safe_to_float("10,0"), 10.0)
         self.assertEqual(utils.safe_to_float("10.0"), 10.0)
         self.assertEqual(utils.safe_to_float("0"), 0.0)
         self.assertEqual(utils.safe_to_float("10"), 10.0)
diff --git a/cms_form/utils.py b/cms_form/utils.py
index be13276f..0265de19 100644
--- a/cms_form/utils.py
+++ b/cms_form/utils.py
@@ -11,6 +11,8 @@ def safe_to_integer(value, **kw):
 
 
 def safe_to_float(value, **kw):
+    if value is False:
+        return 0.0
     try:
         return float(value.replace(",", "."))
     except (ValueError, TypeError, AttributeError):

From 969c2ab9d883e9f09ffadc66a39e713550d83719 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:22:43 +0200
Subject: [PATCH 64/69] cms_form: form_load_defaults use form_data if available

It's useless to reload defaults when they are already loaded in form_data
or overridden by specific values passed for form_data at form_init.
---
 cms_form/models/cms_form_mixin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cms_form/models/cms_form_mixin.py b/cms_form/models/cms_form_mixin.py
index 8fe887b9..4e61324e 100644
--- a/cms_form/models/cms_form_mixin.py
+++ b/cms_form/models/cms_form_mixin.py
@@ -534,6 +534,8 @@ def form_load_defaults(self, main_object=None, request_values=None):
         1. `main_object` fields' values (if an existing main_object is passed)
         2. request parameters (only parameters matching form fields names)
         """
+        if self.form_data:
+            return self.form_data
         main_object = main_object or self.main_object
         request_values = request_values or self.form_get_request_values()
         defaults = request_values.copy()

From 8da3c91d0bb508b9ba580f4e7ea121bfdf2a3143 Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:34:50 +0200
Subject: [PATCH 65/69] cms_form: fix number tests

---
 cms_form/tests/test_marshallers.py            | 2 +-
 cms_form/tests/widgets/test_widget_float.py   | 2 +-
 cms_form/tests/widgets/test_widget_integer.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cms_form/tests/test_marshallers.py b/cms_form/tests/test_marshallers.py
index d84c85f7..339bb016 100644
--- a/cms_form/tests/test_marshallers.py
+++ b/cms_form/tests/test_marshallers.py
@@ -37,7 +37,7 @@ def test_marshal_int(self):
         self.assertEqual(marshalled["a"], "1")
         self.assertEqual(marshalled["b"], 2)
         self.assertEqual(marshalled["c"], 3)
-        self.assertEqual(marshalled["d"], "bad")
+        self.assertEqual(marshalled["d"], None)
 
     def test_marshal_float(self):
         data = MultiDict(
diff --git a/cms_form/tests/widgets/test_widget_float.py b/cms_form/tests/widgets/test_widget_float.py
index 4426f52c..fc874aa4 100644
--- a/cms_form/tests/widgets/test_widget_float.py
+++ b/cms_form/tests/widgets/test_widget_float.py
@@ -51,5 +51,5 @@ def test_widget_float_input_required(self):
     def test_widget_float_input_extract(self):
         self.assertEqual(self.widget.w_extract(a_float_field="1"), 1.0)
         self.assertEqual(self.widget.w_extract(a_float_field="2.0"), 2.0)
-        self.assertEqual(self.widget.w_extract(a_float_field="2,0"), None)
+        self.assertEqual(self.widget.w_extract(a_float_field="2,0"), 2.0)
         self.assertEqual(self.widget.w_extract(a_float_field=""), None)
diff --git a/cms_form/tests/widgets/test_widget_integer.py b/cms_form/tests/widgets/test_widget_integer.py
index 0deddf1b..fd3c371d 100644
--- a/cms_form/tests/widgets/test_widget_integer.py
+++ b/cms_form/tests/widgets/test_widget_integer.py
@@ -23,7 +23,7 @@ def setUp(self):
 
     def test_widget_integer_input(self):
         expected_attrs = {
-            "type": "text",
+            "type": "number",
             "id": "an_int_field",
             "name": "an_int_field",
             "placeholder": "An int field...",
@@ -35,7 +35,7 @@ def test_widget_integer_input(self):
     def test_widget_integer_input_required(self):
         self.widget.w_field["required"] = True
         expected_attrs = {
-            "type": "text",
+            "type": "number",
             "id": "an_int_field",
             "name": "an_int_field",
             "placeholder": "An int field...",

From bcfbd6dae89adf860a0919c9ebb0b764863911ca Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:35:31 +0200
Subject: [PATCH 66/69] cms_form: fix x2m tests

---
 cms_form/tests/widgets/test_widget_many2one.py | 5 +++--
 cms_form/tests/widgets/test_widget_x2many.py   | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cms_form/tests/widgets/test_widget_many2one.py b/cms_form/tests/widgets/test_widget_many2one.py
index fed38f01..39a4c34e 100644
--- a/cms_form/tests/widgets/test_widget_many2one.py
+++ b/cms_form/tests/widgets/test_widget_many2one.py
@@ -13,9 +13,10 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
-        self.form = fake_form(self.env,
+        self.form = fake_form(
+            self.env,
             # fake defaults
-            m2o_field=cls.partners.ids[0],
+            m2o_field=self.partners.ids[0],
         )
 
     def test_widget_many2one_base(self):
diff --git a/cms_form/tests/widgets/test_widget_x2many.py b/cms_form/tests/widgets/test_widget_x2many.py
index 99e065dd..3c1ab691 100644
--- a/cms_form/tests/widgets/test_widget_x2many.py
+++ b/cms_form/tests/widgets/test_widget_x2many.py
@@ -17,7 +17,7 @@ def setUp(self):
             self.env,
             # fake defaults
             # behavior of o2m or m2m ATM is the same
-            m2m_field=cls.partners.ids[0:2],
+            m2m_field=self.partners.ids[0:2],
         )
 
     def test_widget_x2many_base(self):
@@ -128,6 +128,9 @@ def test_widget_x2many_base_extract(self):
             widget_model="cms.form.widget.many2many",
         )
         # test conversion
+        self.assertEqual(widget.w_extract(m2m_field="1,2,3"), [(6, False, [1, 2, 3])])
+        self.assertEqual(widget.w_extract(m2m_field=""), [(5,)])
+        self.form.form_extract_value_mode = "read"
         self.assertEqual(widget.w_extract(m2m_field="1,2,3"), [1, 2, 3])
 
     def test_widget_x2many_load_no_value(self):

From c238044fc340a81b71165bae2187825f92b2b36f Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Wed, 20 Sep 2023 15:35:56 +0200
Subject: [PATCH 67/69] cms_form: fix form base test default

---
 cms_form/tests/widgets/test_widget_base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms_form/tests/widgets/test_widget_base.py b/cms_form/tests/widgets/test_widget_base.py
index a3ba01fe..8cefeb10 100644
--- a/cms_form/tests/widgets/test_widget_base.py
+++ b/cms_form/tests/widgets/test_widget_base.py
@@ -31,7 +31,7 @@ def test_widget_init(self):
         self.assertEqual(widget.w_form_values, form.form_data)
         self.assertEqual(widget.w_fname, "custom")
         self.assertDictEqual(widget.w_field, field)
-        self.assertEqual(widget.w_field_value, False)
+        self.assertEqual(widget.w_field_value, "oh yeah!")
         self.assertEqual(widget.w_data, {})
         self.assertEqual(widget.w_subfields, {})
 

From 310acb1d2d03a34ed7b5f968d79d66a306af400a Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Fri, 22 Sep 2023 13:28:14 +0200
Subject: [PATCH 68/69] cms_form: fix master/slave js handle required

The field wrapper should toggle the required class.
---
 cms_form/static/src/js/master_slave.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cms_form/static/src/js/master_slave.js b/cms_form/static/src/js/master_slave.js
index fd7c95fd..3cb7f2b6 100644
--- a/cms_form/static/src/js/master_slave.js
+++ b/cms_form/static/src/js/master_slave.js
@@ -76,10 +76,16 @@ odoo.define("cms_form.master_slave", function (require) {
                 .removeClass("disabled");
         },
         handle_required: function (slave_fname) {
-            $('[name="' + slave_fname + '"]').attr("required", "required");
+            $('[name="' + slave_fname + '"]')
+                .attr("required", "required")
+                .closest(".form-group")
+                .addClass("field-required");
         },
         handle_no_required: function (slave_fname) {
-            $('[name="' + slave_fname + '"]').attr("required", null);
+            $('[name="' + slave_fname + '"]')
+                .attr("required", null)
+                .closest(".form-group")
+                .removeClass("field-required");
         },
     });
 });

From ec17594c9b97fba96716db7ff89ebdd907d5ebce Mon Sep 17 00:00:00 2001
From: Simone Orsi <simahawk@gmail.com>
Date: Tue, 31 Oct 2023 15:57:13 +0100
Subject: [PATCH 69/69] cms_form: fix linting

---
 cms_form/templates/form.xml                              | 4 ++++
 cms_form/templates/widgets.xml                           | 1 +
 cms_form/tests/fake_models/fake_fields_form_fieldsets.py | 2 +-
 cms_form/tests/fake_models/fake_nonpub_model_form.py     | 2 +-
 cms_form/tests/fake_models/fake_partner_form.py          | 2 +-
 cms_form/tests/fake_models/fake_pub_model_form.py        | 2 +-
 cms_form/tests/fake_models/fake_search_partner_form.py   | 2 +-
 cms_form/tests/fake_models/fake_wizard_form.py           | 2 +-
 cms_form/tests/widgets/test_widget_binary.py             | 4 ++--
 9 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cms_form/templates/form.xml b/cms_form/templates/form.xml
index 284f11c3..aaf123bf 100644
--- a/cms_form/templates/form.xml
+++ b/cms_form/templates/form.xml
@@ -233,6 +233,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         name="CMS search form wrapper"
         inherit_id="cms_form.form_wrapper"
         primary="True"
+        priority="100"
     >
         <xpath expr="//t[@t-out]" position="replace">
             <t t-if="form.form_show_search_form">
@@ -256,6 +257,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         name="CMS search form buttons"
         inherit_id="cms_form.base_form_buttons"
         primary="True"
+        priority="100"
     >
         <xpath expr="//div[hasclass('form-controls')]" position="replace">
             <div class="form-group form-controls">
@@ -270,6 +272,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         name="CMS form pager"
         inherit_id="portal.pager"
         primary="True"
+        priority="100"
     >
         <xpath expr="./ul/li[1]/a" position="attributes">
             <attribute name="t-att-data-page">
@@ -355,6 +358,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         name="CMS wizard form buttons"
         inherit_id="cms_form.base_form_buttons"
         primary="True"
+        priority="100"
     >
         <xpath expr="//div[hasclass('form-controls')]" position="replace">
             <div class="form-group form-controls">
diff --git a/cms_form/templates/widgets.xml b/cms_form/templates/widgets.xml
index c7a8416d..56d0df3a 100644
--- a/cms_form/templates/widgets.xml
+++ b/cms_form/templates/widgets.xml
@@ -69,6 +69,7 @@ License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
         name="CMS form selection field widget"
         inherit_id="cms_form.field_widget_m2o"
         primary="True"
+        priority="100"
     >
         <xpath expr="//t[@t-foreach]/option" position="replace">
             <option
diff --git a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
index ab27a64d..f039205a 100644
--- a/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
+++ b/cms_form/tests/fake_models/fake_fields_form_fieldsets.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 
 class FakeFieldsFormWithFieldsets(models.AbstractModel):
diff --git a/cms_form/tests/fake_models/fake_nonpub_model_form.py b/cms_form/tests/fake_models/fake_nonpub_model_form.py
index 5f50bc95..6a606f52 100644
--- a/cms_form/tests/fake_models/fake_nonpub_model_form.py
+++ b/cms_form/tests/fake_models/fake_nonpub_model_form.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 
 class FakeNonPubModel(models.Model):
diff --git a/cms_form/tests/fake_models/fake_partner_form.py b/cms_form/tests/fake_models/fake_partner_form.py
index 039fbfa0..4943763a 100644
--- a/cms_form/tests/fake_models/fake_partner_form.py
+++ b/cms_form/tests/fake_models/fake_partner_form.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 
 class FakePartnerForm(models.AbstractModel):
diff --git a/cms_form/tests/fake_models/fake_pub_model_form.py b/cms_form/tests/fake_models/fake_pub_model_form.py
index 983876bb..15c3c7d8 100644
--- a/cms_form/tests/fake_models/fake_pub_model_form.py
+++ b/cms_form/tests/fake_models/fake_pub_model_form.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 
 class FakePubModel(models.Model):
diff --git a/cms_form/tests/fake_models/fake_search_partner_form.py b/cms_form/tests/fake_models/fake_search_partner_form.py
index 62ca0e74..97f0b321 100644
--- a/cms_form/tests/fake_models/fake_search_partner_form.py
+++ b/cms_form/tests/fake_models/fake_search_partner_form.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 TEST_RECORD_IDS = []
 
diff --git a/cms_form/tests/fake_models/fake_wizard_form.py b/cms_form/tests/fake_models/fake_wizard_form.py
index c0c19ead..3ac6f021 100644
--- a/cms_form/tests/fake_models/fake_wizard_form.py
+++ b/cms_form/tests/fake_models/fake_wizard_form.py
@@ -3,7 +3,7 @@
 
 from odoo import fields, models
 
-from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W7950
+from odoo.addons.cms_form.models.fields import Serialized  # pylint: disable=W8150
 
 
 class FakeWiz(models.AbstractModel):
diff --git a/cms_form/tests/widgets/test_widget_binary.py b/cms_form/tests/widgets/test_widget_binary.py
index 93d7fd5a..09be988b 100644
--- a/cms_form/tests/widgets/test_widget_binary.py
+++ b/cms_form/tests/widgets/test_widget_binary.py
@@ -1,7 +1,7 @@
 # Copyright 2019 Simone Orsi
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
-from odoo.addons.cms_form.marshallers import Marshaller  # pylint: disable=W7950
-from odoo.addons.cms_form.tests.utils import (  # pylint: disable=W7950
+from odoo.addons.cms_form.marshallers import Marshaller  # pylint: disable=W8150
+from odoo.addons.cms_form.tests.utils import (  # pylint: disable=W8150
     b64_as_stream,
     fake_file_from_request,
 )