From fa50fb92770a15e8b93d1b9fbe667c8574833e60 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Mon, 22 May 2023 15:35:32 +0000
Subject: [PATCH] [FIX] project: alignment issue

X-original-commit: 43cf1e63e757ffab84fd411a210281b49fd3a0d9
Part-of: odoo/odoo#122111
---
 addons/project/views/project_update_views.xml |  2 +-
 addons/survey/views/survey_question_views.xml | 44 +++++++++----------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/addons/project/views/project_update_views.xml b/addons/project/views/project_update_views.xml
index 4a153f0823c..8c38443b71a 100644
--- a/addons/project/views/project_update_views.xml
+++ b/addons/project/views/project_update_views.xml
@@ -75,7 +75,7 @@
                             <div class="o_kanban_detail_ungrouped row">
                                 <div class="col-sm-4 col-6 o_pupdate_name">
                                     <b><field name="name_cropped"/></b>
-                                    <div>
+                                    <div class="d-flex gap-1">
                                         <field name="user_id" widget="many2one_avatar_user"/>
                                         <t t-esc="record.user_id.value"/>
                                     </div>
diff --git a/addons/survey/views/survey_question_views.xml b/addons/survey/views/survey_question_views.xml
index 2015ccd81b8..59abaa8740d 100644
--- a/addons/survey/views/survey_question_views.xml
+++ b/addons/survey/views/survey_question_views.xml
@@ -143,31 +143,27 @@
                                     </div>
                                 </group>
                             </group>
-                            <group attrs="{'invisible': [('question_type', 'not in', ['simple_choice', 'multiple_choice', 'matrix'])]}">
-                                <field name="suggested_answer_ids" context="{'default_question_id': active_id}" nolabel="1" colspan="2">
-                                    <tree editable="bottom">
-                                        <field name="sequence" widget="handle"/>
-                                        <field name="value" string="Choices"/>
-                                        <field name="is_correct"
-                                            attrs="{'column_invisible': ['|', ('parent.scoring_type', '=', 'no_scoring'), ('parent.question_type', '=', 'matrix')]}"/>
-                                        <field name="answer_score"
-                                            attrs="{'column_invisible': ['|', ('parent.scoring_type', '=', 'no_scoring'), ('parent.question_type', '=', 'matrix')]}"/>
-                                        <field name="value_image_filename" invisible="1"/>
-                                        <field name="value_image" width="200px" filename="value_image_filename" options="{'accepted_file_extensions': 'image/*'}"
-                                            attrs="{'column_invisible': [('parent.question_type', '=', 'matrix')]}"/>
-                                    </tree>
-                                </field>
-                            </group>
+                            <field name="suggested_answer_ids" context="{'default_question_id': active_id}" attrs="{'invisible': [('question_type', 'not in', ['simple_choice', 'multiple_choice', 'matrix'])]}">
+                                <tree editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="value" string="Choices"/>
+                                    <field name="is_correct"
+                                        attrs="{'column_invisible': ['|', ('parent.scoring_type', '=', 'no_scoring'), ('parent.question_type', '=', 'matrix')]}"/>
+                                    <field name="answer_score"
+                                        attrs="{'column_invisible': ['|', ('parent.scoring_type', '=', 'no_scoring'), ('parent.question_type', '=', 'matrix')]}"/>
+                                    <field name="value_image_filename" invisible="1"/>
+                                    <field name="value_image" width="200px" filename="value_image_filename" options="{'accepted_file_extensions': 'image/*'}"
+                                        attrs="{'column_invisible': [('parent.question_type', '=', 'matrix')]}"/>
+                                </tree>
+                            </field>
 
-                            <group attrs="{'invisible': [('question_type', '!=', 'matrix')]}">
-                                <field name="matrix_row_ids" context="{'default_matrix_question_id': active_id}"
-                                    attrs="{'invisible': [('question_type', '!=', 'matrix')]}" nolabel="1" colspan="2">
-                                    <tree editable="bottom">
-                                        <field name="sequence" widget="handle"/>
-                                        <field name="value" string="Rows"/>
-                                    </tree>
-                                </field>
-                            </group>
+                            <field name="matrix_row_ids" context="{'default_matrix_question_id': active_id}"
+                                attrs="{'invisible': [('question_type', '!=', 'matrix')]}">
+                                <tree editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="value" string="Rows"/>
+                                </tree>
+                            </field>
                         </page>
                         <page string="Description" name="survey_description">
                             <field name="description" widget="html"