[MIG] project_timeline_hr_timesheet v11 to v12

pedroguirao · Mar 11, 2019 · f893542 · f893542
1 parent 0d42e57
commit f893542
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/project_timeline_hr_timesheet/README.rst b/project_timeline_hr_timesheet/README.rst
@@ -55,6 +55,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Dennis Sluijk <[email protected]>
+* Nikul Chaudhary <[email protected]>
 
 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 <[email protected]>
+* Nikul Chaudhary <[email protected]>
diff --git a/...c/less/project_timeline_hr_timesheet.less → ...c/scss/project_timeline_hr_timesheet.scss b/...c/less/project_timeline_hr_timesheet.less → ...c/scss/project_timeline_hr_timesheet.scss
@@ -6,12 +6,12 @@
     margin-right: -5px;
     margin-top: 5px;
 
-    > div {
+.o_project_timeline_hr_timesheet_progress .div {
         height: 100%;
         max-width: 100%;
         background: @progress-bar-success-bg;
 
-        &.danger {
+.o_project_timeline_hr_timesheet_progress .danger {
             background: @progress-bar-danger-bg;
         }
     }

diff --git a/project_timeline_hr_timesheet/templates/assets.xml b/project_timeline_hr_timesheet/templates/assets.xml
@@ -5,9 +5,9 @@
 <odoo>
     <template id="assets_backend" inherit_id="web.assets_backend">
         <xpath expr="//link[last()]">
-            <link href="/project_timeline_hr_timesheet/static/src/less/project_timeline_hr_timesheet.less"
+            <link href="/project_timeline_hr_timesheet/static/src/scss/project_timeline_hr_timesheet.scss"
                   rel="stylesheet"
-                  type="text/less"/>
+                  type="text/scss"/>
         </xpath>
     </template>
 </odoo>
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'"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		* Dennis Sluijk <[email protected]>
		* Nikul Chaudhary <[email protected]>