From a672c354c4e2f9b2d2387d57847c6281faa12606 Mon Sep 17 00:00:00 2001
From: Lucas Perais <lpe@odoo.com>
Date: Thu, 6 Oct 2022 12:39:11 +0000
Subject: [PATCH] [FIX] data_recycle: adapt form views to grid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, the frequency fields were not aligned. This is due to the
new CSS grid system in the form views for inner groups.

This commit reorganize the arch itself to have the the relevant fields and their business
modifiers in the same cell of the inner group. It not only makes sense technically, it does so
in business terms as well.

closes odoo/odoo#102578

X-original-commit: d4118297dd6116fbd2ccefe27b09e9e4b7d5b412
Related: odoo/enterprise#32475
Signed-off-by: Adrien Dieudonné (adr) <adr@odoo.com>
---
 .../views/data_recycle_model_views.xml            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/data_recycle/views/data_recycle_model_views.xml b/addons/data_recycle/views/data_recycle_model_views.xml
index e4bffad3b92..cfd965ff2d2 100644
--- a/addons/data_recycle/views/data_recycle_model_views.xml
+++ b/addons/data_recycle/views/data_recycle_model_views.xml
@@ -47,13 +47,14 @@
                                 <field name="include_archived" attrs="{'invisible': [('recycle_action', '!=', 'unlink')]}"/>
 
                                 <!-- Manual cleaning -->
-                                <field name="notify_user_ids" widget="many2many_tags" attrs="{'invisible': [('recycle_mode', '=', 'automatic')]}" options="{'no_create': True, 'no_edit': True}" domain="[('share', '=', False)]" />
-
-                                <label for="notify_frequency" invisible="1" />
-                                <div class="o_row" attrs="{'invisible': ['|', ('recycle_mode', '=', 'automatic'), ('notify_user_ids', '=', [])]}">
-                                    <span class="me-1">Every</span>
-                                    <field name="notify_frequency" attrs="{'required': [('notify_user_ids', '!=', [])]}" />
-                                    <field name="notify_frequency_period" attrs="{'required': [('notify_user_ids', '!=', [])]}" />
+                                <label for="notify_user_ids" attrs="{'invisible': [('recycle_mode', '=', 'automatic')]}" />
+                                <div attrs="{'invisible': [('recycle_mode', '=', 'automatic')]}">
+                                    <field name="notify_user_ids" widget="many2many_tags"  options="{'no_create': True, 'no_edit': True}" domain="[('share', '=', False)]" nolabel="1"/>
+                                    <div class="d-flex w-25" attrs="{'invisible': [('notify_user_ids', '=', [])]}">
+                                        <span class="me-1">Every</span>
+                                        <field name="notify_frequency" attrs="{'required': [('notify_user_ids', '!=', [])]}" />
+                                        <field name="notify_frequency_period" attrs="{'required': [('notify_user_ids', '!=', [])]}" />
+                                    </div>
                                 </div>
                             </group>
                         </group>