From 2afa90260fadc31e428a451de30153126c352b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Sainl=C3=A9ger?= Date: Wed, 25 Jun 2025 15:57:21 +0200 Subject: [PATCH] [CLN] global: apply ruff --- helpdesk_convert_ticket_to_task/README.md | 22 +++--- .../__manifest__.py | 9 ++- .../models/helpdesk_ticket.py | 77 +++++++++---------- .../README.md | 16 ++-- .../__manifest__.py | 2 +- .../controllers/__init__.py | 1 - .../controllers/main.py | 13 +++- .../views/helpdesk_ticket_templates.xml | 35 +++++---- .../README.md | 12 ++- .../controllers/__init__.py | 1 - .../controllers/main.py | 3 +- .../views/helpdesk_ticket_templates.xml | 54 ++++++++----- helpdesk_portal_timesheet/__init__.py | 1 - helpdesk_portal_timesheet/__manifest__.py | 5 +- helpdesk_request_type/__init__.py | 1 - helpdesk_request_type/__manifest__.py | 2 +- helpdesk_request_type/controllers/__init__.py | 2 +- helpdesk_request_type/controllers/main.py | 7 +- helpdesk_request_type/models/__init__.py | 2 +- .../models/helpdesk_request_type.py | 6 +- .../models/helpdesk_ticket.py | 2 +- .../views/helpdesk_request_type.xml | 9 ++- .../views/helpdesk_ticket.xml | 4 +- .../views/helpdesk_ticket_templates.xml | 20 +++-- .../__manifest__.py | 4 +- helpdesk_transfer_timesheet_to_task/README.md | 16 ++-- .../__manifest__.py | 2 +- .../models/helpdesk_ticket.py | 10 ++- .../tests/test_helpdesk_ticket.py | 3 +- .../models/helpdesk_ticket.py | 3 +- .../models/res_users.py | 7 +- .../views/res_users_views.xml | 2 +- 32 files changed, 194 insertions(+), 159 deletions(-) diff --git a/helpdesk_convert_ticket_to_task/README.md b/helpdesk_convert_ticket_to_task/README.md index dde6ce8..c91efb7 100644 --- a/helpdesk_convert_ticket_to_task/README.md +++ b/helpdesk_convert_ticket_to_task/README.md @@ -1,9 +1,7 @@ -=============================== -helpdesk_convert_ticket_to_task -=============================== +# helpdesk_convert_ticket_to_task -This module aims to convert a ticket into a task. -For this, it adds a button in the ticket view "Convert to task". +This module changes the behavior of the buttons "create" and "create and edit" of the +field `task` in a ticket form. It automatically fills up many fields (check the function button_convert_to_task for details) @@ -14,16 +12,16 @@ Use Odoo normal module installation procedure to install # Known issues / Roadmap -A current limitation is that one task can be linked to many tickets. -Thus, the above task fields are filled up at the creation of the task from a ticket form -but are not updated when the linked tickets are updated. +A current limitation is that one task can be linked to many tickets. Thus, the above +task fields are filled up at the creation of the task from a ticket form but are not +updated when the linked tickets are updated. # Bug Tracker -Bugs are tracked on `our issues website `\_. 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. +Bugs are tracked on +`our issues website `\_. 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. # Credits diff --git a/helpdesk_convert_ticket_to_task/__manifest__.py b/helpdesk_convert_ticket_to_task/__manifest__.py index d0ce9f7..1ef75a7 100644 --- a/helpdesk_convert_ticket_to_task/__manifest__.py +++ b/helpdesk_convert_ticket_to_task/__manifest__.py @@ -13,10 +13,13 @@ "base", "helpdesk_mgmt", "helpdesk_mgmt_project", - "helpdesk_request_type", # to create the helpdesk.request.type model and have the field request_type_id in the helpdesk.ticket model - "project_request_data", # to have the fields service_id and request_type_id in the project.task model + # to create the helpdesk.request.type model and have the field request_type_id + # in the helpdesk.ticket model + "helpdesk_request_type", + # to have the fields service_id and request_type_id in the project.task model + "project_request_data", "project_task_add_very_high", # to have priority values 2 and 3 on tasks - "helpdesk_transfer_timesheet_to_task" # to copy timesheets from ticket to task + "helpdesk_transfer_timesheet_to_task", # to copy timesheets from ticket to task ], "data": [ "views/helpdesk_convert_ticket_to_task.xml", diff --git a/helpdesk_convert_ticket_to_task/models/helpdesk_ticket.py b/helpdesk_convert_ticket_to_task/models/helpdesk_ticket.py index a76cb79..44647e3 100644 --- a/helpdesk_convert_ticket_to_task/models/helpdesk_ticket.py +++ b/helpdesk_convert_ticket_to_task/models/helpdesk_ticket.py @@ -1,5 +1,6 @@ from odoo import _, models, api + class HelpdeskTicket(models.Model): _inherit = "helpdesk.ticket" @@ -7,42 +8,41 @@ class HelpdeskTicket(models.Model): user_ids = [self.user_id.id] task_service_id, request_type_id = self._match_task_service_and_request_type( ticket_category_id=self.category_id.id, - ticket_request_type_id=self.request_type_id.id + ticket_request_type_id=self.request_type_id.id, ) - task = self.env["project.task"].create({ - "name": self.name, - "description": self.description, - "project_id": self.project_id.id, - "user_ids": user_ids, - "partner_id": self.partner_id.id, - "service_id": task_service_id, - "request_type_id": request_type_id, - "priority": self.priority - }) + task = self.env["project.task"].create( + { + "name": self.name, + "description": self.description, + "project_id": self.project_id.id, + "user_ids": user_ids, + "partner_id": self.partner_id.id, + "service_id": task_service_id, + "request_type_id": request_type_id, + "priority": self.priority, + } + ) # copy chatter for msg in reversed(self.message_ids): - msg.copy({ - 'model': 'project.task', - 'res_id': task.id - }) + msg.copy({"model": "project.task", "res_id": task.id}) # copy attachments inserted in the messages for attach in msg.attachment_ids: - attach.copy({ - 'res_model': 'project.task', - 'res_id': task.id, - 'res_name': task.name - }) + attach.copy( + { + "res_model": "project.task", + "res_id": task.id, + "res_name": task.name, + } + ) # copy attachments not added in a message for attachment in self.attachment_ids: - attachment.copy({ - 'res_model': 'project.task', - 'res_id': task.id, - 'res_name': task.name - }) + attachment.copy( + {"res_model": "project.task", "res_id": task.id, "res_name": task.name} + ) # copy subscribers task.message_subscribe(partner_ids=self.message_partner_ids.ids) @@ -52,7 +52,7 @@ class HelpdeskTicket(models.Model): ticket_url = f"{base_url}/web#id={self.id}&model=helpdesk.ticket&view_type=form" task_message = _( "This task has been converted from a ticket. You can find the original ticket on this link.", - ticket_url=ticket_url + ticket_url=ticket_url, ) task.message_post(body=task_message) @@ -60,15 +60,12 @@ class HelpdeskTicket(models.Model): task_url = f"{base_url}/web#id={task.id}&model=project.task&view_type=form" ticket_message = _( "This ticket has been converted into a task. You can find it on this link.", - task_url=task_url + task_url=task_url, ) self.message_post(body=ticket_message) # archive the ticket - self.write({ - "active": False, - "task_id": task.id - }) + self.write({"active": False, "task_id": task.id}) # transfer timesheets from ticket to task self._onchange_task_id() @@ -81,23 +78,23 @@ class HelpdeskTicket(models.Model): } def _match_task_service_and_request_type( - self, - ticket_category_id: int, - ticket_request_type_id: int + self, ticket_category_id: int, ticket_request_type_id: int ) -> tuple[int, int]: """ This function permits to match the task service_id and request_type from the ticket category and request type """ helpdesk_ticket_category = self.env["helpdesk.ticket.category"].search( - [("id", "=", ticket_category_id)], - limit=1 + [("id", "=", ticket_category_id)], limit=1 + ) + task_service = self.env["task.service"].search( + [("name", "=", helpdesk_ticket_category.name)] ) - task_service = self.env["task.service"].search([("name", "=", helpdesk_ticket_category.name)]) helpdesk_ticket_request_type = self.env["helpdesk.request.type"].search( - [("id", "=", ticket_request_type_id)], - limit=1 + [("id", "=", ticket_request_type_id)], limit=1 + ) + task_request_type = self.env["request.type"].search( + [("name", "=", helpdesk_ticket_request_type.name)] ) - task_request_type = self.env["request.type"].search([("name", "=", helpdesk_ticket_request_type.name)]) return task_service.id, task_request_type.id diff --git a/helpdesk_portal_ticket_enriched_description_form/README.md b/helpdesk_portal_ticket_enriched_description_form/README.md index 7f83a42..630103f 100644 --- a/helpdesk_portal_ticket_enriched_description_form/README.md +++ b/helpdesk_portal_ticket_enriched_description_form/README.md @@ -3,8 +3,8 @@ helpdesk_portal_ticket_enriched_description_form ================================================ Add fieds in ticket creation portal form to enrich description content. -Installation -============ + +# Installation Use Odoo normal module installation procedure to install `helpdesk_portal_ticket_enriched_description_form`. @@ -12,13 +12,13 @@ Use Odoo normal module installation procedure to install # Known issues / Roadmap None yet. -Bug Tracker -=========== -Bugs are tracked on `our issues website `\_. 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. +# Bug Tracker + +Bugs are tracked on +`our issues website `\_. 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. # Credits diff --git a/helpdesk_portal_ticket_enriched_description_form/__manifest__.py b/helpdesk_portal_ticket_enriched_description_form/__manifest__.py index 45484e4..af2b5dd 100644 --- a/helpdesk_portal_ticket_enriched_description_form/__manifest__.py +++ b/helpdesk_portal_ticket_enriched_description_form/__manifest__.py @@ -9,7 +9,7 @@ "maintainer": "Stéphan Sainléger", "license": "AGPL-3", "category": "Tools", - "summary": "Add fieds in ticket creation portal form to enrich description content.", + "summary": "Add fieds in ticket creation portal form to enrich description data.", # any module necessary for this one to work correctly "depends": [ "base", diff --git a/helpdesk_portal_ticket_enriched_description_form/controllers/__init__.py b/helpdesk_portal_ticket_enriched_description_form/controllers/__init__.py index 8b6d05e..12a7e52 100644 --- a/helpdesk_portal_ticket_enriched_description_form/controllers/__init__.py +++ b/helpdesk_portal_ticket_enriched_description_form/controllers/__init__.py @@ -1,2 +1 @@ - from . import main diff --git a/helpdesk_portal_ticket_enriched_description_form/controllers/main.py b/helpdesk_portal_ticket_enriched_description_form/controllers/main.py index 4c734ec..340f1f6 100644 --- a/helpdesk_portal_ticket_enriched_description_form/controllers/main.py +++ b/helpdesk_portal_ticket_enriched_description_form/controllers/main.py @@ -1,4 +1,3 @@ -import odoo.http as http from odoo import _ from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController @@ -9,15 +8,21 @@ class HelpdeskTicketControllerDescription(HelpdeskTicketController): description = "" if kw.get("small_description", False): description = ( - description + "%s
" % _(u"DESCRIPTION:") + kw["small_description"] + description + + "%s
" % _("DESCRIPTION:") + + kw["small_description"] ) del kw["small_description"] if kw.get("access", False): - description = description + "

%s
" % _(u"ACCESS:") + kw["access"] + description = ( + description + "

%s
" % _("ACCESS:") + kw["access"] + ) del kw["access"] if kw.get("bug_report", False): description = ( - description + "

%s
" % _(u"BUG REPORT:") + kw["bug_report"] + description + + "

%s
" % _("BUG REPORT:") + + kw["bug_report"] ) del kw["bug_report"] res.update({"description": description}) diff --git a/helpdesk_portal_ticket_enriched_description_form/views/helpdesk_ticket_templates.xml b/helpdesk_portal_ticket_enriched_description_form/views/helpdesk_ticket_templates.xml index b7d3745..8bdbdf3 100644 --- a/helpdesk_portal_ticket_enriched_description_form/views/helpdesk_ticket_templates.xml +++ b/helpdesk_portal_ticket_enriched_description_form/views/helpdesk_ticket_templates.xml @@ -1,7 +1,11 @@ - + -