diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py index da8e1670fad..94d3a5bece6 100644 --- a/addons/survey/models/survey_survey.py +++ b/addons/survey/models/survey_survey.py @@ -481,7 +481,7 @@ class Survey(models.Model): current_page_index = pages_or_questions.ids.index(next(p.id for p in pages_or_questions if p.id == page_or_question_id)) # Get previous and we are on first page OR Get Next and we are on last page - if (go_back and current_page_index == 0) or current_page_index == len(pages_or_questions) - 1: + if (go_back and current_page_index == 0) or (not go_back and current_page_index == len(pages_or_questions) - 1): return Question # Conditional Questions Management diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml index 4cc54cca006..b8addaaab7f 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -202,8 +202,15 @@