From 8417a9a2ef9248f11b02383d9aa6a03484e86fa8 Mon Sep 17 00:00:00 2001 From: "David Alonso (Solvos)" Date: Tue, 28 Jul 2020 09:09:40 +0200 Subject: [PATCH 01/42] [ADD] helpdesk_mgmt_timesheet: original files from PR #121 --- helpdesk_mgmt_timesheet/README.rst | 114 +++++ helpdesk_mgmt_timesheet/__init__.py | 4 + helpdesk_mgmt_timesheet/__manifest__.py | 32 ++ .../demo/helpdesk_mgmt_timesheet_demo.xml | 44 ++ helpdesk_mgmt_timesheet/i18n/es.po | 142 ++++++ .../i18n/helpdesk_mgmt_timesheet.pot | 122 +++++ helpdesk_mgmt_timesheet/models/__init__.py | 6 + .../models/helpdesk_ticket.py | 73 +++ .../models/helpdesk_ticket_team.py | 21 + .../models/hr_timesheet.py | 29 ++ helpdesk_mgmt_timesheet/readme/CONFIGURE.rst | 12 + .../readme/CONTRIBUTORS.rst | 16 + .../readme/DESCRIPTION.rst | 1 + helpdesk_mgmt_timesheet/readme/USAGE.rst | 3 + .../report/report_timesheet_templates.xml | 20 + .../static/description/index.html | 468 ++++++++++++++++++ helpdesk_mgmt_timesheet/tests/__init__.py | 4 + .../tests/test_helpdesk_mgmt_timesheet.py | 55 ++ .../views/helpdesk_team_view.xml | 15 + .../views/helpdesk_ticket_view.xml | 97 ++++ .../views/hr_timesheet_view.xml | 84 ++++ 21 files changed, 1362 insertions(+) create mode 100644 helpdesk_mgmt_timesheet/README.rst create mode 100644 helpdesk_mgmt_timesheet/__init__.py create mode 100644 helpdesk_mgmt_timesheet/__manifest__.py create mode 100644 helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml create mode 100644 helpdesk_mgmt_timesheet/i18n/es.po create mode 100644 helpdesk_mgmt_timesheet/i18n/helpdesk_mgmt_timesheet.pot create mode 100644 helpdesk_mgmt_timesheet/models/__init__.py create mode 100644 helpdesk_mgmt_timesheet/models/helpdesk_ticket.py create mode 100644 helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py create mode 100644 helpdesk_mgmt_timesheet/models/hr_timesheet.py create mode 100644 helpdesk_mgmt_timesheet/readme/CONFIGURE.rst create mode 100644 helpdesk_mgmt_timesheet/readme/CONTRIBUTORS.rst create mode 100644 helpdesk_mgmt_timesheet/readme/DESCRIPTION.rst create mode 100644 helpdesk_mgmt_timesheet/readme/USAGE.rst create mode 100644 helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml create mode 100644 helpdesk_mgmt_timesheet/static/description/index.html create mode 100644 helpdesk_mgmt_timesheet/tests/__init__.py create mode 100644 helpdesk_mgmt_timesheet/tests/test_helpdesk_mgmt_timesheet.py create mode 100644 helpdesk_mgmt_timesheet/views/helpdesk_team_view.xml create mode 100644 helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml create mode 100644 helpdesk_mgmt_timesheet/views/hr_timesheet_view.xml diff --git a/helpdesk_mgmt_timesheet/README.rst b/helpdesk_mgmt_timesheet/README.rst new file mode 100644 index 0000000000..cd51f5bb59 --- /dev/null +++ b/helpdesk_mgmt_timesheet/README.rst @@ -0,0 +1,114 @@ +========================= +Helpdesk Ticket Timesheet +========================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhelpdesk-lightgray.png?logo=github + :target: https://github.com/OCA/helpdesk/tree/12.0/helpdesk_mgmt_timesheet + :alt: OCA/helpdesk +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/helpdesk-12-0/helpdesk-12-0-helpdesk_mgmt_timesheet + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/282/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds Timesheet funcionality in Helpdesk module. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure this module, you need to: + +#. Allow Timesheet for a Helpdesk's Team +#. Set a Default Project (optional) + +Allow Timesheet +~~~~~~~~~~~~~~~ + +#. Go to Helpdesk > Configuration > Teams. +#. Edit or create a new team. +#. Check Allow Timesheet option to allow timesheets for that team. +#. Select a Project for that team (optional). + +Usage +===== + +#. Go to *Helpdesk* or *Helpdesk > Dashboard* to see the tickets dashboard. +#. In the Kanban view, click in the kanban card of a team to see their tickets and create new ones. +#. If there is not a Default Project you will need select a Project for the Ticket to show the Timesheet Table. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Aresoltec Canarias +* Punt Sistemes +* SDi Soluciones Digitales +* Solvos + +Contributors +~~~~~~~~~~~~ + +* `Aresoltec Canarias, S.L `_: + + * Inma Sánchez + +* `SDi Soluciones, S.L. `_: + + * Oscar Soto + * Jorge Luis Quinteros + +* `Punt Sistemes, S.L. `_: + + * Carlos Ramos + +* `Solvos Consultoría Informática, S.L. `_: + + * David Alonso + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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/helpdesk `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/helpdesk_mgmt_timesheet/__init__.py b/helpdesk_mgmt_timesheet/__init__.py new file mode 100644 index 0000000000..00188672cc --- /dev/null +++ b/helpdesk_mgmt_timesheet/__init__.py @@ -0,0 +1,4 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from . import models diff --git a/helpdesk_mgmt_timesheet/__manifest__.py b/helpdesk_mgmt_timesheet/__manifest__.py new file mode 100644 index 0000000000..a8dadad541 --- /dev/null +++ b/helpdesk_mgmt_timesheet/__manifest__.py @@ -0,0 +1,32 @@ +# Copyright (C) 2020 Aresoltec Canarias +# Copyright (C) 2020 Punt Sistemes +# Copyright (C) 2020 SDi Soluciones Digitales +# Copyright (C) 2020 Solvos Consultoría Informática +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + 'name': 'Helpdesk Ticket Timesheet', + 'summary': 'Add HR Timesheet to the tickets for Helpdesk Management.', + 'author': 'Aresoltec Canarias, ' + 'Punt Sistemes, ' + 'SDi Soluciones Digitales, ' + 'Solvos, ' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/helpdesk', + 'license': 'AGPL-3', + 'category': 'After-Sales', + 'version': '12.0.1.0.0', + 'depends': [ + 'helpdesk_mgmt_project', + 'hr_timesheet', + ], + 'data': [ + 'views/helpdesk_team_view.xml', + 'views/helpdesk_ticket_view.xml', + 'views/hr_timesheet_view.xml', + 'report/report_timesheet_templates.xml', + ], + 'demo': [ + 'demo/helpdesk_mgmt_timesheet_demo.xml', + ], +} diff --git a/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml b/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml new file mode 100644 index 0000000000..1cb85083d4 --- /dev/null +++ b/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml @@ -0,0 +1,44 @@ + + + + + + Helpdesk general project + + + + Helpdesk general task + + + + + + + + + + + + + + + + + + Initial analysis + + + + + + + + Resolution + + + + + + + + diff --git a/helpdesk_mgmt_timesheet/i18n/es.po b/helpdesk_mgmt_timesheet/i18n/es.po new file mode 100644 index 0000000000..b70f876f94 --- /dev/null +++ b/helpdesk_mgmt_timesheet/i18n/es.po @@ -0,0 +1,142 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * helpdesk_mgmt_timesheet +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-19 07:54+0000\n" +"PO-Revision-Date: 2020-05-19 10:00+0200\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 2.3.1\n" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__allow_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket_team__allow_timesheet +msgid "Allow Timesheet" +msgstr "Permitir Partes de Horas" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_account_analytic_line +msgid "Analytic Line" +msgstr "Línea Analítica" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_team_view_form +#, fuzzy +msgid "Change the Default Project will not have retroactive effects." +msgstr "" +"Cambiar la cuenta analítica por defecto no tendrá efectos retroactivos." + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket_team__default_project_id +msgid "Default Project" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_ticket_view_form +msgid "Duration (Hour(s))" +msgstr "Duración (Hora(s))" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_helpdesk_ticket +msgid "Helpdesk Ticket" +msgstr "Ticket Helpdesk" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_helpdesk_ticket_team +msgid "Helpdesk Ticket Team" +msgstr "Equipo de ticket Helpdesk" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.helpdesk_ticket_view_search +msgid "Late" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__planned_hours +msgid "Planned Hours" +msgstr "Horas planeadas" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__progress +msgid "Progress" +msgstr "En proceso" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__remaining_hours +msgid "Remaining Hours" +msgstr "Horas restantes" + +#. module: helpdesk_mgmt_timesheet +#: model:project.project,label_tasks:helpdesk_mgmt_timesheet.project_1 +msgid "Tasks" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_account_analytic_line__ticket_id +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.report_timesheet +msgid "Ticket" +msgstr "Ticket" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_account_analytic_line__ticket_partner_id +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +#, fuzzy +msgid "Ticket partner" +msgstr "Ticket" + +#. module: helpdesk_mgmt_timesheet +#: model:project.project,label_tickets:helpdesk_mgmt_timesheet.project_1 +#: model:project.task,label_tickets:helpdesk_mgmt_timesheet.project_task_1 +#, fuzzy +msgid "Tickets" +msgstr "Ticket" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__timesheet_ids +msgid "Timesheet" +msgstr "Parte de Horas" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.helpdesk_ticket_view_search +#, fuzzy +msgid "Timesheet allowed" +msgstr "Parte de Horas" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.actions.act_window,name:helpdesk_mgmt_timesheet.helpdesk_timesheet_action +#: model:ir.ui.menu,name:helpdesk_mgmt_timesheet.helpdesk_timesheet_menu +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_ticket_view_form +msgid "Timesheets" +msgstr "Partes de horas" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__total_hours +msgid "Total Hours" +msgstr "Total horas" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +msgid "With ticket" +msgstr "" + +#~ msgid "Analityc Account" +#~ msgstr "Cuenta analítica" + +#~ msgid "Clean Default Analytic Account" +#~ msgstr "Eliminar cuenta analítica por defecto" + +#~ msgid "Default Analytic Account" +#~ msgstr "Cuenta analítica por defecto" + +#~ msgid "Reset Analytic Account" +#~ msgstr "Restablecer cuenta analítica" diff --git a/helpdesk_mgmt_timesheet/i18n/helpdesk_mgmt_timesheet.pot b/helpdesk_mgmt_timesheet/i18n/helpdesk_mgmt_timesheet.pot new file mode 100644 index 0000000000..1448cd487b --- /dev/null +++ b/helpdesk_mgmt_timesheet/i18n/helpdesk_mgmt_timesheet.pot @@ -0,0 +1,122 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * helpdesk_mgmt_timesheet +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__allow_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket_team__allow_timesheet +msgid "Allow Timesheet" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_team_view_form +msgid "Change the Default Project will not have retroactive effects." +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket_team__default_project_id +msgid "Default Project" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_ticket_view_form +msgid "Duration (Hour(s))" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_helpdesk_ticket +msgid "Helpdesk Ticket" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model,name:helpdesk_mgmt_timesheet.model_helpdesk_ticket_team +msgid "Helpdesk Ticket Team" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.helpdesk_ticket_view_search +msgid "Late" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__planned_hours +msgid "Planned Hours" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__progress +msgid "Progress" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__remaining_hours +msgid "Remaining Hours" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:project.project,label_tasks:helpdesk_mgmt_timesheet.project_1 +msgid "Tasks" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_account_analytic_line__ticket_id +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.report_timesheet +msgid "Ticket" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_account_analytic_line__ticket_partner_id +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +msgid "Ticket partner" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:project.project,label_tickets:helpdesk_mgmt_timesheet.project_1 +#: model:project.task,label_tickets:helpdesk_mgmt_timesheet.project_task_1 +msgid "Tickets" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__timesheet_ids +msgid "Timesheet" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.helpdesk_ticket_view_search +msgid "Timesheet allowed" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.actions.act_window,name:helpdesk_mgmt_timesheet.helpdesk_timesheet_action +#: model:ir.ui.menu,name:helpdesk_mgmt_timesheet.helpdesk_timesheet_menu +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.timesheet_helpdesk_ticket_view_form +msgid "Timesheets" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model:ir.model.fields,field_description:helpdesk_mgmt_timesheet.field_helpdesk_ticket__total_hours +msgid "Total Hours" +msgstr "" + +#. module: helpdesk_mgmt_timesheet +#: model_terms:ir.ui.view,arch_db:helpdesk_mgmt_timesheet.hr_timesheet_line_search +msgid "With ticket" +msgstr "" + diff --git a/helpdesk_mgmt_timesheet/models/__init__.py b/helpdesk_mgmt_timesheet/models/__init__.py new file mode 100644 index 0000000000..e3a546702d --- /dev/null +++ b/helpdesk_mgmt_timesheet/models/__init__.py @@ -0,0 +1,6 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from . import hr_timesheet +from . import helpdesk_ticket +from . import helpdesk_ticket_team diff --git a/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py b/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py new file mode 100644 index 0000000000..3e32e21c1e --- /dev/null +++ b/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py @@ -0,0 +1,73 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from odoo import api, fields, models + + +class HelpdeskTicket(models.Model): + _inherit = 'helpdesk.ticket' + + allow_timesheet = fields.Boolean( + string='Allow Timesheet', + related='team_id.allow_timesheet', + ) + planned_hours = fields.Float( + string='Planned Hours', + track_visibility='onchange', + ) + progress = fields.Float( + compute='_compute_progress_hours', + group_operator='avg', + store=True, + string='Progress', + ) + remaining_hours = fields.Float( + compute='_compute_progress_hours', + readonly=True, + store=True, + string='Remaining Hours', + ) + timesheet_ids = fields.One2many( + comodel_name='account.analytic.line', + inverse_name='ticket_id', + string='Timesheet', + ) + total_hours = fields.Float( + compute='_compute_total_hours', + readonly=True, + store=True, + string='Total Hours' + ) + + @api.depends('timesheet_ids.unit_amount') + def _compute_total_hours(self): + for record in self: + record.total_hours = sum( + record.timesheet_ids.mapped('unit_amount') + ) + + @api.constrains('project_id') + def _constrains_project_timesheets(self): + for record in self: + record.timesheet_ids.update({ + 'project_id': record.project_id.id + }) + + @api.onchange('team_id') + def _onchange_team_id(self): + for record in self: + record.project_id = record.team_id.default_project_id + + @api.depends('planned_hours', 'total_hours') + def _compute_progress_hours(self): + for ticket in self: + ticket.progress = 0.0 + if (ticket.planned_hours > 0.0): + if ticket.total_hours > ticket.planned_hours: + ticket.progress = 100 + else: + ticket.progress = round( + 100.0 * ticket.total_hours / ticket.planned_hours, + 2 + ) + ticket.remaining_hours = ticket.planned_hours - ticket.total_hours diff --git a/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py b/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py new file mode 100644 index 0000000000..5fe3aa4c9d --- /dev/null +++ b/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py @@ -0,0 +1,21 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from odoo import api, fields, models + + +class HelpdeskTicketTeam(models.Model): + _inherit = 'helpdesk.ticket.team' + + allow_timesheet = fields.Boolean( + string='Allow Timesheet', + ) + default_project_id = fields.Many2one( + comodel_name='project.project', + string='Default Project', + ) + + @api.constrains('allow_timesheet') + def _constrains_allow_timesheet(self): + if not self.allow_timesheet: + self.default_project = False diff --git a/helpdesk_mgmt_timesheet/models/hr_timesheet.py b/helpdesk_mgmt_timesheet/models/hr_timesheet.py new file mode 100644 index 0000000000..6011319c8e --- /dev/null +++ b/helpdesk_mgmt_timesheet/models/hr_timesheet.py @@ -0,0 +1,29 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from odoo import api, fields, models + + +class AccountAnalyticLine(models.Model): + _inherit = 'account.analytic.line' + + ticket_id = fields.Many2one( + comodel_name='helpdesk.ticket', + string='Ticket', + domain=[("project_id", "!=", False)], + groups="helpdesk_mgmt.group_helpdesk_user", + ) + ticket_partner_id = fields.Many2one( + comodel_name='res.partner', + related="ticket_id.partner_id", + string="Ticket partner", + store=True, + compute_sudo=True, + groups="helpdesk_mgmt.group_helpdesk_user", + ) + + @api.onchange("ticket_id") + def onchange_ticket_id(self): + for record in self: + record.project_id = record.ticket_id.project_id + record.task_id = record.ticket_id.task_id diff --git a/helpdesk_mgmt_timesheet/readme/CONFIGURE.rst b/helpdesk_mgmt_timesheet/readme/CONFIGURE.rst new file mode 100644 index 0000000000..d85d8e4d31 --- /dev/null +++ b/helpdesk_mgmt_timesheet/readme/CONFIGURE.rst @@ -0,0 +1,12 @@ +To configure this module, you need to: + +#. Allow Timesheet for a Helpdesk's Team +#. Set a Default Project (optional) + +Allow Timesheet +~~~~~~~~~~~~~~~ + +#. Go to Helpdesk > Configuration > Teams. +#. Edit or create a new team. +#. Check Allow Timesheet option to allow timesheets for that team. +#. Select a Project for that team (optional). diff --git a/helpdesk_mgmt_timesheet/readme/CONTRIBUTORS.rst b/helpdesk_mgmt_timesheet/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..8578ddda9c --- /dev/null +++ b/helpdesk_mgmt_timesheet/readme/CONTRIBUTORS.rst @@ -0,0 +1,16 @@ +* `Aresoltec Canarias, S.L `_: + + * Inma Sánchez + +* `SDi Soluciones, S.L. `_: + + * Oscar Soto + * Jorge Luis Quinteros + +* `Punt Sistemes, S.L. `_: + + * Carlos Ramos + +* `Solvos Consultoría Informática, S.L. `_: + + * David Alonso diff --git a/helpdesk_mgmt_timesheet/readme/DESCRIPTION.rst b/helpdesk_mgmt_timesheet/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..2fc3327cbd --- /dev/null +++ b/helpdesk_mgmt_timesheet/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module adds Timesheet funcionality in Helpdesk module. diff --git a/helpdesk_mgmt_timesheet/readme/USAGE.rst b/helpdesk_mgmt_timesheet/readme/USAGE.rst new file mode 100644 index 0000000000..35662be7a1 --- /dev/null +++ b/helpdesk_mgmt_timesheet/readme/USAGE.rst @@ -0,0 +1,3 @@ +#. Go to *Helpdesk* or *Helpdesk > Dashboard* to see the tickets dashboard. +#. In the Kanban view, click in the kanban card of a team to see their tickets and create new ones. +#. If there is not a Default Project you will need select a Project for the Ticket to show the Timesheet Table. diff --git a/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml b/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml new file mode 100644 index 0000000000..c5b9e8c0e4 --- /dev/null +++ b/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml @@ -0,0 +1,20 @@ + + + + diff --git a/helpdesk_mgmt_timesheet/static/description/index.html b/helpdesk_mgmt_timesheet/static/description/index.html new file mode 100644 index 0000000000..a26e7f3bb7 --- /dev/null +++ b/helpdesk_mgmt_timesheet/static/description/index.html @@ -0,0 +1,468 @@ + + + + + + +Helpdesk Ticket Timesheet + + + +
+

Helpdesk Ticket Timesheet

+ + +

Beta License: AGPL-3 OCA/helpdesk Translate me on Weblate Try me on Runbot

+

This module adds Timesheet funcionality in Helpdesk module.

+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Allow Timesheet for a Helpdesk’s Team
    2. +
  2. Set a Default Project (optional)
    3. +
+
+

Allow Timesheet

+
    +
  1. Go to Helpdesk > Configuration > Teams.
    2. +
  2. Edit or create a new team.
    3. +
  3. Check Allow Timesheet option to allow timesheets for that team.
    4. +
  4. Select a Project for that team (optional).
    5. +
+
+
+
+

Usage

+
    +
  1. Go to Helpdesk or Helpdesk > Dashboard to see the tickets dashboard.
    2. +
  2. In the Kanban view, click in the kanban card of a team to see their tickets and create new ones.
    3. +
  3. If there is not a Default Project you will need select a Project for the Ticket to show the Timesheet Table.
    4. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Aresoltec Canarias
    • +
  • Punt Sistemes
    • +
  • SDi Soluciones Digitales
    • +
  • Solvos
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/helpdesk project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/helpdesk_mgmt_timesheet/tests/__init__.py b/helpdesk_mgmt_timesheet/tests/__init__.py new file mode 100644 index 0000000000..1df5365371 --- /dev/null +++ b/helpdesk_mgmt_timesheet/tests/__init__.py @@ -0,0 +1,4 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +from . import test_helpdesk_mgmt_timesheet diff --git a/helpdesk_mgmt_timesheet/tests/test_helpdesk_mgmt_timesheet.py b/helpdesk_mgmt_timesheet/tests/test_helpdesk_mgmt_timesheet.py new file mode 100644 index 0000000000..fdcb67a606 --- /dev/null +++ b/helpdesk_mgmt_timesheet/tests/test_helpdesk_mgmt_timesheet.py @@ -0,0 +1,55 @@ +############################################################################### +# For copyright and license notices, see __manifest__.py file in root directory +############################################################################### +import logging +from odoo.addons.helpdesk_mgmt.tests import test_helpdesk_ticket +from odoo import fields + +_log = logging.getLogger(__name__) + + +class TestHelpdeskMgmtTimesheet(test_helpdesk_ticket.TestHelpdeskTicket): + + @classmethod + def setUpClass(cls): + super(TestHelpdeskMgmtTimesheet, cls).setUpClass() + cls.project_id = cls.env['project.project'].create({ + 'name': 'Project', + }) + cls.team_id = cls.env['helpdesk.ticket.team'].create({ + 'name': "Team 1", + 'allow_timesheet': True, + 'default_project_id': cls.project_id.id, + }) + + def generate_timesheet(self, ticket, hours=1.0): + return self.env['account.analytic.line'].create({ + 'amount': 0, + 'date': fields.Date.today(), + 'name': 'Test Timesheet', + 'unit_amount': hours, + 'ticket_id': ticket.id, + 'project_id': ticket.project_id.id, + }) + + def generate_ticket(self): + return self.env['helpdesk.ticket'].create({ + 'name': 'Test Ticket 1', + 'description': 'Test ticket description', + 'team_id': self.team_id.id, + }) + + def test_helpdesk_mgmt_timesheet(self): + ticket = self.generate_ticket() + ticket._onchange_team_id() + self.assertEqual( + ticket.project_id.id, self.team_id.default_project_id.id) + ticket.planned_hours = 5 + timesheet1 = self.generate_timesheet(ticket, 2) + timesheet2 = self.generate_timesheet(ticket, 1) + self.assertEqual( + ticket.total_hours, + timesheet1.unit_amount + timesheet2.unit_amount) + self.assertEqual( + ticket.remaining_hours, + ticket.planned_hours - ticket.total_hours) diff --git a/helpdesk_mgmt_timesheet/views/helpdesk_team_view.xml b/helpdesk_mgmt_timesheet/views/helpdesk_team_view.xml new file mode 100644 index 0000000000..6ae4e33f05 --- /dev/null +++ b/helpdesk_mgmt_timesheet/views/helpdesk_team_view.xml @@ -0,0 +1,15 @@ + + + + timesheet.helpdesk.team.form.view + helpdesk.ticket.team + + + + + + + + + + diff --git a/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml b/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml new file mode 100644 index 0000000000..570c42742d --- /dev/null +++ b/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml @@ -0,0 +1,97 @@ + + + + helpdesk.ticket.view.search + helpdesk.ticket + + + + + + + + + + + + + helpdesk.ticket.view.tree + helpdesk.ticket + + + + remaining_hours < 0 + + + + + + + + + + + timesheet.helpdesk.ticket.form.view + helpdesk.ticket + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + timesheet.helpdesk.ticket.form.view project required + helpdesk.ticket + + + + {'required': [('allow_timesheet', '=', True)]} + + + + diff --git a/helpdesk_mgmt_timesheet/views/hr_timesheet_view.xml b/helpdesk_mgmt_timesheet/views/hr_timesheet_view.xml new file mode 100644 index 0000000000..ee22e2080e --- /dev/null +++ b/helpdesk_mgmt_timesheet/views/hr_timesheet_view.xml @@ -0,0 +1,84 @@ + + + + + account.analytic.line + + + + + + + + + + + + + + + + + + + + account.analytic.line + + + + + + + + + + + account.analytic.line + + + + + + + + + + + Timesheets + ir.actions.act_window + account.analytic.line + tree,kanban,form,pivot + form + [('ticket_id', '!=', False)] + { + 'ticket_required': True, + 'search_default_groupby_ticket_partner': 1, + 'search_default_groupby_ticket': 1, + } + + + + form + + + + + + + tree + + + + + + + + From da69c92a1a74b780bd90802bd1e4967b9d70e0e6 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sat, 22 Aug 2020 19:45:09 +0000 Subject: [PATCH 02/42] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 helpdesk_mgmt_timesheet/static/description/icon.png diff --git a/helpdesk_mgmt_timesheet/static/description/icon.png b/helpdesk_mgmt_timesheet/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 21ad4d91979f5d187017c45bcdfb08c4d2e371e9 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sat, 22 Aug 2020 19:45:10 +0000 Subject: [PATCH 03/42] helpdesk_mgmt_timesheet 12.0.1.1.0 --- helpdesk_mgmt_timesheet/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk_mgmt_timesheet/__manifest__.py b/helpdesk_mgmt_timesheet/__manifest__.py index a8dadad541..ef95877e64 100644 --- a/helpdesk_mgmt_timesheet/__manifest__.py +++ b/helpdesk_mgmt_timesheet/__manifest__.py @@ -15,7 +15,7 @@ 'website': 'https://github.com/OCA/helpdesk', 'license': 'AGPL-3', 'category': 'After-Sales', - 'version': '12.0.1.0.0', + 'version': '12.0.1.1.0', 'depends': [ 'helpdesk_mgmt_project', 'hr_timesheet', From e49c56b911f15f699bcd43aa29facebd82267ccb Mon Sep 17 00:00:00 2001 From: Fernando La Chica Date: Sun, 23 Aug 2020 09:42:55 +0200 Subject: [PATCH 04/42] [IMP] helpdesk_mgmt_timesheet: black, isort --- helpdesk_mgmt_timesheet/__manifest__.py | 41 ++++------ .../demo/helpdesk_mgmt_timesheet_demo.xml | 42 ++++------ .../models/helpdesk_ticket.py | 52 +++++------- .../models/helpdesk_ticket_team.py | 11 +-- .../models/hr_timesheet.py | 8 +- .../report/report_timesheet_templates.xml | 16 +++- .../tests/test_helpdesk_mgmt_timesheet.py | 62 +++++++------- .../views/helpdesk_team_view.xml | 6 +- .../views/helpdesk_ticket_view.xml | 82 +++++++++++++------ .../views/hr_timesheet_view.xml | 70 +++++++++------- 10 files changed, 211 insertions(+), 179 deletions(-) diff --git a/helpdesk_mgmt_timesheet/__manifest__.py b/helpdesk_mgmt_timesheet/__manifest__.py index ef95877e64..41d483c153 100644 --- a/helpdesk_mgmt_timesheet/__manifest__.py +++ b/helpdesk_mgmt_timesheet/__manifest__.py @@ -5,28 +5,23 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { - 'name': 'Helpdesk Ticket Timesheet', - 'summary': 'Add HR Timesheet to the tickets for Helpdesk Management.', - 'author': 'Aresoltec Canarias, ' - 'Punt Sistemes, ' - 'SDi Soluciones Digitales, ' - 'Solvos, ' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/helpdesk', - 'license': 'AGPL-3', - 'category': 'After-Sales', - 'version': '12.0.1.1.0', - 'depends': [ - 'helpdesk_mgmt_project', - 'hr_timesheet', - ], - 'data': [ - 'views/helpdesk_team_view.xml', - 'views/helpdesk_ticket_view.xml', - 'views/hr_timesheet_view.xml', - 'report/report_timesheet_templates.xml', - ], - 'demo': [ - 'demo/helpdesk_mgmt_timesheet_demo.xml', + "name": "Helpdesk Ticket Timesheet", + "summary": "Add HR Timesheet to the tickets for Helpdesk Management.", + "author": "Aresoltec Canarias, " + "Punt Sistemes, " + "SDi Soluciones Digitales, " + "Solvos, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/helpdesk", + "license": "AGPL-3", + "category": "After-Sales", + "version": "12.0.1.1.0", + "depends": ["helpdesk_mgmt_project", "hr_timesheet",], + "data": [ + "views/helpdesk_team_view.xml", + "views/helpdesk_ticket_view.xml", + "views/hr_timesheet_view.xml", + "report/report_timesheet_templates.xml", ], + "demo": ["demo/helpdesk_mgmt_timesheet_demo.xml",], } diff --git a/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml b/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml index 1cb85083d4..efbadd1b15 100644 --- a/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml +++ b/helpdesk_mgmt_timesheet/demo/helpdesk_mgmt_timesheet_demo.xml @@ -1,44 +1,38 @@ - + - Helpdesk general project - Helpdesk general task - + - - - + + - - - - - + + + + - - + Initial analysis - - - - + + + + - + Resolution - - - - + + + + - diff --git a/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py b/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py index 3e32e21c1e..0a6f711299 100644 --- a/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py +++ b/helpdesk_mgmt_timesheet/models/helpdesk_ticket.py @@ -5,69 +5,57 @@ class HelpdeskTicket(models.Model): - _inherit = 'helpdesk.ticket' + _inherit = "helpdesk.ticket" allow_timesheet = fields.Boolean( - string='Allow Timesheet', - related='team_id.allow_timesheet', - ) - planned_hours = fields.Float( - string='Planned Hours', - track_visibility='onchange', + string="Allow Timesheet", related="team_id.allow_timesheet", ) + planned_hours = fields.Float(string="Planned Hours", track_visibility="onchange",) progress = fields.Float( - compute='_compute_progress_hours', - group_operator='avg', + compute="_compute_progress_hours", + group_operator="avg", store=True, - string='Progress', + string="Progress", ) remaining_hours = fields.Float( - compute='_compute_progress_hours', + compute="_compute_progress_hours", readonly=True, store=True, - string='Remaining Hours', + string="Remaining Hours", ) timesheet_ids = fields.One2many( - comodel_name='account.analytic.line', - inverse_name='ticket_id', - string='Timesheet', + comodel_name="account.analytic.line", + inverse_name="ticket_id", + string="Timesheet", ) total_hours = fields.Float( - compute='_compute_total_hours', - readonly=True, - store=True, - string='Total Hours' + compute="_compute_total_hours", readonly=True, store=True, string="Total Hours" ) - @api.depends('timesheet_ids.unit_amount') + @api.depends("timesheet_ids.unit_amount") def _compute_total_hours(self): for record in self: - record.total_hours = sum( - record.timesheet_ids.mapped('unit_amount') - ) + record.total_hours = sum(record.timesheet_ids.mapped("unit_amount")) - @api.constrains('project_id') + @api.constrains("project_id") def _constrains_project_timesheets(self): for record in self: - record.timesheet_ids.update({ - 'project_id': record.project_id.id - }) + record.timesheet_ids.update({"project_id": record.project_id.id}) - @api.onchange('team_id') + @api.onchange("team_id") def _onchange_team_id(self): for record in self: record.project_id = record.team_id.default_project_id - @api.depends('planned_hours', 'total_hours') + @api.depends("planned_hours", "total_hours") def _compute_progress_hours(self): for ticket in self: ticket.progress = 0.0 - if (ticket.planned_hours > 0.0): + if ticket.planned_hours > 0.0: if ticket.total_hours > ticket.planned_hours: ticket.progress = 100 else: ticket.progress = round( - 100.0 * ticket.total_hours / ticket.planned_hours, - 2 + 100.0 * ticket.total_hours / ticket.planned_hours, 2 ) ticket.remaining_hours = ticket.planned_hours - ticket.total_hours diff --git a/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py b/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py index 5fe3aa4c9d..a6372b4aff 100644 --- a/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py +++ b/helpdesk_mgmt_timesheet/models/helpdesk_ticket_team.py @@ -5,17 +5,14 @@ class HelpdeskTicketTeam(models.Model): - _inherit = 'helpdesk.ticket.team' + _inherit = "helpdesk.ticket.team" - allow_timesheet = fields.Boolean( - string='Allow Timesheet', - ) + allow_timesheet = fields.Boolean(string="Allow Timesheet",) default_project_id = fields.Many2one( - comodel_name='project.project', - string='Default Project', + comodel_name="project.project", string="Default Project", ) - @api.constrains('allow_timesheet') + @api.constrains("allow_timesheet") def _constrains_allow_timesheet(self): if not self.allow_timesheet: self.default_project = False diff --git a/helpdesk_mgmt_timesheet/models/hr_timesheet.py b/helpdesk_mgmt_timesheet/models/hr_timesheet.py index 6011319c8e..2f5070bf72 100644 --- a/helpdesk_mgmt_timesheet/models/hr_timesheet.py +++ b/helpdesk_mgmt_timesheet/models/hr_timesheet.py @@ -5,16 +5,16 @@ class AccountAnalyticLine(models.Model): - _inherit = 'account.analytic.line' + _inherit = "account.analytic.line" ticket_id = fields.Many2one( - comodel_name='helpdesk.ticket', - string='Ticket', + comodel_name="helpdesk.ticket", + string="Ticket", domain=[("project_id", "!=", False)], groups="helpdesk_mgmt.group_helpdesk_user", ) ticket_partner_id = fields.Many2one( - comodel_name='res.partner', + comodel_name="res.partner", related="ticket_id.partner_id", string="Ticket partner", store=True, diff --git a/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml b/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml index c5b9e8c0e4..3d926e5ba8 100644 --- a/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml +++ b/helpdesk_mgmt_timesheet/report/report_timesheet_templates.xml @@ -2,15 +2,23 @@ From 7a66fcbc5b8f1f961c6efc25f6da4340617c27b9 Mon Sep 17 00:00:00 2001 From: aromera Date: Wed, 18 Aug 2021 15:27:42 +0200 Subject: [PATCH 25/42] [IMP] Merge helpdesk_mgmt_timeheet_time_control --- helpdesk_mgmt_timesheet/tests/__init__.py | 1 + .../test_helpdesk_timesheet_time_control.py | 102 ++++++++++++++ .../views/helpdesk_ticket_view.xml | 126 +++++++++++++++++- helpdesk_mgmt_timesheet/wizards/__init__.py | 1 + .../wizards/hr_timesheet_switch.py | 27 ++++ 5 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 helpdesk_mgmt_timesheet/tests/test_helpdesk_timesheet_time_control.py create mode 100644 helpdesk_mgmt_timesheet/wizards/__init__.py create mode 100644 helpdesk_mgmt_timesheet/wizards/hr_timesheet_switch.py diff --git a/helpdesk_mgmt_timesheet/tests/__init__.py b/helpdesk_mgmt_timesheet/tests/__init__.py index 1df5365371..5f539c1884 100644 --- a/helpdesk_mgmt_timesheet/tests/__init__.py +++ b/helpdesk_mgmt_timesheet/tests/__init__.py @@ -2,3 +2,4 @@ # For copyright and license notices, see __manifest__.py file in root directory ############################################################################### from . import test_helpdesk_mgmt_timesheet +from . import test_helpdesk_timesheet_time_control diff --git a/helpdesk_mgmt_timesheet/tests/test_helpdesk_timesheet_time_control.py b/helpdesk_mgmt_timesheet/tests/test_helpdesk_timesheet_time_control.py new file mode 100644 index 0000000000..f7d94dd0c9 --- /dev/null +++ b/helpdesk_mgmt_timesheet/tests/test_helpdesk_timesheet_time_control.py @@ -0,0 +1,102 @@ +# Copyright 2016-2018 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 + +from datetime import datetime, timedelta + +from odoo import exceptions, fields +from odoo.tests import common + + +class TestHelpdeskTimesheetTimeControl(common.TransactionCase): + def setUp(self): + super().setUp() + admin = self.browse_ref("base.user_admin") + admin.groups_id |= self.browse_ref("hr_timesheet.group_hr_timesheet_user") + self.uid = admin.id + self.project = self.env["project.project"].create( + {"name": "Test project", "allow_timesheets": True} + ) + self.project_without_timesheets = self.env["project.project"].create( + {"name": "Test project", "allow_timesheets": False} + ) + self.analytic_account = self.project.analytic_account_id + self.task = self.env["project.task"].create( + {"name": "Test task", "project_id": self.project.id} + ) + team_id = self.env["helpdesk.ticket.team"].create( + { + "name": "Team 1", + "allow_timesheet": True, + "default_project_id": self.project.id, + } + ) + self.ticket = self.env["helpdesk.ticket"].create( + { + "name": "Test Ticket", + "team_id": team_id.id, + "project_id": self.project.id, + "description": "Test ticket description", + "user_id": self.uid, + } + ) + self.ticket_line = self.env["account.analytic.line"].create( + { + "date_time": datetime.now() - timedelta(hours=1), + "ticket_id": self.ticket.id, + "project_id": self.project.id, + "account_id": self.analytic_account.id, + "name": "Test Ticket Timesheet line", + "user_id": self.uid, + } + ) + + def _create_wizard(self, action, active_record): + """Create a new hr.timesheet.switch wizard in the specified context. + :param dict action: Action definition that creates the wizard. + :param active_record: Record being browsed when creating the wizard. + """ + self.assertEqual(action["res_model"], "hr.timesheet.switch") + self.assertEqual(action["target"], "new") + self.assertEqual(action["type"], "ir.actions.act_window") + self.assertEqual(action["view_mode"], "form") + self.assertEqual(action["view_type"], "form") + return ( + active_record.env[action["res_model"]] + .with_context( + active_id=active_record.id, + active_ids=active_record.ids, + active_model=active_record._name, + **action.get("context", {}), + ) + .create({}) + ) + + def test_ticket_time_control_flow(self): + """Test project.task time controls.""" + # Running line found, stop the timer + self.assertEqual(self.ticket.show_time_control, "stop") + self.ticket.button_end_work() + # No more running lines, cannot stop again + with self.assertRaises(exceptions.UserError): + self.ticket.button_end_work() + # All lines stopped, start new one + self.ticket.invalidate_cache() + self.assertEqual(self.ticket.show_time_control, "start") + start_action = self.ticket.button_start_work() + wizard = self._create_wizard(start_action, self.ticket) + self.assertFalse(wizard.amount) + self.assertLessEqual(wizard.date_time, datetime.now()) + self.assertLessEqual(wizard.date, fields.Date.context_today(wizard)) + self.assertFalse(wizard.unit_amount) + self.assertEqual(wizard.account_id, self.ticket.project_id.analytic_account_id) + self.assertEqual(wizard.employee_id, self.env.user.employee_ids) + self.assertEqual(wizard.name, self.ticket_line.name) + self.assertEqual(wizard.project_id, self.ticket.project_id) + self.assertEqual(wizard.ticket_id, self.ticket) + new_act = wizard.with_context(show_created_timer=True).action_switch() + new_line = self.env[new_act["res_model"]].browse(new_act["res_id"]) + self.assertEqual(new_line.employee_id, self.env.user.employee_ids) + self.assertEqual(new_line.project_id, self.project) + self.assertEqual(new_line.ticket_id, self.ticket) + self.assertEqual(new_line.unit_amount, 0) + self.assertTrue(self.ticket_line.unit_amount) diff --git a/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml b/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml index 2e6363d925..644cbdfc49 100644 --- a/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml +++ b/helpdesk_mgmt_timesheet/views/helpdesk_ticket_view.xml @@ -34,6 +34,10 @@ helpdesk.ticket.view.tree helpdesk.ticket + remaining_hours < 0 @@ -55,14 +59,58 @@ groups="hr_timesheet.group_hr_timesheet_user" /> + + +