[MIG] project_timeline_hr_timesheet v11 to v12

OCA · Feb 7, 2019 · a02b39c · a02b39c
1 parent 06c2f02
commit a02b39c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
@@ -0,0 +1 @@
+project https://github.com/Nikul-Chaudhary/project 12-mig-project_timeline
diff --git a/project_timeline_hr_timesheet/README.rst b/project_timeline_hr_timesheet/README.rst
@@ -55,6 +55,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Dennis Sluijk <d.sluijk@onestein.nl>
+* Nikul Chaudhary <nikulchaudhary2112@gmail.com>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/project_timeline_hr_timesheet/__manifest__.py b/project_timeline_hr_timesheet/__manifest__.py
@@ -8,7 +8,7 @@
     'license': 'AGPL-3',
     'website': 'https://github.com/OCA/project',
     'category': 'Project Management',
-    'version': '11.0.1.0.0',
+    'version': '12.0.1.0.0',
     'depends': [
         'project_timeline',
         'hr_timesheet'

diff --git a/project_timeline_hr_timesheet/readme/CONTRIBUTORS.rst b/project_timeline_hr_timesheet/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Dennis Sluijk <d.sluijk@onestein.nl>
+* Nikul Chaudhary <nikulchaudhary2112@gmail.com>
diff --git a/project_timeline_hr_timesheet/views/project_task_view.xml b/project_timeline_hr_timesheet/views/project_task_view.xml
@@ -8,9 +8,9 @@
         <field name="model">project.task</field>
         <field name="inherit_id" ref="project_timeline.project_task_timeline"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='user_id']" position="after">
+            <field name="user_id" position="after">
                 <field name="progress"/>
-            </xpath>
+            </field>
             <xpath expr="//div[hasclass('o_project_timeline_item')]" position="after">
                 <div class="o_project_timeline_hr_timesheet_progress">
                     <div t-att-class="record.progress > 100 and 'danger'"