[15.0][MIG] hr_timesheet_task_required: Migration to 15.0

OCA · Jun 29, 2022 · b89376f · b89376f
1 parent c652178
commit b89376f
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 20 deletions.
diff --git a/hr_timesheet_task_required/README.rst b/hr_timesheet_task_required/README.rst
@@ -14,13 +14,13 @@ Hr Timesheet Task Required
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github
-    :target: https://github.com/OCA/timesheet/tree/14.0/hr_timesheet_task_required
+    :target: https://github.com/OCA/timesheet/tree/15.0/hr_timesheet_task_required
     :alt: OCA/timesheet
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/timesheet-14-0/timesheet-14-0-hr_timesheet_task_required
+    :target: https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-hr_timesheet_task_required
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/117/14.0
+    :target: https://runbot.odoo-community.org/runbot/117/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -53,7 +53,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/timesheet/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/timesheet/issues/new?body=module:%20hr_timesheet_task_required%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/timesheet/issues/new?body=module:%20hr_timesheet_task_required%0Aversion:%2015.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.
 
@@ -92,6 +92,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/timesheet <https://github.com/OCA/timesheet/tree/14.0/hr_timesheet_task_required>`_ project on GitHub.
+This module is part of the `OCA/timesheet <https://github.com/OCA/timesheet/tree/15.0/hr_timesheet_task_required>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/hr_timesheet_task_required/i18n/es.po b/hr_timesheet_task_required/i18n/es.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-12-11 09:39+0000\n"
 "Last-Translator: David Alonso (Solvos) <david.alonso@solvos.es>\n"

diff --git a/hr_timesheet_task_required/i18n/fr_FR.po b/hr_timesheet_task_required/i18n/fr_FR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2021-04-11 18:46+0000\n"
 "Last-Translator: Yves Le Doeuff <yld@alliasys.fr>\n"

diff --git a/hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot b/hr_timesheet_task_required/i18n/hr_timesheet_task_required.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/hr_timesheet_task_required/readme/CONTRIBUTORS.rst b/hr_timesheet_task_required/readme/CONTRIBUTORS.rst
@@ -7,3 +7,4 @@
 
 * Saran Lim. <saranl@ecosoft.co.th>
 * Foram Shah <foram.shah@initos.com>
+* Houssine Bakkali <houssine.bakkali@eezee-it.com>
diff --git a/hr_timesheet_task_required/static/description/index.html b/hr_timesheet_task_required/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Hr Timesheet Task Required</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/timesheet/tree/14.0/hr_timesheet_task_required"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/timesheet-14-0/timesheet-14-0-hr_timesheet_task_required"><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/117/14.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/timesheet/tree/15.0/hr_timesheet_task_required"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-hr_timesheet_task_required"><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/117/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to configure project as having task on timesheet as a
 mandatory field.</p>
 <p><strong>Table of contents</strong></p>
@@ -398,7 +398,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/timesheet/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/timesheet/issues/new?body=module:%20hr_timesheet_task_required%0Aversion:%2014.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/timesheet/issues/new?body=module:%20hr_timesheet_task_required%0Aversion:%2015.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">
@@ -431,7 +431,7 @@ <h2><a class="toc-backref" href="#id6">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/timesheet/tree/14.0/hr_timesheet_task_required">OCA/timesheet</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/15.0/hr_timesheet_task_required">OCA/timesheet</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/hr_timesheet_task_required/views/project_project.xml b/hr_timesheet_task_required/views/project_project.xml
@@ -23,16 +23,23 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
     <record id="project_invoice_form" model="ir.ui.view">
         <field name="name">project.project.view.form</field>
         <field name="model">project.project</field>
-        <field name="inherit_id" ref="project.project_invoice_form" />
+        <field name="inherit_id" ref="hr_timesheet.project_invoice_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@name='options_active']" position="inside">
-                <div>
-                    <field
-                        name="is_timesheet_task_required"
-                        class="oe_inline"
-                        attrs="{'invisible': [('allow_timesheets', '=', False)]}"
-                    />
-                    <label for="is_timesheet_task_required" />
+            <xpath expr="//div[@id='timesheet_settings']" position="after">
+                <div
+                    class="col-lg-6 o_setting_box"
+                    id="timesheet_task_settings"
+                    attrs="{'invisible': [('allow_timesheets', '=', False)]}"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="is_timesheet_task_required" class="oe_inline" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="is_timesheet_task_required" />
+                        <div class="text-muted">
+                            Set tasks on timesheet as a mandatory field
+                        </div>
+                    </div>
                 </div>
             </xpath>
         </field>