From b94fb79e4f848cf551bbd6848c9b415ca96d9c8b Mon Sep 17 00:00:00 2001 From: jbeficent Date: Mon, 1 Aug 2016 18:22:10 +0200 Subject: [PATCH 01/10] Set branch 8.0 with modules used in this version --- ao_hr_timesheet_sheet/README.rst | 23 ++++++++++++++++++ ao_hr_timesheet_sheet/__init__.py | 4 ++++ ao_hr_timesheet_sheet/__openerp__.py | 18 ++++++++++++++ .../security/hr_timesheet_sheet_security.xml | 24 +++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 ao_hr_timesheet_sheet/README.rst create mode 100644 ao_hr_timesheet_sheet/__init__.py create mode 100644 ao_hr_timesheet_sheet/__openerp__.py create mode 100644 ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml diff --git a/ao_hr_timesheet_sheet/README.rst b/ao_hr_timesheet_sheet/README.rst new file mode 100644 index 00000000..6e7503de --- /dev/null +++ b/ao_hr_timesheet_sheet/README.rst @@ -0,0 +1,23 @@ +.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg + :target: https://www.gnu.org/licenses/agpl.html + :alt: License: AGPL-3 + +================================ +AO-specific customizations on HR +================================ + +This module contains customizations specific to Aleph Objects. +* A regular user can only view/create/edit her own HR Timesheet. +* A manager can view/create/edit HR Timesheets of the employees she is in + charge of. +* A department manager can view/create/edit HR Timesheets of the employees + in her department. + + +Credits +======= + +Contributors +------------ + +* Eficent Business and IT Consulting Services S.L. diff --git a/ao_hr_timesheet_sheet/__init__.py b/ao_hr_timesheet_sheet/__init__.py new file mode 100644 index 00000000..4994760c --- /dev/null +++ b/ao_hr_timesheet_sheet/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# © 2015 Eficent Business and IT Consulting Services S.L. +# - Jordi Ballester Alomar +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/ao_hr_timesheet_sheet/__openerp__.py b/ao_hr_timesheet_sheet/__openerp__.py new file mode 100644 index 00000000..1d128061 --- /dev/null +++ b/ao_hr_timesheet_sheet/__openerp__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# © 2015 Eficent Business and IT Consulting Services S.L. +# - Jordi Ballester Alomar +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "AO-specific customizations on HR Timesheet Sheet", + "version": "8.0.1.0.0", + "author": "Eficent Business and IT Consulting Services S.L.", + "website": "http://www.eficent.com", + "category": "Human Resources", + "depends": ["hr_timesheet_sheet"], + "license": "AGPL-3", + "data": [ + 'security/hr_timesheet_sheet_security.xml' + ], + 'installable': True, +} diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml new file mode 100644 index 00000000..43367b06 --- /dev/null +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -0,0 +1,24 @@ + + + + + + Employee Timesheet + + ['|', '|', + ('employee_id.user_id','=', user.id), + ('employee_id.parent_id.user_id','=', user.id), + ('department_id.manager_id.user_id', '=', user.id)] + + + + + Employee Timesheet - HR + + [(1,'=',1)] + + + + + + From 1a61c994d40f239ff7910a7e02ee08fadf2483f2 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Date: Mon, 19 Jun 2017 15:19:30 +0200 Subject: [PATCH 02/10] Task #10980 - Invalid Access to time sheet activities. We introduce an ir.rule to limit the access of regular users to the timesheet activities, so that they can only display their own. --- .../security/hr_timesheet_sheet_security.xml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index 43367b06..b346faad 100644 --- a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -1,6 +1,6 @@ - + Employee Timesheet @@ -19,6 +19,28 @@ + + + account.analytic.line.timesheet.base.user + + [('user_id', '=', user.id), ('is_timesheet', '=', True)] + + + + + + + + account.analytic.line.timesheet.base.hr.user + + [(1, '=', 1)] + + + + + + + From e470110f715ac68ad7e7fb9dc8559bc07ce67bb3 Mon Sep 17 00:00:00 2001 From: lreficent Date: Thu, 17 Aug 2017 10:18:26 +0200 Subject: [PATCH 03/10] [9.0][FIX] ao_hr_timeshieet: remove rule for analytic lines as it was interfering other actions. --- ao_hr_timesheet_sheet/README.rst | 2 +- ao_hr_timesheet_sheet/__openerp__.py | 7 +- .../security/hr_timesheet_sheet_security.xml | 73 ++++++++----------- .../views/account_analytic_line_view.xml | 53 ++++++++++++++ 4 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 ao_hr_timesheet_sheet/views/account_analytic_line_view.xml diff --git a/ao_hr_timesheet_sheet/README.rst b/ao_hr_timesheet_sheet/README.rst index 6e7503de..0fd2fb4c 100644 --- a/ao_hr_timesheet_sheet/README.rst +++ b/ao_hr_timesheet_sheet/README.rst @@ -7,13 +7,13 @@ AO-specific customizations on HR ================================ This module contains customizations specific to Aleph Objects. + * A regular user can only view/create/edit her own HR Timesheet. * A manager can view/create/edit HR Timesheets of the employees she is in charge of. * A department manager can view/create/edit HR Timesheets of the employees in her department. - Credits ======= diff --git a/ao_hr_timesheet_sheet/__openerp__.py b/ao_hr_timesheet_sheet/__openerp__.py index 1d128061..dda35aa8 100644 --- a/ao_hr_timesheet_sheet/__openerp__.py +++ b/ao_hr_timesheet_sheet/__openerp__.py @@ -5,14 +5,15 @@ { "name": "AO-specific customizations on HR Timesheet Sheet", - "version": "8.0.1.0.0", + "version": "9.0.1.0.0", "author": "Eficent Business and IT Consulting Services S.L.", "website": "http://www.eficent.com", "category": "Human Resources", "depends": ["hr_timesheet_sheet"], "license": "AGPL-3", "data": [ - 'security/hr_timesheet_sheet_security.xml' + "security/hr_timesheet_sheet_security.xml", + "views/account_analytic_line_view.xml", ], - 'installable': True, + "installable": True, } diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index b346faad..fe6233f7 100644 --- a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -1,46 +1,33 @@ - - + - - Employee Timesheet - - ['|', '|', - ('employee_id.user_id','=', user.id), - ('employee_id.parent_id.user_id','=', user.id), - ('department_id.manager_id.user_id', '=', user.id)] - - - - - Employee Timesheet - HR - - [(1,'=',1)] - - - - - - account.analytic.line.timesheet.base.user - - [('user_id', '=', user.id), ('is_timesheet', '=', True)] - - - - - - + + Employee Timesheet + + ['|', '|', + ('employee_id.user_id','=', user.id), + ('employee_id.parent_id.user_id','=', user.id), + ('department_id.manager_id.user_id', '=', user.id)] + + + + + Employee Timesheet - HR + + [(1,'=',1)] + + + - - account.analytic.line.timesheet.base.hr.user - - [(1, '=', 1)] - - - - - - - - - + + account.analytic.line.timesheet.base.hr.user + + [(1, '=', 1)] + + + + + + + + diff --git a/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml b/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml new file mode 100644 index 00000000..2cce47cf --- /dev/null +++ b/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml @@ -0,0 +1,53 @@ + + + + + + + Activities + account.analytic.line + form + + [('user_id', '=', uid), ('is_timesheet', '=',True)] + {"search_default_today":1, "default_is_timesheet":1} + + +

+ Click to record activities. +

+ You can register and track your workings hours by project every + day. Every time spent on a project will become a cost in the + analytic accounting/contract and can be re-invoiced to + customers if required. +

+ + + + + Everyone Activities + account.analytic.line + form + tree,form + + [('is_timesheet', '=',True)] + {"search_default_today":1, "default_is_timesheet":1} + + +

+ Click to record activities. +

+ You can register and track your workings hours by project every + day. Every time spent on a project will become a cost in the + analytic accounting/contract and can be re-invoiced to + customers if required. +

+ + + + + + From c6b8c7fc6a7ccd92d307f36edd673b940b940fa2 Mon Sep 17 00:00:00 2001 From: lreficent Date: Thu, 4 Jan 2018 11:12:08 +0100 Subject: [PATCH 04/10] [10.0][MIG] ao_hr_timesheet_sheet --- ao_hr_timesheet_sheet/__init__.py | 2 -- .../{__openerp__.py => __manifest__.py} | 4 ++-- .../security/hr_timesheet_sheet_security.xml | 6 +++--- .../views/account_analytic_line_view.xml | 15 +++++++-------- 4 files changed, 12 insertions(+), 15 deletions(-) rename ao_hr_timesheet_sheet/{__openerp__.py => __manifest__.py} (84%) diff --git a/ao_hr_timesheet_sheet/__init__.py b/ao_hr_timesheet_sheet/__init__.py index 4994760c..0eec69fd 100644 --- a/ao_hr_timesheet_sheet/__init__.py +++ b/ao_hr_timesheet_sheet/__init__.py @@ -1,4 +1,2 @@ # -*- coding: utf-8 -*- -# © 2015 Eficent Business and IT Consulting Services S.L. -# - Jordi Ballester Alomar # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/ao_hr_timesheet_sheet/__openerp__.py b/ao_hr_timesheet_sheet/__manifest__.py similarity index 84% rename from ao_hr_timesheet_sheet/__openerp__.py rename to ao_hr_timesheet_sheet/__manifest__.py index dda35aa8..5bef7a89 100644 --- a/ao_hr_timesheet_sheet/__openerp__.py +++ b/ao_hr_timesheet_sheet/__manifest__.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -# © 2015 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-18 Eficent Business and IT Consulting Services S.L. # - Jordi Ballester Alomar # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "AO-specific customizations on HR Timesheet Sheet", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "author": "Eficent Business and IT Consulting Services S.L.", "website": "http://www.eficent.com", "category": "Human Resources", diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index fe6233f7..18c4a364 100644 --- a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -1,4 +1,4 @@ - + @@ -16,14 +16,14 @@ [(1,'=',1)] - + account.analytic.line.timesheet.base.hr.user [(1, '=', 1)] - + diff --git a/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml b/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml index 2cce47cf..35d2966b 100644 --- a/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml +++ b/ao_hr_timesheet_sheet/views/account_analytic_line_view.xml @@ -4,13 +4,12 @@ - + Activities account.analytic.line form - - [('user_id', '=', uid), ('is_timesheet', '=',True)] - {"search_default_today":1, "default_is_timesheet":1} + [('project_id', '!=', False),('user_id', '=', uid)] + {"search_default_today":1} @@ -31,8 +30,8 @@ form tree,form - [('is_timesheet', '=',True)] - {"search_default_today":1, "default_is_timesheet":1} + [('project_id', '!=', False)] + {"search_default_today":1} @@ -47,7 +46,7 @@ - + From 19bb8050db1d50d6d273491380cc31ce53041de3 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Thu, 18 Jan 2018 12:16:46 +0100 Subject: [PATCH 05/10] [10.0][MIG] update migration analysis --- .../migrations/10.0.1.0.0/openupgrade_analysis.txt | 4 ++++ .../migrations/10.0.1.0.0/openupgrade_analysis_work.txt | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt create mode 100644 ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt diff --git a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt new file mode 100644 index 00000000..28bd5797 --- /dev/null +++ b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt @@ -0,0 +1,4 @@ +---Fields in module 'ao_hr_timesheet_sheet'--- +---XML records in module 'ao_hr_timesheet_sheet'--- +NEW ir.actions.act_window: hr_timesheet.act_hr_timesheet_line +DEL ir.actions.act_window: hr_timesheet.act_hr_timesheet_line_evry1_all_form diff --git a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt new file mode 100644 index 00000000..c45fb798 --- /dev/null +++ b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt @@ -0,0 +1,5 @@ +---Fields in module 'ao_hr_timesheet_sheet'--- +---XML records in module 'ao_hr_timesheet_sheet'--- +NEW ir.actions.act_window: hr_timesheet.act_hr_timesheet_line +DEL ir.actions.act_window: hr_timesheet.act_hr_timesheet_line_evry1_all_form +# NOTHING TO DO From 9da6275eef514becc693984e72b617ed6f5d5042 Mon Sep 17 00:00:00 2001 From: mreficent Date: Wed, 26 Sep 2018 20:53:06 +0200 Subject: [PATCH 06/10] [MIG] ao_hr_timesheet_sheet: Migration to 11.0 --- ao_hr_timesheet_sheet/README.rst | 4 ++-- ao_hr_timesheet_sheet/__init__.py | 1 - ao_hr_timesheet_sheet/__manifest__.py | 3 +-- .../migrations/10.0.1.0.0/openupgrade_analysis.txt | 4 ---- .../migrations/10.0.1.0.0/openupgrade_analysis_work.txt | 5 ----- .../security/hr_timesheet_sheet_security.xml | 4 ++-- 6 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt delete mode 100644 ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt diff --git a/ao_hr_timesheet_sheet/README.rst b/ao_hr_timesheet_sheet/README.rst index 0fd2fb4c..aadb8089 100644 --- a/ao_hr_timesheet_sheet/README.rst +++ b/ao_hr_timesheet_sheet/README.rst @@ -1,5 +1,5 @@ -.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg - :target: https://www.gnu.org/licenses/agpl.html +.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ================================ diff --git a/ao_hr_timesheet_sheet/__init__.py b/ao_hr_timesheet_sheet/__init__.py index 0eec69fd..c71289ab 100644 --- a/ao_hr_timesheet_sheet/__init__.py +++ b/ao_hr_timesheet_sheet/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/ao_hr_timesheet_sheet/__manifest__.py b/ao_hr_timesheet_sheet/__manifest__.py index 5bef7a89..4237d4a2 100644 --- a/ao_hr_timesheet_sheet/__manifest__.py +++ b/ao_hr_timesheet_sheet/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright 2015-18 Eficent Business and IT Consulting Services S.L. # - Jordi Ballester Alomar # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "AO-specific customizations on HR Timesheet Sheet", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "author": "Eficent Business and IT Consulting Services S.L.", "website": "http://www.eficent.com", "category": "Human Resources", diff --git a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt deleted file mode 100644 index 28bd5797..00000000 --- a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis.txt +++ /dev/null @@ -1,4 +0,0 @@ ----Fields in module 'ao_hr_timesheet_sheet'--- ----XML records in module 'ao_hr_timesheet_sheet'--- -NEW ir.actions.act_window: hr_timesheet.act_hr_timesheet_line -DEL ir.actions.act_window: hr_timesheet.act_hr_timesheet_line_evry1_all_form diff --git a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt b/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt deleted file mode 100644 index c45fb798..00000000 --- a/ao_hr_timesheet_sheet/migrations/10.0.1.0.0/openupgrade_analysis_work.txt +++ /dev/null @@ -1,5 +0,0 @@ ----Fields in module 'ao_hr_timesheet_sheet'--- ----XML records in module 'ao_hr_timesheet_sheet'--- -NEW ir.actions.act_window: hr_timesheet.act_hr_timesheet_line -DEL ir.actions.act_window: hr_timesheet.act_hr_timesheet_line_evry1_all_form -# NOTHING TO DO diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index 18c4a364..407dbdd4 100644 --- a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -3,7 +3,7 @@ Employee Timesheet - + ['|', '|', ('employee_id.user_id','=', user.id), ('employee_id.parent_id.user_id','=', user.id), @@ -13,7 +13,7 @@ Employee Timesheet - HR - + [(1,'=',1)] From 7389742c47c4813738fc4ca0626a76316d9cf9a8 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Tue, 13 Nov 2018 07:02:49 +0100 Subject: [PATCH 07/10] fixes #20360 --- ao_hr_timesheet_sheet/README.rst | 3 ++- ao_hr_timesheet_sheet/__manifest__.py | 1 + .../views/hr_timesheet_sheet_views.xml | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ao_hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml diff --git a/ao_hr_timesheet_sheet/README.rst b/ao_hr_timesheet_sheet/README.rst index aadb8089..53426ab7 100644 --- a/ao_hr_timesheet_sheet/README.rst +++ b/ao_hr_timesheet_sheet/README.rst @@ -12,7 +12,8 @@ This module contains customizations specific to Aleph Objects. * A manager can view/create/edit HR Timesheets of the employees she is in charge of. * A department manager can view/create/edit HR Timesheets of the employees - in her department. + in her department +* Users cannot create projects from HR Timesheets Credits ======= diff --git a/ao_hr_timesheet_sheet/__manifest__.py b/ao_hr_timesheet_sheet/__manifest__.py index 4237d4a2..03af6eb3 100644 --- a/ao_hr_timesheet_sheet/__manifest__.py +++ b/ao_hr_timesheet_sheet/__manifest__.py @@ -13,6 +13,7 @@ "data": [ "security/hr_timesheet_sheet_security.xml", "views/account_analytic_line_view.xml", + "views/hr_timesheet_sheet_views.xml", ], "installable": True, } diff --git a/ao_hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml b/ao_hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml new file mode 100644 index 00000000..b76804f7 --- /dev/null +++ b/ao_hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml @@ -0,0 +1,15 @@ + + + + + hr_timesheet.sheet.form + hr_timesheet.sheet + + + + {'no_create': True} + + + + + From 0489a5f0f21fe863b8d4d86ce2ad141d2b42ed58 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Tue, 13 Nov 2018 07:14:44 +0100 Subject: [PATCH 08/10] fixes #20359 --- .../security/hr_timesheet_sheet_security.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml index 407dbdd4..602bc218 100644 --- a/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml +++ b/ao_hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml @@ -30,4 +30,8 @@ + + + + From 6ca000021df59aee596255fc1e2e6a1137bbe12e Mon Sep 17 00:00:00 2001 From: hveficent Date: Mon, 19 Nov 2018 12:19:45 +0100 Subject: [PATCH 09/10] [11.0][ADD] Feature: Last Week on hr_timesheet_attendance Report --- ao_hr_timesheet_sheet/README.rst | 1 + ao_hr_timesheet_sheet/__manifest__.py | 4 +++- .../hr_timesheet_attendance_report_view.xml | 20 +++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ao_hr_timesheet_sheet/views/hr_timesheet_attendance_report_view.xml diff --git a/ao_hr_timesheet_sheet/README.rst b/ao_hr_timesheet_sheet/README.rst index 53426ab7..66012139 100644 --- a/ao_hr_timesheet_sheet/README.rst +++ b/ao_hr_timesheet_sheet/README.rst @@ -14,6 +14,7 @@ This module contains customizations specific to Aleph Objects. * A department manager can view/create/edit HR Timesheets of the employees in her department * Users cannot create projects from HR Timesheets +* Add Last Week filter on Timesheet Reporting Credits ======= diff --git a/ao_hr_timesheet_sheet/__manifest__.py b/ao_hr_timesheet_sheet/__manifest__.py index 03af6eb3..1918017d 100644 --- a/ao_hr_timesheet_sheet/__manifest__.py +++ b/ao_hr_timesheet_sheet/__manifest__.py @@ -8,12 +8,14 @@ "author": "Eficent Business and IT Consulting Services S.L.", "website": "http://www.eficent.com", "category": "Human Resources", - "depends": ["hr_timesheet_sheet"], + "depends": ["hr_timesheet_sheet", + "hr_timesheet_attendance"], "license": "AGPL-3", "data": [ "security/hr_timesheet_sheet_security.xml", "views/account_analytic_line_view.xml", "views/hr_timesheet_sheet_views.xml", + "views/hr_timesheet_attendance_report_view.xml" ], "installable": True, } diff --git a/ao_hr_timesheet_sheet/views/hr_timesheet_attendance_report_view.xml b/ao_hr_timesheet_sheet/views/hr_timesheet_attendance_report_view.xml new file mode 100644 index 00000000..8f04cd53 --- /dev/null +++ b/ao_hr_timesheet_sheet/views/hr_timesheet_attendance_report_view.xml @@ -0,0 +1,20 @@ + + + + + hr.timesheet.attendance.report.filter.last.week + hr.timesheet.attendance.report + + + + + + + + + From ddc1bcf6b37c640e7772f73edf97e0f949ef196f Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 5 Jul 2019 12:30:18 +0200 Subject: [PATCH 10/10] [12.0][MIG] ao_hr_timesheet_sheet --- ao_hr_timesheet_sheet/__init__.py | 1 - ao_hr_timesheet_sheet/__manifest__.py | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ao_hr_timesheet_sheet/__init__.py b/ao_hr_timesheet_sheet/__init__.py index c71289ab..e69de29b 100644 --- a/ao_hr_timesheet_sheet/__init__.py +++ b/ao_hr_timesheet_sheet/__init__.py @@ -1 +0,0 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/ao_hr_timesheet_sheet/__manifest__.py b/ao_hr_timesheet_sheet/__manifest__.py index 1918017d..51aaacaf 100644 --- a/ao_hr_timesheet_sheet/__manifest__.py +++ b/ao_hr_timesheet_sheet/__manifest__.py @@ -1,15 +1,17 @@ -# Copyright 2015-18 Eficent Business and IT Consulting Services S.L. +# Copyright 2015-19 Eficent Business and IT Consulting Services S.L. # - Jordi Ballester Alomar # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "AO-specific customizations on HR Timesheet Sheet", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Eficent Business and IT Consulting Services S.L.", "website": "http://www.eficent.com", "category": "Human Resources", - "depends": ["hr_timesheet_sheet", - "hr_timesheet_attendance"], + "depends": [ + "hr_timesheet_sheet", + "hr_timesheet_attendance", + ], "license": "AGPL-3", "data": [ "security/hr_timesheet_sheet_security.xml",