From ca58fee1acb20c1f4d5b1de0d20997bcd0b8a056 Mon Sep 17 00:00:00 2001
From: pilarvargas-tecnativa <pilar.vargas@tecnativa.com>
Date: Mon, 25 Nov 2024 12:10:58 +0100
Subject: [PATCH] [MIG] website_event_questions_by_ticket: Migration to version
 17.0 TT51549

---
 website_event_questions_by_ticket/__manifest__.py      |  4 ++--
 website_event_questions_by_ticket/tests/test_ticket.py |  1 -
 .../views/event_event_views.xml                        |  6 +++---
 .../views/event_templates.xml                          | 10 +++++-----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/website_event_questions_by_ticket/__manifest__.py b/website_event_questions_by_ticket/__manifest__.py
index ade51ef00..1a548d851 100644
--- a/website_event_questions_by_ticket/__manifest__.py
+++ b/website_event_questions_by_ticket/__manifest__.py
@@ -5,12 +5,12 @@
 {
     "name": "Conditional Events Questions",
     "summary": "Events Questions conditional to the chosen ticket",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Website",
     "website": "https://github.com/OCA/event",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "license": "LGPL-3",
     "installable": True,
-    "depends": ["website_event_sale", "website_event_questions"],
+    "depends": ["website_event_sale"],
     "data": ["views/event_event_views.xml", "views/event_templates.xml"],
 }
diff --git a/website_event_questions_by_ticket/tests/test_ticket.py b/website_event_questions_by_ticket/tests/test_ticket.py
index ab15d6ecc..fe74e461f 100644
--- a/website_event_questions_by_ticket/tests/test_ticket.py
+++ b/website_event_questions_by_ticket/tests/test_ticket.py
@@ -25,7 +25,6 @@ def setUpClass(cls):
                 "event_type_id": cls.env.ref("event.event_type_1").id,
                 "website_published": True,
                 "description": "Test",
-                "auto_confirm": True,
                 "website_id": cls.website.id,
             }
         )
diff --git a/website_event_questions_by_ticket/views/event_event_views.xml b/website_event_questions_by_ticket/views/event_event_views.xml
index a3516172b..804ae5e08 100644
--- a/website_event_questions_by_ticket/views/event_event_views.xml
+++ b/website_event_questions_by_ticket/views/event_event_views.xml
@@ -4,11 +4,11 @@
 <odoo>
     <record model="ir.ui.view" id="view_event_question_form">
         <field name="model">event.event</field>
-        <field name="inherit_id" ref="website_event_questions.event_event_view_form" />
+        <field name="inherit_id" ref="website_event.event_event_view_form" />
         <field name="arch" type="xml">
             <xpath
                 expr="//field[@name='question_ids']/form/sheet/notebook"
-                position="after"
+                position="before"
             >
                 <group>
                     <field
@@ -22,7 +22,7 @@
     </record>
     <record model="ir.ui.view" id="event_event_view_form">
         <field name="model">event.event</field>
-        <field name="inherit_id" ref="website_event_questions.event_event_view_form" />
+        <field name="inherit_id" ref="website_event.event_event_view_form" />
         <field name="arch" type="xml">
             <xpath
                 expr="//field[@name='question_ids']/tree/field[@name='answer_ids']"
diff --git a/website_event_questions_by_ticket/views/event_templates.xml b/website_event_questions_by_ticket/views/event_templates.xml
index 016bed0b2..48e16debb 100644
--- a/website_event_questions_by_ticket/views/event_templates.xml
+++ b/website_event_questions_by_ticket/views/event_templates.xml
@@ -4,29 +4,29 @@
 <odoo>
     <template
         id="registration_attendee_details_questions"
-        inherit_id="website_event_questions.registration_attendee_details_questions"
+        inherit_id="website_event.registration_attendee_details"
         priority="99999"
     >
-        <xpath expr="//t[@t-if='event.specific_question_ids']" position="attributes">
+        <xpath expr="//div[@t-if='event.specific_question_ids']" position="attributes">
             <attribute
                 name="t-if"
             >event._get_specific_questions(ticket['id'])</attribute>
         </xpath>
         <xpath
-            expr="//div[@t-foreach='event.specific_question_ids']"
+            expr="//t[@t-foreach='event.specific_question_ids']"
             position="attributes"
         >
             <attribute
                 name="t-foreach"
             >event._get_specific_questions(ticket['id'])</attribute>
         </xpath>
-        <xpath expr="//t[@t-if='event.general_question_ids']" position="attributes">
+        <xpath expr="//div[hasclass('o_wevent_registration_question_global')]" position="attributes">
             <attribute
                 name="t-if"
             >event._get_general_questions([x['id'] for x in tickets])</attribute>
         </xpath>
         <xpath
-            expr="//div[@t-foreach='event.general_question_ids']"
+            expr="//t[@t-foreach='event.general_question_ids']"
             position="attributes"
         >
             <attribute