diff --git a/project_timeline_hr_timesheet/README.rst b/project_timeline_hr_timesheet/README.rst index 457c3542b4..0dfb6279c3 100644 --- a/project_timeline_hr_timesheet/README.rst +++ b/project_timeline_hr_timesheet/README.rst @@ -55,6 +55,7 @@ Contributors ~~~~~~~~~~~~ * Dennis Sluijk +* Nikul Chaudhary Maintainers ~~~~~~~~~~~ diff --git a/project_timeline_hr_timesheet/__manifest__.py b/project_timeline_hr_timesheet/__manifest__.py index 54125a6637..31b6392654 100644 --- 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 index 47b6403d06..76b5588741 100644 --- a/project_timeline_hr_timesheet/readme/CONTRIBUTORS.rst +++ b/project_timeline_hr_timesheet/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Dennis Sluijk +* Nikul Chaudhary diff --git a/project_timeline_hr_timesheet/static/src/less/project_timeline_hr_timesheet.less b/project_timeline_hr_timesheet/static/src/scss/project_timeline_hr_timesheet.scss similarity index 77% rename from project_timeline_hr_timesheet/static/src/less/project_timeline_hr_timesheet.less rename to project_timeline_hr_timesheet/static/src/scss/project_timeline_hr_timesheet.scss index ff0f1c2f84..2264fec2f3 100644 --- a/project_timeline_hr_timesheet/static/src/less/project_timeline_hr_timesheet.less +++ b/project_timeline_hr_timesheet/static/src/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 index 9f8822c424..448d91b55d 100644 --- a/project_timeline_hr_timesheet/templates/assets.xml +++ b/project_timeline_hr_timesheet/templates/assets.xml @@ -5,9 +5,9 @@ diff --git a/project_timeline_hr_timesheet/views/project_task_view.xml b/project_timeline_hr_timesheet/views/project_task_view.xml index 1f0c725e1e..d574bddacd 100644 --- a/project_timeline_hr_timesheet/views/project_task_view.xml +++ b/project_timeline_hr_timesheet/views/project_task_view.xml @@ -8,9 +8,9 @@ project.task - + - +