[MIG] maintenance_plan: Migration to 16.0

alexeirivera87 · alexeirivera87 · commit 89a858fd2f15 · 2023-06-14T14:34:28.000-04:00
diff --git a/maintenance_plan/README.rst b/maintenance_plan/README.rst
@@ -14,14 +14,14 @@ Maintenance Plan
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmaintenance-lightgray.png?logo=github
-    :target: https://github.com/OCA/maintenance/tree/15.0/maintenance_plan
+    :target: https://github.com/OCA/maintenance/tree/16.0/maintenance_plan
     :alt: OCA/maintenance
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/maintenance-15-0/maintenance-15-0-maintenance_plan
+    :target: https://translation.odoo-community.org/projects/maintenance-16-0/maintenance-16-0-maintenance_plan
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/240/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/maintenance&target_branch=16.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -85,7 +85,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/maintenance/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/maintenance/issues/new?body=module:%20maintenance_plan%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/maintenance/issues/new?body=module:%20maintenance_plan%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.
 
@@ -107,6 +107,7 @@ Contributors
 * Adrià Gil Sorribes <adria.gil@forgeflow.com>
 * Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
 * Lois Rilo <lois.rilo@forgeflow.com>
+* Alexei Rivera <arivera@archeti.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -121,6 +122,6 @@ 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.
 
-This module is part of the `OCA/maintenance <https://github.com/OCA/maintenance/tree/15.0/maintenance_plan>`_ project on GitHub.
+This module is part of the `OCA/maintenance <https://github.com/OCA/maintenance/tree/16.0/maintenance_plan>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/maintenance_plan/__manifest__.py b/maintenance_plan/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Maintenance Plan",
     "summary": "Extends preventive maintenance planning",
-    "version": "15.0.1.7.0",
+    "version": "16.0.1.0.0",
     "author": "Camptocamp SA, ForgeFlow, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "category": "Maintenance",
diff --git a/maintenance_plan/readme/CONTRIBUTORS.rst b/maintenance_plan/readme/CONTRIBUTORS.rst
@@ -4,3 +4,4 @@
 * Adrià Gil Sorribes <adria.gil@forgeflow.com>
 * Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
 * Lois Rilo <lois.rilo@forgeflow.com>
+* Alexei Rivera <arivera@archeti.com>
diff --git a/maintenance_plan/static/description/index.html b/maintenance_plan/static/description/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Maintenance Plan</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Maintenance Plan</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/maintenance/tree/15.0/maintenance_plan"><img alt="OCA/maintenance" src="https://img.shields.io/badge/github-OCA%2Fmaintenance-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/maintenance-15-0/maintenance-15-0-maintenance_plan"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/240/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" 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" 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" href="https://github.com/OCA/maintenance/tree/16.0/maintenance_plan"><img alt="OCA/maintenance" src="https://img.shields.io/badge/github-OCA%2Fmaintenance-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/maintenance-16-0/maintenance-16-0-maintenance_plan"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/maintenance&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 Odoo Maintenance module by allowing
 an equipment to have different preventive maintenance kinds.</p>
 <p><strong>Table of contents</strong></p>
@@ -427,7 +427,7 @@ <h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/maintenance/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 smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/maintenance/issues/new?body=module:%20maintenance_plan%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/maintenance/issues/new?body=module:%20maintenance_plan%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">
@@ -448,6 +448,7 @@ <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <li>Adrià Gil Sorribes &lt;<a class="reference external" href="mailto:adria.gil&#64;forgeflow.com">adria.gil&#64;forgeflow.com</a>&gt;</li>
 <li>Jordi Ballester Alomar &lt;<a class="reference external" href="mailto:jordi.ballester&#64;forgeflow.com">jordi.ballester&#64;forgeflow.com</a>&gt;</li>
 <li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
+<li>Alexei Rivera &lt;<a class="reference external" href="mailto:arivera&#64;archeti.com">arivera&#64;archeti.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -457,7 +458,7 @@ <h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
 <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>This module is part of the <a class="reference external" href="https://github.com/OCA/maintenance/tree/15.0/maintenance_plan">OCA/maintenance</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/maintenance/tree/16.0/maintenance_plan">OCA/maintenance</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/maintenance_plan/tests/test_maintenance_plan.py b/maintenance_plan/tests/test_maintenance_plan.py
@@ -228,10 +228,10 @@ def test_maintenance_request_report(self):
             limit=1,
         )
         generated_request.note = "TEST-INSTRUCTIONS"
-        res = self.report_obj._get_report_from_name(
-            "base_maintenance.report_maintenance_request"
-        )._render_qweb_text(generated_request.ids, False)
-        self.assertRegex(str(res[0]), "TEST-INSTRUCTIONS")
+        rendering, qweb_type = self.report_obj._render_qweb_text(
+            "base_maintenance.report_maintenance_request", generated_request.ids
+        )
+        self.assertFalse(rendering.decode("utf-8").find("TEST-INSTRUCTIONS") == -1)
 
     def test_maintenance_plan_button_manual_request_generation(self):
         self.assertEqual(len(self.maintenance_plan_1.maintenance_ids), 0)
diff --git a/maintenance_plan/views/maintenance_equipment_views.xml b/maintenance_plan/views/maintenance_equipment_views.xml
@@ -23,30 +23,28 @@
             <xpath expr="//group[@name='maintenance']" position="attributes">
                 <attribute name="attrs">{'invisible': 1}</attribute>
             </xpath>
-            <xpath expr="//group[@name='maintenance']" position="after">
-                <group name="maintenance_plans" colspan="4">
-                    <field
-                        name="maintenance_plan_ids"
-                        nolabel="1"
-                        context="{'default_equipment_id': active_id, 'hide_equipment_id': 1}"
-                    >
-                        <tree>
-                            <field name="maintenance_kind_id" string="Kind" />
-                            <field name="maintenance_team_id" string="Team" />
-                            <field name="name" />
-                            <field name="start_maintenance_date" string="Start Date" />
-                            <field name="interval" />
-                            <field name="interval_step" />
-                            <field name="duration" />
-                            <field name="next_maintenance_date" />
-                            <field
-                                name="maintenance_plan_horizon"
-                                string="P. Horizon period"
-                            />
-                            <field name="planning_step" string="P. Horizon step" />
-                        </tree>
-                    </field>
-                </group>
+            <xpath expr="//group[@name='maintenance']/.." position="after">
+                <field
+                    name="maintenance_plan_ids"
+                    nolabel="1"
+                    context="{'default_equipment_id': active_id, 'hide_equipment_id': 1}"
+                >
+                    <tree>
+                        <field name="maintenance_kind_id" string="Kind" />
+                        <field name="maintenance_team_id" string="Team" />
+                        <field name="name" />
+                        <field name="start_maintenance_date" string="Start Date" />
+                        <field name="interval" />
+                        <field name="interval_step" />
+                        <field name="duration" />
+                        <field name="next_maintenance_date" />
+                        <field
+                            name="maintenance_plan_horizon"
+                            string="P. Horizon period"
+                        />
+                        <field name="planning_step" string="P. Horizon step" />
+                    </tree>
+                </field>
             </xpath>
             <field name="maintenance_team_id" position="after">
                 <field name="maintenance_team_required" attrs="{'invisible': 1}" />
@@ -68,7 +66,6 @@
             <field name="maintenance_type" position="after">
                 <field name="maintenance_kind_id" />
             </field>
-            <!-- TODO: Use position="move" instead -->
             <xpath expr="//notebook/page[@name='description_page']" position="before">
                     <page string="Instructions">
                         <field
diff --git a/maintenance_plan/views/maintenance_plan_views.xml b/maintenance_plan/views/maintenance_plan_views.xml
@@ -133,7 +133,7 @@
                 <field name="next_maintenance_date" />
                 <field name="maintenance_plan_horizon" />
                 <field name="planning_step" />
-                <field name="active" attrs="{'invisible': True}" />
+                <field name="active" invisible="1" />
                 <field name="company_id" groups="base.group_multi_company" />
             </tree>
         </field>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`"name": "Maintenance Plan",`
`5`	`5`	`"summary": "Extends preventive maintenance planning",`
`6`		`- "version": "15.0.1.7.0",`
	`6`	`+ "version": "16.0.1.0.0",`
`7`	`7`	`"author": "Camptocamp SA, ForgeFlow, Odoo Community Association (OCA)",`
`8`	`8`	`"license": "AGPL-3",`
`9`	`9`	`"category": "Maintenance",`