diff --git a/i18n/fr.po b/i18n/fr.po
new file mode 100644
index 0000000000000000000000000000000000000000..2f46898980ef6e4bb2d50dd416e0c34ff34924f4
--- /dev/null
+++ b/i18n/fr.po
@@ -0,0 +1,175 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* solagro_website_event_partner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-08-14 12:36+0000\n"
+"PO-Revision-Date: 2024-08-14 12:36+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/controllers/website_event.py:0
+#: code:addons/solagro_website_event_partner/controllers/website_event.py:0
+#, python-format
+msgid "Answer not in event."
+msgstr "Réponse non présente dans l'évènement."
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__is_mandatory_answer
+msgid "Answer required"
+msgstr "Réponse obligatoire"
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__company_id
+msgid "Company"
+msgstr "Société"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__field_id
+msgid "Corresponding field"
+msgstr "Champ lié"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__create_uid
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__create_uid
+msgid "Created by"
+msgstr "Créé par"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__create_date
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__create_date
+msgid "Created on"
+msgstr "Créé le"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__display_name
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__display_name
+msgid "Display Name"
+msgstr "Nom"
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_event
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__event_id
+msgid "Event"
+msgstr "Évènement"
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_partner_fields
+msgid "Event Partner Field"
+msgstr "Champ lié de contact sur l'évènement"
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_type
+msgid "Event Template"
+msgstr "Modèle d'événement"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__event_type_id
+msgid "Event Type"
+msgstr "Modèle d'évènement"
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_partner_question
+msgid "Event question related to partner field"
+msgstr "Question liée à un contact sur un évènement"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_res_company__partner_event_field_ids
+msgid "Fields for partner related questions on Events"
+msgstr "Champs pour questions liées à un contact sur les évènements"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__id
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__id
+msgid "ID"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields____last_update
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question____last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__write_uid
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__write_uid
+msgid "Last Updated by"
+msgstr "Dernière modification par"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__write_date
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__write_date
+msgid "Last Updated on"
+msgstr "Date de dernière modification :"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__ir_field_id
+msgid "Model Field"
+msgstr "Champ du modèle"
+
+#. module: solagro_website_event_partner
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.registration_event_partner_question
+msgid "No"
+msgstr "Non"
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_event__partner_question_ids
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_type__partner_question_ids
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.event_event_form
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.event_type_form
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.res_company_form
+msgid "Partner Related Questions"
+msgstr "Questions liées à un contact"
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#, python-format
+msgid "Question cannot be linked to both an Event and an Event Type."
+msgstr "Une question ne peut pas être liée à la fois à un évènement et un modèle d'évènement."
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__sequence
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#: model:ir.model.constraint,message:solagro_website_event_partner.constraint_event_partner_question__uniq_event_partner_question
+#, python-format
+msgid "This field is present more than once in event questions."
+msgstr "Ce champ est présent plusieurs fois dans les questions liées à un contact de l'évènement."
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#: model:ir.model.constraint,message:solagro_website_event_partner.constraint_event_partner_question__uniq_event_type_partner_question
+#, python-format
+msgid "This field is present more than once in event type questions."
+msgstr "Ce champ est présent plusieurs fois dans les questions liées à un contact du modèle d'évènement."
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__title
+msgid "Title"
+msgstr "Titre"
+
+#. module: solagro_website_event_partner
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.registration_event_partner_question
+msgid "Yes"
+msgstr "Oui"
+
diff --git a/i18n/solagro_website_event_partner.pot b/i18n/solagro_website_event_partner.pot
new file mode 100644
index 0000000000000000000000000000000000000000..bf198736683c87ea808e2150620042d9d683f09f
--- /dev/null
+++ b/i18n/solagro_website_event_partner.pot
@@ -0,0 +1,174 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* solagro_website_event_partner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-08-14 12:36+0000\n"
+"PO-Revision-Date: 2024-08-14 12:36+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/controllers/website_event.py:0
+#: code:addons/solagro_website_event_partner/controllers/website_event.py:0
+#, python-format
+msgid "Answer not in event."
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__is_mandatory_answer
+msgid "Answer required"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__company_id
+msgid "Company"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__field_id
+msgid "Corresponding field"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__create_uid
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__create_date
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__display_name
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_event
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__event_id
+msgid "Event"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_partner_fields
+msgid "Event Partner Field"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_type
+msgid "Event Template"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__event_type_id
+msgid "Event Type"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model,name:solagro_website_event_partner.model_event_partner_question
+msgid "Event question related to partner field"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_res_company__partner_event_field_ids
+msgid "Fields for partner related questions on Events"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__id
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__id
+msgid "ID"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields____last_update
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__write_uid
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__write_date
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_fields__ir_field_id
+msgid "Model Field"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.registration_event_partner_question
+msgid "No"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_event__partner_question_ids
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_type__partner_question_ids
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.event_event_form
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.event_type_form
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.res_company_form
+msgid "Partner Related Questions"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#, python-format
+msgid "Question cannot be linked to both an Event and an Event Type."
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#: model:ir.model.constraint,message:solagro_website_event_partner.constraint_event_partner_question__uniq_event_partner_question
+#, python-format
+msgid "This field is present more than once in event questions."
+msgstr ""
+
+#. module: solagro_website_event_partner
+#. odoo-python
+#: code:addons/solagro_website_event_partner/models/event_partner_question.py:0
+#: model:ir.model.constraint,message:solagro_website_event_partner.constraint_event_partner_question__uniq_event_type_partner_question
+#, python-format
+msgid "This field is present more than once in event type questions."
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model:ir.model.fields,field_description:solagro_website_event_partner.field_event_partner_question__title
+msgid "Title"
+msgstr ""
+
+#. module: solagro_website_event_partner
+#: model_terms:ir.ui.view,arch_db:solagro_website_event_partner.registration_event_partner_question
+msgid "Yes"
+msgstr ""
diff --git a/models/event.py b/models/event.py
index 975fde45ca2fd270eb75e1d9a1c2e51a25cfcc02..5ba6009ad77e038c33a56fe1217d77172783870c 100644
--- a/models/event.py
+++ b/models/event.py
@@ -11,7 +11,7 @@ class Event(models.Model):
     partner_question_ids = fields.One2many(
         comodel_name="event.partner.question",
         inverse_name="event_id",
-        string="Questions du contact",
+        string="Partner Related Questions",
         copy=True,
     )
 
diff --git a/models/event_partner_fields.py b/models/event_partner_fields.py
index 45089bcdc2d66c87e645155c44205bf4a13f7047..6e58e841f7b0e6336c81a6d64ec2dced28ec7213 100644
--- a/models/event_partner_fields.py
+++ b/models/event_partner_fields.py
@@ -13,13 +13,13 @@ class EventPartnerFields(models.Model):
     display_name = fields.Char(compute="_compute_display_name")
     company_id = fields.Many2one(
         comodel_name="res.company",
-        string="Société",
+        string="Company",
         ondelete="cascade",
         required=True,
     )
     ir_field_id = fields.Many2one(
         comodel_name="ir.model.fields",
-        string="Champ du modèle",
+        string="Model Field",
         domain="[('readonly', '=', False), ('store', '=', True), "
         "('model_id', '=', 'res.partner'), "
         "('ttype', 'in', ['char', 'text', 'date', 'integer', 'float', 'boolean', "
diff --git a/models/event_partner_question.py b/models/event_partner_question.py
index d87d8e269e99c2a10e2b46ba0d346c08a75b5c32..4da0ac7778ab27aa2c43d55965d3cb6895ca57c5 100644
--- a/models/event_partner_question.py
+++ b/models/event_partner_question.py
@@ -19,14 +19,14 @@ class EventPartnerQuestion(models.Model):
         comodel_name="event.type", string="Event Type", ondelete="cascade"
     )
     event_id = fields.Many2one(
-        comodel_name="event.event", string="Evènement", ondelete="cascade"
+        comodel_name="event.event", string="Event", ondelete="cascade"
     )
     is_mandatory_answer = fields.Boolean(
-        "Réponse obligatoire",
+        "Answer required",
     )
     field_id = fields.Many2one(
         comodel_name="event.partner.fields",
-        string="Champ correspondant",
+        string="Corresponding field",
         ondelete="cascade",
         required=True,
     )
@@ -38,12 +38,12 @@ class EventPartnerQuestion(models.Model):
         (
             "_uniq_event_partner_question",
             "UNIQUE (event_id, field_id)",
-            _("Ce champ est présent plusieurs fois dans les questions de l'évènement."),
+            _("This field is present more than once in event questions."),
         ),
         (
             "_uniq_event_type_partner_question",
             "UNIQUE (event_type_id, field_id)",
-            _("Ce champ est présent plusieurs fois dans les questions de l'évènement."),
+            _("This field is present more than once in event type questions."),
         ),
     ]
 
@@ -68,6 +68,11 @@ class EventPartnerQuestion(models.Model):
     # ------------------------------------------------------
     # Onchange / Constraints
     # ------------------------------------------------------
+    @api.onchange("field_id")
+    def _onchange_field_id(self):
+        for question in self.filtered("field_id"):
+            if not question.title:
+                question.title = question.field_id.display_name
 
     # ------------------------------------------------------
     # CRUD methods (ORM overrides)
diff --git a/models/event_type.py b/models/event_type.py
index e34fcb36995105bce51f1df10d42217aeb08c56e..52ecbe78ccbec806f75e99d0debb2b34775fee56 100644
--- a/models/event_type.py
+++ b/models/event_type.py
@@ -11,7 +11,7 @@ class EventType(models.Model):
     partner_question_ids = fields.One2many(
         comodel_name="event.partner.question",
         inverse_name="event_type_id",
-        string="Questions du contact",
+        string="Partner Related Questions",
         copy=True,
     )
 
diff --git a/models/res_company.py b/models/res_company.py
index 28cb1794be0c7bec216677c25d67338fca84de3b..bf4549ae5e46c7c712006fb747d6a5a1658cced9 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -11,7 +11,7 @@ class ResCompany(models.Model):
     partner_event_field_ids = fields.One2many(
         comodel_name="event.partner.fields",
         inverse_name="company_id",
-        string="Champs pour les questions des évènements",
+        string="Fields for partner related questions on Events",
     )
 
     # ------------------------------------------------------
diff --git a/templates/event_registration_template.xml b/templates/event_registration_template.xml
index 3b5308ec8b8e1b68181625d37236ce1a7a64d629..63e6b1e502e0c7127be8bd1e3d893fb73d8b9b10 100644
--- a/templates/event_registration_template.xml
+++ b/templates/event_registration_template.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) 2024- Le Filament (https://le-filament.com)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
 <odoo>
     <!-- Question template -->
     <template
@@ -80,7 +84,7 @@
                         class="form-check-label fw-normal"
                         t-attf-for="#{question.id}-yes"
                     >
-                        Oui
+                        Yes
                     </label>
                 </div>
                 <div class="form-check form-check-inline">
@@ -96,7 +100,7 @@
                         class="form-check-label fw-normal"
                         t-attf-for="#{question.id}-no"
                     >
-                        Non
+                        No
                     </label>
                 </div>
             </t>
@@ -171,28 +175,36 @@
         id="registration_attendee_partner_question_details"
         inherit_id="website_event.registration_attendee_details"
         name="Registration Attendee Contact detail"
-        priority="1"
+        priority="101"
     >
+        <!--
+        in case question_ids are defined, user is connected and we are registering for the first ticket
+        we hide the 3 default fields and replace by partner related questions
+        -->
         <xpath
-            expr="//t[@name='attendee_loop']//*[hasclass('modal-body')]"
-            position="inside"
+            expr="//t[@name='attendee_loop']//*[hasclass('modal-body')]/div[hasclass('row')]"
+            position="attributes"
         >
-            <t
-                t-if="event.partner_question_ids and not request.env.user._is_public() and counter == 1"
-            >
-                <div class="my-4">
-                    <div
-                        t-foreach="event.partner_question_ids"
-                        t-as="question"
-                        class="row"
-                        t-att-name="question.title"
-                    >
-                        <t
-                            t-call="solagro_event_partner.registration_event_partner_question"
-                        />
-                    </div>
+            <attribute
+                name="t-if"
+            >not event.partner_question_ids or request.env.user._is_public() or counter > 1</attribute>
+        </xpath>
+        <xpath
+            expr="//t[@name='attendee_loop']//*[hasclass('modal-body')]/div[hasclass('row')]"
+            position="after"
+        >
+            <div t-else="" class="my-4">
+                <div
+                    t-foreach="event.partner_question_ids"
+                    t-as="question"
+                    class="row"
+                    t-att-name="question.title"
+                >
+                    <t
+                        t-call="solagro_website_event_partner.registration_event_partner_question"
+                    />
                 </div>
-            </t>
+            </div>
         </xpath>
     </template>
 
diff --git a/views/event.xml b/views/event.xml
index 0279bd738d4d8c1b5ba0a78ebc41a38674d5ef51..8173f5d99f0f2944cc9e69d60544d5b9f9c45ad9 100644
--- a/views/event.xml
+++ b/views/event.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) 2024- Le Filament (https://le-filament.com)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
 <odoo>
     <!-- Form -->
     <record id="event_type_form" model="ir.ui.view">
         <field name="name">event.event.form</field>
         <field name="model">event.event</field>
-        <field name="inherit_id" ref="event.view_event_form"/>
+        <field name="inherit_id" ref="event.view_event_form" />
         <field name="priority">90</field>
         <field name="arch" type="xml">
             <xpath expr="//page[@name='event_notes']" position="before">
-                <page string="Questions du contact" name="questions">
+                <page string="Partner Related Questions" name="questions">
                     <field
                         name="partner_question_ids"
-                        string="Questions du contact"
+                        string="Partner Related Questions"
                         nolabel="1"
                         context="{'default_event_id': active_id}"
                     />
diff --git a/views/event_partner_question.xml b/views/event_partner_question.xml
index c2a8980e3f3d8707d777b806204ff102c31709f6..a7add6cc1ef84ca08e65a13881a33048c4365a65 100644
--- a/views/event_partner_question.xml
+++ b/views/event_partner_question.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) 2024- Le Filament (https://le-filament.com)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
 <odoo>
     <!-- Tree -->
     <record id="event_partner_question_tree" model="ir.ui.view">
         <field name="name">event.partner.question.tree</field>
         <field name="model">event.partner.question</field>
         <field name="arch" type="xml">
-            <tree editable="top">
+            <tree editable="bottom">
                 <field name="event_id" invisible="1" />
                 <field name="sequence" widget="handle" />
-                <field name="title" />
                 <field name="field_id" widget="selection" />
+                <field name="title" />
                 <field name="is_mandatory_answer" />
             </tree>
         </field>
diff --git a/views/event_type.xml b/views/event_type.xml
index 2514b7cbb7c740b7313d3eed5d127a152b919d8f..a18f920de164d601c0a181529a873cd297b14531 100644
--- a/views/event_type.xml
+++ b/views/event_type.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) 2024- Le Filament (https://le-filament.com)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
 <odoo>
     <!-- Form -->
     <record id="event_event_form" model="ir.ui.view">
@@ -8,10 +12,10 @@
         <field name="priority">90</field>
         <field name="arch" type="xml">
             <xpath expr="//page[@name='event_type_communication']" position="after">
-                <page string="Questions du contact" name="questions">
+                <page string="Partner Related Questions" name="questions">
                     <field
                         name="partner_question_ids"
-                        string="Questions du contact"
+                        string="Partner Related Questions"
                         nolabel="1"
                         context="{'default_event_type_id': active_id}"
                     />
diff --git a/views/res_company.xml b/views/res_company.xml
index 9763fc72ed80f2dccba3306038fd6f1200034a77..8ea2a0c170245b95de3629c8597623bb772fe11e 100644
--- a/views/res_company.xml
+++ b/views/res_company.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) 2024- Le Filament (https://le-filament.com)
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+-->
 <odoo>
     <!-- Form -->
     <record id="res_company_form" model="ir.ui.view">
@@ -8,12 +12,12 @@
         <field name="priority">90</field>
         <field name="arch" type="xml">
             <xpath expr="//notebook" position="inside">
-                <page string="Questions du contact">
+                <page string="Partner Related Questions">
                     <field
                         name="partner_event_field_ids"
                         context="{'default_company_id': active_id}"
                     >
-                        <tree editable="top">
+                        <tree editable="bottom">
                             <field name="company_id" invisible="1" />
                             <field
                                 name="ir_field_id"