From 78b48311442147481f666eed5c62d4742d1ed350 Mon Sep 17 00:00:00 2001 From: Jacob Oldfield Date: Sun, 16 Jan 2022 13:26:50 +1100 Subject: [PATCH] [IMP] helpdesk_mgmt: black, isort, prettier --- helpdesk_mgmt/__manifest__.py | 2 +- helpdesk_mgmt/models/helpdesk_ticket.py | 14 +++++--------- helpdesk_mgmt/models/helpdesk_ticket_category.py | 2 -- helpdesk_mgmt/models/helpdesk_ticket_stage.py | 4 ++-- helpdesk_mgmt/models/helpdesk_ticket_tag.py | 2 +- helpdesk_mgmt/models/helpdesk_ticket_team.py | 10 +++++----- .../views/helpdesk_ticket_category_views.xml | 2 +- .../views/helpdesk_ticket_channel_views.xml | 2 +- .../views/helpdesk_ticket_stage_views.xml | 2 +- helpdesk_mgmt/views/helpdesk_ticket_tag_views.xml | 2 +- helpdesk_mgmt/views/helpdesk_ticket_team_views.xml | 2 +- setup/helpdesk_mgmt/odoo/addons/helpdesk_mgmt | 1 + setup/helpdesk_mgmt/setup.py | 6 ++++++ 13 files changed, 26 insertions(+), 25 deletions(-) create mode 120000 setup/helpdesk_mgmt/odoo/addons/helpdesk_mgmt create mode 100644 setup/helpdesk_mgmt/setup.py diff --git a/helpdesk_mgmt/__manifest__.py b/helpdesk_mgmt/__manifest__.py index 050b0c1b11..4a2b06fc81 100644 --- a/helpdesk_mgmt/__manifest__.py +++ b/helpdesk_mgmt/__manifest__.py @@ -4,7 +4,7 @@ "name": "Helpdesk Management", "summary": """ Helpdesk""", - "version": "14.0.1.2.0", + "version": "15.0.1.0.0", "license": "AGPL-3", "category": "After-Sales", "author": "AdaptiveCity, " diff --git a/helpdesk_mgmt/models/helpdesk_ticket.py b/helpdesk_mgmt/models/helpdesk_ticket.py index c8465cd6a8..1e9d740d28 100644 --- a/helpdesk_mgmt/models/helpdesk_ticket.py +++ b/helpdesk_mgmt/models/helpdesk_ticket.py @@ -41,11 +41,9 @@ def _read_group_stage_ids(self, stages, domain, order): partner_name = fields.Char() partner_email = fields.Char(string="Email") - last_stage_update = fields.Datetime( - string="Last Stage Update", default=fields.Datetime.now - ) - assigned_date = fields.Datetime(string="Assigned Date") - closed_date = fields.Datetime(string="Closed Date") + last_stage_update = fields.Datetime(default=fields.Datetime.now) + assigned_date = fields.Datetime() + closed_date = fields.Datetime() closed = fields.Boolean(related="stage_id.closed") unattended = fields.Boolean(related="stage_id.unattended", store=True) tag_ids = fields.Many2many(comodel_name="helpdesk.ticket.tag", string="Tags") @@ -76,7 +74,6 @@ def _read_group_stage_ids(self, stages, domain, order): ("2", "High"), ("3", "Very High"), ], - string="Priority", default="1", ) attachment_ids = fields.One2many( @@ -92,7 +89,6 @@ def _read_group_stage_ids(self, stages, domain, order): ("done", "Ready for next stage"), ("blocked", "Blocked"), ], - string="Kanban State", ) active = fields.Boolean(default=True) @@ -210,7 +206,7 @@ def message_new(self, msg, custom_values=None): return ticket def message_update(self, msg, update_vals=None): - """ Override message_update to subscribe partners """ + """Override message_update to subscribe partners""" email_list = tools.email_split( (msg.get("to") or "") + "," + (msg.get("cc") or "") ) @@ -241,5 +237,5 @@ def _message_get_suggested_recipients(self): except AccessError: # no read access rights -> just ignore suggested recipients because this # imply modifying followers - pass + return recipients return recipients diff --git a/helpdesk_mgmt/models/helpdesk_ticket_category.py b/helpdesk_mgmt/models/helpdesk_ticket_category.py index 1f0a0b4b7b..e48c984b51 100644 --- a/helpdesk_mgmt/models/helpdesk_ticket_category.py +++ b/helpdesk_mgmt/models/helpdesk_ticket_category.py @@ -7,11 +7,9 @@ class HelpdeskCategory(models.Model): _description = "Helpdesk Ticket Category" active = fields.Boolean( - string="Active", default=True, ) name = fields.Char( - string="Name", required=True, translate=True, ) diff --git a/helpdesk_mgmt/models/helpdesk_ticket_stage.py b/helpdesk_mgmt/models/helpdesk_ticket_stage.py index 96255c72f2..bb1cc3b8ac 100644 --- a/helpdesk_mgmt/models/helpdesk_ticket_stage.py +++ b/helpdesk_mgmt/models/helpdesk_ticket_stage.py @@ -10,8 +10,8 @@ class HelpdeskTicketStage(models.Model): description = fields.Html(translate=True, sanitize_style=True) sequence = fields.Integer(default=1) active = fields.Boolean(default=True) - unattended = fields.Boolean(string="Unattended") - closed = fields.Boolean(string="Closed") + unattended = fields.Boolean() + closed = fields.Boolean() mail_template_id = fields.Many2one( comodel_name="mail.template", string="Email Template", diff --git a/helpdesk_mgmt/models/helpdesk_ticket_tag.py b/helpdesk_mgmt/models/helpdesk_ticket_tag.py index c1431accd8..69c4cebb61 100644 --- a/helpdesk_mgmt/models/helpdesk_ticket_tag.py +++ b/helpdesk_mgmt/models/helpdesk_ticket_tag.py @@ -5,7 +5,7 @@ class HelpdeskTicketTag(models.Model): _name = "helpdesk.ticket.tag" _description = "Helpdesk Ticket Tag" - name = fields.Char(string="Name") + name = fields.Char() color = fields.Integer(string="Color Index") active = fields.Boolean(default=True) company_id = fields.Many2one( diff --git a/helpdesk_mgmt/models/helpdesk_ticket_team.py b/helpdesk_mgmt/models/helpdesk_ticket_team.py index 524ec82593..9757403f0e 100644 --- a/helpdesk_mgmt/models/helpdesk_ticket_team.py +++ b/helpdesk_mgmt/models/helpdesk_ticket_team.py @@ -8,7 +8,7 @@ class HelpdeskTeam(models.Model): _description = "Helpdesk Ticket Team" _inherit = ["mail.thread", "mail.alias.mixin"] - name = fields.Char(string="Name", required=True) + name = fields.Char(required=True) user_ids = fields.Many2many(comodel_name="res.users", string="Members") active = fields.Boolean(default=True) category_ids = fields.Many2many( @@ -74,15 +74,15 @@ def _compute_todo_tickets(self): for data in fetch_data ] for team in self: - team.todo_ticket_count = sum([r[4] for r in result if r[0] == team.id]) + team.todo_ticket_count = sum(r[4] for r in result if r[0] == team.id) team.todo_ticket_count_unassigned = sum( - [r[4] for r in result if r[0] == team.id and not r[1]] + r[4] for r in result if r[0] == team.id and not r[1] ) team.todo_ticket_count_unattended = sum( - [r[4] for r in result if r[0] == team.id and r[2]] + r[4] for r in result if r[0] == team.id and r[2] ) team.todo_ticket_count_high_priority = sum( - [r[4] for r in result if r[0] == team.id and r[3] == "3"] + r[4] for r in result if r[0] == team.id and r[3] == "3" ) def _alias_get_creation_values(self): diff --git a/helpdesk_mgmt/views/helpdesk_ticket_category_views.xml b/helpdesk_mgmt/views/helpdesk_ticket_category_views.xml index b148d93cc1..125ff36254 100644 --- a/helpdesk_mgmt/views/helpdesk_ticket_category_views.xml +++ b/helpdesk_mgmt/views/helpdesk_ticket_category_views.xml @@ -54,7 +54,7 @@ view.helpdesk_category.tree helpdesk.ticket.category - + diff --git a/helpdesk_mgmt/views/helpdesk_ticket_channel_views.xml b/helpdesk_mgmt/views/helpdesk_ticket_channel_views.xml index 5d269645a8..f5e3b2277b 100644 --- a/helpdesk_mgmt/views/helpdesk_ticket_channel_views.xml +++ b/helpdesk_mgmt/views/helpdesk_ticket_channel_views.xml @@ -54,7 +54,7 @@ view.helpdesk_channel.tree helpdesk.ticket.channel - + diff --git a/helpdesk_mgmt/views/helpdesk_ticket_stage_views.xml b/helpdesk_mgmt/views/helpdesk_ticket_stage_views.xml index 0dff753600..a13c618e94 100644 --- a/helpdesk_mgmt/views/helpdesk_ticket_stage_views.xml +++ b/helpdesk_mgmt/views/helpdesk_ticket_stage_views.xml @@ -66,7 +66,7 @@ helpdesk.ticket.stage.tree helpdesk.ticket.stage - + diff --git a/helpdesk_mgmt/views/helpdesk_ticket_tag_views.xml b/helpdesk_mgmt/views/helpdesk_ticket_tag_views.xml index 68d4a472c3..24a614b9cb 100644 --- a/helpdesk_mgmt/views/helpdesk_ticket_tag_views.xml +++ b/helpdesk_mgmt/views/helpdesk_ticket_tag_views.xml @@ -54,7 +54,7 @@ helpdesk.ticket.tag.tree helpdesk.ticket.tag - + diff --git a/helpdesk_mgmt/views/helpdesk_ticket_team_views.xml b/helpdesk_mgmt/views/helpdesk_ticket_team_views.xml index 4190ead020..941214ed50 100644 --- a/helpdesk_mgmt/views/helpdesk_ticket_team_views.xml +++ b/helpdesk_mgmt/views/helpdesk_ticket_team_views.xml @@ -146,7 +146,7 @@ view.helpdesk_team.tree helpdesk.ticket.team - + diff --git a/setup/helpdesk_mgmt/odoo/addons/helpdesk_mgmt b/setup/helpdesk_mgmt/odoo/addons/helpdesk_mgmt new file mode 120000 index 0000000000..ab8a8d3ee4 --- /dev/null +++ b/setup/helpdesk_mgmt/odoo/addons/helpdesk_mgmt @@ -0,0 +1 @@ +../../../../helpdesk_mgmt \ No newline at end of file diff --git a/setup/helpdesk_mgmt/setup.py b/setup/helpdesk_mgmt/setup.py new file mode 100644 index 0000000000..28c57bb640 --- /dev/null +++ b/setup/helpdesk_mgmt/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)