[PATCH] Upstream patch - 07112023

addons/survey/controllers/main.py

@@ -362,7 +362,7 @@ class Survey(http.Controller):
                 })
             elif survey_sudo.questions_layout == 'page_per_question':
                 page_ids = (answer_sudo.predefined_question_ids.ids
-                            if not answer_sudo.is_session_answer
+                            if not answer_sudo.is_session_answer and survey_sudo.questions_selection == 'random'
                             else survey_sudo.question_ids.ids)
                 survey_progress = request.env.ref('survey.survey_progression')._render({
                     'survey': survey_sudo,

addons/survey/views/survey_templates.xml

@@ -30,7 +30,7 @@
                             <t t-set="page_number" t-value="page_ids.index(page.id) + (1 if survey.progression_mode == 'number' else 0)"/>
                         </t>
                         <t t-else="">
-                            <t t-if="not answer.is_session_answer">
+                            <t t-if="not answer.is_session_answer and survey.questions_selection == 'random'">
                                 <t t-set="page_ids" t-value="answer.predefined_question_ids.ids"/>
                             </t>
                             <t t-else="">

addons/website_slides/wizard/slide_channel_invite.py

@@ -109,7 +109,7 @@ class SlideChannelInvite(models.TransientModel):
             'subject': subject,
             'body_html': body,
             'attachment_ids': [(4, att.id) for att in self.attachment_ids],
-            'auto_delete': True,
+            'auto_delete': self.template_id.auto_delete if self.template_id else True,
             'recipient_ids': [(4, slide_channel_partner.partner_id.id)]
         }