[MIG] survey_resource_booking: Migration to 16.0

OCA · Nov 20, 2024 · f80d543 · f80d543
1 parent c230a4b
commit f80d543
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 25 deletions.
diff --git a/survey_resource_booking/README.rst b/survey_resource_booking/README.rst
@@ -7,7 +7,7 @@ Link between resource bookings and surveys
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:2696cc104460716043efe2937ecdbae7073f2eee69a02abd79c0704af0041f81
+   !! source digest: sha256:1c7030acb337d2d38779d5501ee70e76778ec1214e4025a11aefade30a7cf035
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -17,13 +17,13 @@ Link between resource bookings and surveys
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github
-    :target: https://github.com/OCA/survey/tree/15.0/survey_resource_booking
+    :target: https://github.com/OCA/survey/tree/16.0/survey_resource_booking
     :alt: OCA/survey
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/survey-15-0/survey-15-0-survey_resource_booking
+    :target: https://translation.odoo-community.org/projects/survey-16-0/survey-16-0-survey_resource_booking
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/survey&target_branch=15.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/survey&target_branch=16.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -62,7 +62,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/survey/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/survey/issues/new?body=module:%20survey_resource_booking%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/survey/issues/new?body=module:%20survey_resource_booking%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -83,6 +83,10 @@ Contributors
   * Víctor Martínez
   * Stefan Ungureanu
 
+* `Binhex <https://binhex.cloud>`_:
+
+  * Ariel Barreiros
+
 Maintainers
 ~~~~~~~~~~~
 
@@ -104,6 +108,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-Yajo| 
 
-This module is part of the `OCA/survey <https://github.com/OCA/survey/tree/15.0/survey_resource_booking>`_ project on GitHub.
+This module is part of the `OCA/survey <https://github.com/OCA/survey/tree/16.0/survey_resource_booking>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/survey_resource_booking/__manifest__.py b/survey_resource_booking/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Link between resource bookings and surveys",
     "summary": "Access survey answers from resource booking",
-    "version": "15.0.1.0.1",
+    "version": "16.0.1.0.0",
     "development_status": "Beta",
     "category": "Appointments",
     "website": "https://github.com/OCA/survey",

diff --git a/survey_resource_booking/readme/CONTRIBUTORS.rst b/survey_resource_booking/readme/CONTRIBUTORS.rst
@@ -3,3 +3,7 @@
   * Jairo Llopis
   * Víctor Martínez
   * Stefan Ungureanu
+
+* `Binhex <https://binhex.cloud>`_:
+
+  * Ariel Barreiros
diff --git a/survey_resource_booking/static/description/index.html b/survey_resource_booking/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -9,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -367,9 +367,9 @@ <h1 class="title">Link between resource bookings and surveys</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2696cc104460716043efe2937ecdbae7073f2eee69a02abd79c0704af0041f81
+!! source digest: sha256:1c7030acb337d2d38779d5501ee70e76778ec1214e4025a11aefade30a7cf035
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/survey/tree/15.0/survey_resource_booking"><img alt="OCA/survey" src="https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/survey-15-0/survey-15-0-survey_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/survey&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/survey/tree/16.0/survey_resource_booking"><img alt="OCA/survey" src="https://img.shields.io/badge/github-OCA%2Fsurvey-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/survey-16-0/survey-16-0-survey_resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/survey&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of surveys and resource bookings to
 support linking them together and to allow you to quickly request and read
 answers.</p>
@@ -412,7 +412,7 @@ <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/survey/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/survey/issues/new?body=module:%20survey_resource_booking%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/survey/issues/new?body=module:%20survey_resource_booking%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -432,18 +432,24 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Stefan Ungureanu</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://binhex.cloud">Binhex</a>:<ul>
+<li>Ariel Barreiros</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/Yajo"><img alt="Yajo" src="https://github.com/Yajo.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/survey/tree/15.0/survey_resource_booking">OCA/survey</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/survey/tree/16.0/survey_resource_booking">OCA/survey</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/survey_resource_booking/tests/test_invite.py b/survey_resource_booking/tests/test_invite.py
@@ -18,7 +18,6 @@ def setUpClass(cls):
         create_test_data(cls)
         survey_form = Form(cls.env["survey.survey"])
         survey_form.title = "survey 1"
-        survey_form.session_state = "in_progress"
         with survey_form.question_and_page_ids.new() as question_form:
             question_form.title = "are you a robot?"
             question_form.question_type = "text_box"

diff --git a/survey_resource_booking/views/resource_booking_type_views.xml b/survey_resource_booking/views/resource_booking_type_views.xml
@@ -2,14 +2,16 @@
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <data>
-    <record id="resource_booking_type_form" model="ir.ui.view">
+    <record id="resource_booking_type_view_form" model="ir.ui.view">
         <field name="name">Resource booking type survey</field>
         <field name="model">resource.booking.type</field>
-        <field name="groups_id" eval="[(4, ref('survey.group_survey_user'), 0)]" />
-        <field name="inherit_id" ref="resource_booking.resource_booking_type_form" />
+        <field
+            name="inherit_id"
+            ref="resource_booking.resource_booking_type_view_form"
+        />
         <field name="arch" type="xml">
             <field name="requester_advice" position="before">
-                <field name="survey_id" />
+                <field name="survey_id" groups="survey.group_survey_user" />
             </field>
         </field>
     </record>

diff --git a/survey_resource_booking/views/resource_booking_views.xml b/survey_resource_booking/views/resource_booking_views.xml
@@ -2,14 +2,13 @@
 <!-- Copyright 2021 Tecnativa - Jairo Llopis
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <data>
-    <record id="resource_booking_form" model="ir.ui.view">
+    <record id="resource_booking_view_form" model="ir.ui.view">
         <field name="name">resource.booking.view.form.inherit</field>
         <field name="model">resource.booking</field>
-        <field name="groups_id" eval="[(4, ref('survey.group_survey_user'), 0)]" />
-        <field name="inherit_id" ref="resource_booking.resource_booking_form" />
+        <field name="inherit_id" ref="resource_booking.resource_booking_view_form" />
         <field name="arch" type="xml">
             <group name="booking" position="inside">
-                <field name="survey_user_input_id" />
+                <field name="survey_user_input_id" groups="survey.group_survey_user" />
             </group>
         </field>
     </record>