1 Commits

Author SHA1 Message Date
801a4cb7f2 Sync config from odoo-elabore-ci:16.0
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 7m42s
2025-09-17 13:40:07 +00:00
45 changed files with 196 additions and 301 deletions

View File

@@ -15,10 +15,10 @@ jobs:
python-version: "3.11" python-version: "3.11"
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v4 # - uses: actions/cache@v4
with: # with:
path: ~/.cache/pre-commit # path: ~/.cache/pre-commit
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} # key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
- name: Install pre-commit - name: Install pre-commit
run: pip install pre-commit run: pip install pre-commit
- name: Run pre-commit - name: Run pre-commit

88
.gitignore vendored
View File

@@ -1,88 +0,0 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
/.venv
/.pytest_cache
/.ruff_cache
# C extensions
*.so
# Distribution / packaging
.Python
env/
bin/
build/
develop-eggs/
dist/
eggs/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
*.eggs
# Windows installers
*.msi
# Debian packages
*.deb
# Redhat packages
*.rpm
# MacOS packages
*.dmg
*.pkg
# Installer logs
pip-log.txt
pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.cache
nosetests.xml
coverage.xml
# Translations
*.mo
# Pycharm
.idea
# Eclipse
.settings
# Visual Studio cache/options directory
.vs/
.vscode
# OSX Files
.DS_Store
# Django stuff:
*.log
# Mr Developer
.mr.developer.cfg
.project
.pydevproject
# Rope
.ropeproject
# Sphinx documentation
docs/_build/
# Backup files
*~
*.swp
# OCA rules
!static/lib/

View File

@@ -44,15 +44,19 @@ repos:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://github.com/elabore-coop/helpdesk-tools"] entry:
bash -c 'oca-fix-manifest-website "https://git.elabore.coop/elabore/$(basename
$(git rev-parse --show-toplevel))"'
- id: oca-gen-addon-readme - id: oca-gen-addon-readme
args: entry:
- --addons-dir=. bash -c 'oca-gen-addon-readme
- --branch=16.0 --addons-dir=.
- --org-name=OCA --branch=$(git symbolic-ref
- --repo-name=helpdesk-tools refs/remotes/origin/HEAD | sed "s@^refs/remotes/origin/@@")
- --if-source-changed --repo-name=$(basename $(git rev-parse --show-toplevel))
- --keep-source-digest --org-name="Elabore"
--if-source-changed --keep-source-digest'
- repo: https://github.com/OCA/odoo-pre-commit-hooks - repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.1.4 rev: v0.1.4
hooks: hooks:

View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -1,7 +1,9 @@
# helpdesk_convert_ticket_to_task ===============================
helpdesk_convert_ticket_to_task
===============================
This module changes the behavior of the buttons "create" and "create and edit" of the This module aims to convert a ticket into a task.
field `task` in a ticket form. For this, it adds a button in the ticket view "Convert to task".
It automatically fills up many fields (check the function button_convert_to_task for details) It automatically fills up many fields (check the function button_convert_to_task for details)
@@ -12,16 +14,16 @@ Use Odoo normal module installation procedure to install
# Known issues / Roadmap # Known issues / Roadmap
A current limitation is that one task can be linked to many tickets. Thus, the above A current limitation is that one task can be linked to many tickets.
task fields are filled up at the creation of the task from a ticket form but are not Thus, the above task fields are filled up at the creation of the task from a ticket form
updated when the linked tickets are updated. but are not updated when the linked tickets are updated.
# Bug Tracker # Bug Tracker
Bugs are tracked on Bugs are tracked on `our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case of
`our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case trouble, please check there if your issue has already been
of trouble, please check there if your issue has already been reported. If you spotted reported. If you spotted it first, help us smashing it by providing a
it first, help us smashing it by providing a detailed and welcomed feedback. detailed and welcomed feedback.
# Credits # Credits

View File

@@ -4,7 +4,7 @@
"name": "helpdesk_convert_ticket_to_task", "name": "helpdesk_convert_ticket_to_task",
"version": "16.0.1.0.0", "version": "16.0.1.0.0",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Quentin Mondot", "maintainer": "Quentin Mondot",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",
@@ -13,13 +13,10 @@
"base", "base",
"helpdesk_mgmt", "helpdesk_mgmt",
"helpdesk_mgmt_project", "helpdesk_mgmt_project",
# to create the helpdesk.request.type model and have the field request_type_id "helpdesk_request_type", # to create the helpdesk.request.type model and have the field request_type_id in the helpdesk.ticket model
# in the helpdesk.ticket model "project_request_data", # to have the fields service_id and request_type_id in the project.task 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 "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": [ "data": [
"views/helpdesk_convert_ticket_to_task.xml", "views/helpdesk_convert_ticket_to_task.xml",

View File

@@ -1,6 +1,5 @@
from odoo import _, models, api from odoo import _, models, api
class HelpdeskTicket(models.Model): class HelpdeskTicket(models.Model):
_inherit = "helpdesk.ticket" _inherit = "helpdesk.ticket"
@@ -8,41 +7,42 @@ class HelpdeskTicket(models.Model):
user_ids = [self.user_id.id] user_ids = [self.user_id.id]
task_service_id, request_type_id = self._match_task_service_and_request_type( task_service_id, request_type_id = self._match_task_service_and_request_type(
ticket_category_id=self.category_id.id, 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( task = self.env["project.task"].create({
{ "name": self.name,
"name": self.name, "description": self.description,
"description": self.description, "project_id": self.project_id.id,
"project_id": self.project_id.id, "user_ids": user_ids,
"user_ids": user_ids, "partner_id": self.partner_id.id,
"partner_id": self.partner_id.id, "service_id": task_service_id,
"service_id": task_service_id, "request_type_id": request_type_id,
"request_type_id": request_type_id, "priority": self.priority
"priority": self.priority, })
}
)
# copy chatter # copy chatter
for msg in reversed(self.message_ids): 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 # copy attachments inserted in the messages
for attach in msg.attachment_ids: for attach in msg.attachment_ids:
attach.copy( attach.copy({
{ 'res_model': 'project.task',
"res_model": "project.task", 'res_id': task.id,
"res_id": task.id, 'res_name': task.name
"res_name": task.name, })
}
)
# copy attachments not added in a message # copy attachments not added in a message
for attachment in self.attachment_ids: for attachment in self.attachment_ids:
attachment.copy( attachment.copy({
{"res_model": "project.task", "res_id": task.id, "res_name": task.name} 'res_model': 'project.task',
) 'res_id': task.id,
'res_name': task.name
})
# copy subscribers # copy subscribers
task.message_subscribe(partner_ids=self.message_partner_ids.ids) 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" ticket_url = f"{base_url}/web#id={self.id}&model=helpdesk.ticket&view_type=form"
task_message = _( task_message = _(
"This task has been converted from a ticket. You can find the original ticket <a href='%(ticket_url)s' target='_blank'>on this link</a>.", "This task has been converted from a ticket. You can find the original ticket <a href='%(ticket_url)s' target='_blank'>on this link</a>.",
ticket_url=ticket_url, ticket_url=ticket_url
) )
task.message_post(body=task_message) task.message_post(body=task_message)
@@ -60,12 +60,15 @@ class HelpdeskTicket(models.Model):
task_url = f"{base_url}/web#id={task.id}&model=project.task&view_type=form" task_url = f"{base_url}/web#id={task.id}&model=project.task&view_type=form"
ticket_message = _( ticket_message = _(
"This ticket has been converted into a task. You can find it <a href='%(task_url)s' target='_blank'>on this link</a>.", "This ticket has been converted into a task. You can find it <a href='%(task_url)s' target='_blank'>on this link</a>.",
task_url=task_url, task_url=task_url
) )
self.message_post(body=ticket_message) self.message_post(body=ticket_message)
# archive the ticket # 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 # transfer timesheets from ticket to task
self._onchange_task_id() self._onchange_task_id()
@@ -78,23 +81,23 @@ class HelpdeskTicket(models.Model):
} }
def _match_task_service_and_request_type( 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]: ) -> tuple[int, int]:
""" """
This function permits to match the task service_id and request_type from the ticket category and request type 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( 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( 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 return task_service.id, task_request_type.id

View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -3,8 +3,8 @@ helpdesk_portal_ticket_enriched_description_form
================================================ ================================================
Add fieds in ticket creation portal form to enrich description content. Add fieds in ticket creation portal form to enrich description content.
Installation
# Installation ============
Use Odoo normal module installation procedure to install Use Odoo normal module installation procedure to install
`helpdesk_portal_ticket_enriched_description_form`. `helpdesk_portal_ticket_enriched_description_form`.
@@ -12,13 +12,13 @@ Use Odoo normal module installation procedure to install
# Known issues / Roadmap # Known issues / Roadmap
None yet. None yet.
Bug Tracker
===========
# Bug Tracker Bugs are tracked on `our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case of
trouble, please check there if your issue has already been
Bugs are tracked on reported. If you spotted it first, help us smashing it by providing a
`our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case detailed and welcomed feedback.
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 # Credits

View File

@@ -5,11 +5,11 @@
"name": "helpdesk_portal_ticket_enriched_description_form", "name": "helpdesk_portal_ticket_enriched_description_form",
"version": "16.0.1.0.1", "version": "16.0.1.0.1",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Stéphan Sainléger", "maintainer": "Stéphan Sainléger",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",
"summary": "Add fieds in ticket creation portal form to enrich description data.", "summary": "Add fieds in ticket creation portal form to enrich description content.",
# any module necessary for this one to work correctly # any module necessary for this one to work correctly
"depends": [ "depends": [
"base", "base",

View File

@@ -1 +1,2 @@
from . import main from . import main

View File

@@ -1,3 +1,4 @@
import odoo.http as http
from odoo import _ from odoo import _
from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController
@@ -8,21 +9,15 @@ class HelpdeskTicketControllerDescription(HelpdeskTicketController):
description = "" description = ""
if kw.get("small_description", False): if kw.get("small_description", False):
description = ( description = (
description description + "<b>%s</b><br/>" % _(u"DESCRIPTION:") + kw["small_description"]
+ "<b>%s</b><br/>" % _("DESCRIPTION:")
+ kw["small_description"]
) )
del kw["small_description"] del kw["small_description"]
if kw.get("access", False): if kw.get("access", False):
description = ( description = description + "<br/><br/><b>%s</b><br/>" % _(u"ACCESS:") + kw["access"]
description + "<br/><br/><b>%s</b><br/>" % _("ACCESS:") + kw["access"]
)
del kw["access"] del kw["access"]
if kw.get("bug_report", False): if kw.get("bug_report", False):
description = ( description = (
description description + "<br/><br/><b>%s</b><br/>" % _(u"BUG REPORT:") + kw["bug_report"]
+ "<br/><br/><b>%s</b><br/>" % _("BUG REPORT:")
+ kw["bug_report"]
) )
del kw["bug_report"] del kw["bug_report"]
res.update({"description": description}) res.update({"description": description})

View File

@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<template <template id="helpdesk_create_ticket_description" name="Create Ticket: Description"
id="helpdesk_create_ticket_description" inherit_id="helpdesk_mgmt.portal_create_ticket" priority="40">
name="Create Ticket: Description"
inherit_id="helpdesk_mgmt.portal_create_ticket"
priority="99"
>
<xpath expr="//textarea[@name='description']/../.." position="replace"> <xpath expr="//textarea[@name='description']/../.." position="replace">
<div class="form-group"> <div class="form-group">
<label <label
@@ -21,20 +17,23 @@
required="True" required="True"
/> />
</div> </div>
<span <span class="col-md-7 col-sm-8">Be precise. If there is a bug/error, please describe
class="col-md-7 col-sm-8"
>Be precise. If there is a bug/error, please describe
how to reproduce it</span> how to reproduce it</span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 col-dm-4 control-label" for="access">Access <label
class="col-md-3 col-dm-4 control-label"
for="access"
>Access
</label> </label>
<div class="col-md-7 col-sm-8"> <div class="col-md-7 col-sm-8">
<input class="form-control" type="text" name="access" /> <input
class="form-control"
type="text"
name="access"
/>
</div> </div>
<span <span class="col-md-7 col-sm-8">Link toward error or additional information</span>
class="col-md-7 col-sm-8"
>Link toward error or additional information</span>
</div> </div>
<div class="form-group"> <div class="form-group">
<label <label
@@ -49,11 +48,9 @@
style="min-height: 120px" style="min-height: 120px"
/> />
</div> </div>
<span <span class="col-md-7 col-sm-8">Paste here the complete error message (ex: error
class="col-md-7 col-sm-8"
>Paste here the complete error message (ex: error
code Odoo)</span> code Odoo)</span>
</div> </div>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -1,4 +1,6 @@
# helpdesk_portal_ticket_priority_form ====================================
helpdesk_portal_ticket_priority_form
====================================
Add fieds in ticket creation portal form for priority. Add fieds in ticket creation portal form for priority.
@@ -13,10 +15,10 @@ None yet.
# Bug Tracker # Bug Tracker
Bugs are tracked on Bugs are tracked on `our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case of
`our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case trouble, please check there if your issue has already been
of trouble, please check there if your issue has already been reported. If you spotted reported. If you spotted it first, help us smashing it by providing a
it first, help us smashing it by providing a detailed and welcomed feedback. detailed and welcomed feedback.
# Credits # Credits

View File

@@ -5,7 +5,7 @@
"name": "helpdesk_portal_ticket_priority_form", "name": "helpdesk_portal_ticket_priority_form",
"version": "16.0.1.0.0", "version": "16.0.1.0.0",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Stéphan Sainléger", "maintainer": "Stéphan Sainléger",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",

View File

@@ -1 +1,2 @@
from . import main from . import main

View File

@@ -1,5 +1,4 @@
import odoo.http as http import odoo.http as http
from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController
@@ -14,7 +13,7 @@ class HelpdeskTicketControllerPriority(HelpdeskTicketController):
@http.route("/new/ticket", type="http", auth="user", website=True) @http.route("/new/ticket", type="http", auth="user", website=True)
def create_new_ticket(self, **kw): def create_new_ticket(self, **kw):
res = super().create_new_ticket(**kw) res = super(HelpdeskTicketControllerPriority, self).create_new_ticket(**kw)
res.qcontext["priorities"] = self._get_ticket_priorities() res.qcontext["priorities"] = self._get_ticket_priorities()
return res return res

View File

@@ -1,30 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<template <template id="portal_my_tickets_priority_widget_template" name="Priority Widget Template">
id="portal_my_tickets_priority_widget_template" <span t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority >= '1' else '-o'}" />
name="Priority Widget Template" <span t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority >= '2' else '-o'}" />
> <span t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority == '3' else '-o'}" />
<span
t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority >= '1' else '-o'}"
/>
<span
t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority >= '2' else '-o'}"
/>
<span
t-attf-class="o_priority_star fa fa-star#{'' if ticket.priority == '3' else '-o'}"
/>
</template> </template>
<!-- Ticket create form --> <!-- Ticket create form -->
<template <template id="helptdesk_create_ticket_priority" name="Create Ticket: Priority"
id="helptdesk_create_ticket_priority" inherit_id="helpdesk_mgmt.portal_create_ticket" priority="40">
name="Create Ticket: Priority"
inherit_id="helpdesk_mgmt.portal_create_ticket"
priority="40"
>
<xpath expr="//form/div[2]" position="after"> <xpath expr="//form/div[2]" position="after">
<div class="form-group"> <div class="form-group">
<label class="col-md-3 col-sm-4 control-label" for="priority">Priority <label
class="col-md-3 col-sm-4 control-label"
for="priority"
>Priority
</label> </label>
<div class="col-md-7 col-sm-8"> <div class="col-md-7 col-sm-8">
<select name="priority" t-attf-class="form-control" required="True"> <select name="priority" t-attf-class="form-control" required="True">
@@ -42,33 +32,25 @@
<!-- Tickets portal list --> <!-- Tickets portal list -->
<template <template id="portal_ticket_list_priority" name="Ticket Portal List Template : Priority"
id="portal_ticket_list_priority" inherit_id="helpdesk_mgmt.portal_ticket_list">
name="Ticket Portal List Template : Priority"
inherit_id="helpdesk_mgmt.portal_ticket_list"
>
<xpath expr="//thead/tr/th[3]" position="after"> <xpath expr="//thead/tr/th[3]" position="after">
<th t-if="groupby == 'none'">Priority</th> <th t-if="groupby == 'none'">Priority</th>
</xpath> </xpath>
<xpath expr="//tbody/t/tr/td[3]" position="after"> <xpath expr="//tbody/t/tr/td[3]" position="after">
<td> <td>
<t <t
t-call="helpdesk_portal_ticket_priority_form.portal_my_tickets_priority_widget_template" t-call="helpdesk_portal_ticket_priority_form.portal_my_tickets_priority_widget_template" />
/>
</td> </td>
</xpath> </xpath>
</template> </template>
<!-- Ticket portal page --> <!-- Ticket portal page -->
<template <template id="portal_helpdesk_ticket_page_priority" name="Ticket Portal Template : Priority"
id="portal_helpdesk_ticket_page_priority" inherit_id="helpdesk_mgmt.portal_helpdesk_ticket_page">
name="Ticket Portal Template : Priority"
inherit_id="helpdesk_mgmt.portal_helpdesk_ticket_page"
>
<xpath expr="//h5/div/span" position="before"> <xpath expr="//h5/div/span" position="before">
<t <t
t-call="helpdesk_portal_ticket_priority_form.portal_my_tickets_priority_widget_template" t-call="helpdesk_portal_ticket_priority_form.portal_my_tickets_priority_widget_template" />
/>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

View File

@@ -1 +1,2 @@

View File

@@ -12,8 +12,7 @@
"summary": "Show ticket timesheets in portal view", "summary": "Show ticket timesheets in portal view",
# any module necessary for this one to work correctly # any module necessary for this one to work correctly
"depends": [ "depends": [
"helpdesk_mgmt_timesheet", "helpdesk_mgmt_timesheet","sale_timesheet_line_exclude",
"sale_timesheet_line_exclude",
], ],
"qweb": [], "qweb": [],
"external_dependencies": { "external_dependencies": {
@@ -32,4 +31,4 @@
# and independently installed. Used for synergetic or glue modules. # and independently installed. Used for synergetic or glue modules.
"auto_install": False, "auto_install": False,
"application": False, "application": False,
} }

2
helpdesk_request_type/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -1,2 +1,3 @@
from . import models from . import models
from . import controllers from . import controllers

View File

@@ -5,7 +5,7 @@
"name": "helpdesk_request_type", "name": "helpdesk_request_type",
"version": "16.0.1.0.1", "version": "16.0.1.0.1",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Stéphan Sainléger", "maintainer": "Stéphan Sainléger",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",
@@ -35,4 +35,4 @@
# and independently installed. Used for synergetic or glue modules. # and independently installed. Used for synergetic or glue modules.
"auto_install": False, "auto_install": False,
"application": False, "application": False,
} }

View File

@@ -1 +1 @@
from . import main from . import main

View File

@@ -1,12 +1,11 @@
import odoo.http as http import odoo.http as http
from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController from odoo.addons.helpdesk_mgmt.controllers.main import HelpdeskTicketController
class HelpdeskTicketControllerRequestType(HelpdeskTicketController): class HelpdeskTicketControllerRequestType(HelpdeskTicketController):
@http.route("/new/ticket", type="http", auth="user", website=True) @http.route("/new/ticket", type="http", auth="user", website=True)
def create_new_ticket(self, **kw): def create_new_ticket(self, **kw):
res = super().create_new_ticket(**kw) res = super(HelpdeskTicketControllerRequestType, self).create_new_ticket(**kw)
request_types = http.request.env["helpdesk.request.type"].search([]) request_types = http.request.env["helpdesk.request.type"].search([])
res.qcontext["request_types"] = request_types res.qcontext["request_types"] = request_types
return res return res
@@ -17,4 +16,4 @@ class HelpdeskTicketControllerRequestType(HelpdeskTicketController):
int(kw.get("request_type")) int(kw.get("request_type"))
) )
res.update({"request_type_id": request_type.id}) res.update({"request_type_id": request_type.id})
return res return res

View File

@@ -1,2 +1,2 @@
from . import helpdesk_request_type from . import helpdesk_request_type
from . import helpdesk_ticket from . import helpdesk_ticket

View File

@@ -1,9 +1,9 @@
from odoo import fields, models from odoo import models, fields
class RequestType(models.Model): class RequestType(models.Model):
_name = "helpdesk.request.type" _name = "helpdesk.request.type"
_description = "Request Type" _description = "Request Type"
name = fields.Char("name", required=True) name = fields.Char('name', required=True)
sequence = fields.Integer() sequence = fields.Integer()

View File

@@ -4,4 +4,4 @@ from odoo import fields, models
class HelpdeskTicket(models.Model): class HelpdeskTicket(models.Model):
_inherit = "helpdesk.ticket" _inherit = "helpdesk.ticket"
request_type_id = fields.Many2one("helpdesk.request.type", string="Request Type") request_type_id = fields.Many2one('helpdesk.request.type', string='Request Type')

View File

@@ -1,3 +1,3 @@
id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
access_helpdesk_request_type_user,helpdesk.request_type.user,model_helpdesk_request_type,,1,0,0,0 access_helpdesk_request_type_user,helpdesk.request_type.user,model_helpdesk_request_type,,1,0,0,0
access_helpdesk_request_type_manager,helpdesk.request_type.manager,model_helpdesk_request_type,base.group_user,1,1,1,1 access_helpdesk_request_type_manager,helpdesk.request_type.manager,model_helpdesk_request_type,base.group_user,1,1,1,1
1 id name model_id/id group_id/id perm_read perm_write perm_create perm_unlink
2 access_helpdesk_request_type_user helpdesk.request_type.user model_helpdesk_request_type 1 0 0 0
3 access_helpdesk_request_type_manager helpdesk.request_type.manager model_helpdesk_request_type base.group_user 1 1 1 1

View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<record id="helpdesk_request_type_view_tree" model="ir.ui.view"> <record id="helpdesk_request_type_view_tree" model="ir.ui.view">
<field name="name">helpdesk.request.type.view.tree</field> <field name="name">helpdesk.request.type.view.tree</field>
<field name="model">helpdesk.request.type</field> <field name="model">helpdesk.request.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree editable="top" default_order="sequence"> <tree string="Request Types" editable="top" default_order="sequence">
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="name" /> <field name="name" />
</tree> </tree>
@@ -23,7 +23,6 @@
action="act_helpdesk_request_types_list" action="act_helpdesk_request_types_list"
parent="helpdesk_mgmt.helpdesk_ticket_config_main_menu" parent="helpdesk_mgmt.helpdesk_ticket_config_main_menu"
sequence="99" sequence="99"
name="Request Types" name="Request Types" />
/>
</odoo> </odoo>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<odoo> <odoo>
<record id="ticket_view_form_request_type" model="ir.ui.view"> <record id="ticket_view_form_request_type" model="ir.ui.view">
<field name="name">helpdesk.ticket.form.request.type</field> <field name="name">helpdesk.ticket.form.request.type</field>
@@ -46,4 +46,4 @@
</xpath> </xpath>
</field> </field>
</record> </record>
</odoo> </odoo>

View File

@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<template <template id="portal_helpdesk_ticket_request_type" name="My Ticket: Request Type"
id="portal_helpdesk_ticket_request_type" inherit_id="helpdesk_mgmt.portal_helpdesk_ticket_page" priority="40">
name="My Ticket: Request Type"
inherit_id="helpdesk_mgmt.portal_helpdesk_ticket_page"
priority="40"
>
<xpath expr="//div[@name='portal_ticket_col_0']" position="inside"> <xpath expr="//div[@name='portal_ticket_col_0']" position="inside">
<div t-if="ticket.request_type_id"> <div t-if="ticket.request_type_id">
<strong>Request type:</strong> <strong>Request type:</strong>
@@ -14,12 +10,8 @@
</xpath> </xpath>
</template> </template>
<template <template id="portal_create_ticket_request-type" name="Create Ticket: Request Type"
id="portal_create_ticket_request-type" inherit_id="helpdesk_mgmt.portal_create_ticket" priority="40">
name="Create Ticket: Request Type"
inherit_id="helpdesk_mgmt.portal_create_ticket"
priority="40"
>
<xpath expr="//form/div[2]" position="after"> <xpath expr="//form/div[2]" position="after">
<div class="form-group"> <div class="form-group">
<label <label
@@ -44,4 +36,4 @@
</div> </div>
</xpath> </xpath>
</template> </template>
</odoo> </odoo>

View File

@@ -8,9 +8,9 @@
"website": "https://elabore.coop", "website": "https://elabore.coop",
"license": "LGPL-3", "license": "LGPL-3",
"category": "Helpdesk", "category": "Helpdesk",
"depends": ["sale_timesheet_line_exclude", "helpdesk_mgmt_timesheet"], "depends": ["sale_timesheet_line_exclude","helpdesk_mgmt_timesheet"],
"data": ["views/helpdesk_ticket.xml"], "data": ["views/helpdesk_ticket.xml"],
"installable": True, "installable": True,
"application": False, "application": False,
"auto_install": False, "auto_install": False,
} }

View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -1,7 +1,9 @@
# helpdesk_transfer_timesheet_to_task ===================================
helpdesk_transfer_timesheet_to_task
===================================
This module assigns the field task of the timesheets' ticket to the task linked to the This module assigns the field task of the timesheets' ticket to the task linked to the ticket.
ticket. Exception : the timesheet is not transfered to the task linked to the ticket if Exception : the timesheet is not transfered to the task linked to the ticket if
it has already been invoiced (timesheet_invoice_id != False). it has already been invoiced (timesheet_invoice_id != False).
# Installation # Installation
@@ -15,10 +17,10 @@ None.
# Bug Tracker # Bug Tracker
Bugs are tracked on Bugs are tracked on `our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case of
`our issues website <https://github.com/elabore-coop/helpdesk-tools/issues>`\_. In case trouble, please check there if your issue has already been
of trouble, please check there if your issue has already been reported. If you spotted reported. If you spotted it first, help us smashing it by providing a
it first, help us smashing it by providing a detailed and welcomed feedback. detailed and welcomed feedback.
# Credits # Credits

View File

@@ -4,7 +4,7 @@
"name": "helpdesk_transfer_timesheet_to_task", "name": "helpdesk_transfer_timesheet_to_task",
"version": "16.0.1.0.0", "version": "16.0.1.0.0",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Quentin Mondot", "maintainer": "Quentin Mondot",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",
@@ -14,7 +14,7 @@
"helpdesk_mgmt", "helpdesk_mgmt",
"helpdesk_mgmt_project", "helpdesk_mgmt_project",
"helpdesk_mgmt_timesheet", "helpdesk_mgmt_timesheet",
"sale_timesheet", "sale_timesheet"
], ],
"data": [], "data": [],
"installable": True, "installable": True,

View File

@@ -1,4 +1,4 @@
from odoo import Command, api, models from odoo import models, api, Command
class HelpdeskTicket(models.Model): class HelpdeskTicket(models.Model):
@@ -8,9 +8,5 @@ class HelpdeskTicket(models.Model):
def _onchange_task_id(self): def _onchange_task_id(self):
for record in self: for record in self:
if record.timesheet_ids and record.task_id: if record.timesheet_ids and record.task_id:
not_yet_invoiced_timesheet_ids = [ not_yet_invoiced_timesheet_ids = [t.id for t in record.timesheet_ids if not t.timesheet_invoice_id]
t.id for t in record.timesheet_ids if not t.timesheet_invoice_id record.task_id.timesheet_ids = [Command.link(t_id) for t_id in not_yet_invoiced_timesheet_ids]
]
record.task_id.timesheet_ids = [
Command.link(t_id) for t_id in not_yet_invoiced_timesheet_ids
]

View File

@@ -2,8 +2,9 @@ from odoo.tests.common import TransactionCase
class TestHelpdeskTicket(TransactionCase): class TestHelpdeskTicket(TransactionCase):
def setUp(self): def setUp(self):
super().setUp() super(TestHelpdeskTicket, self).setUp()
self.HelpdeskTicket = self.env["helpdesk.ticket"] self.HelpdeskTicket = self.env["helpdesk.ticket"]
self.ProjectTask = self.env["project.task"] self.ProjectTask = self.env["project.task"]
self.AccountAnalyticLine = self.env["account.analytic.line"] self.AccountAnalyticLine = self.env["account.analytic.line"]

View File

@@ -0,0 +1,2 @@
*.*~
*pyc

View File

@@ -1 +1,3 @@
# -*- coding: utf-8 -*-
from . import models from . import models

View File

@@ -5,7 +5,7 @@
"name": "helpdesk_user_default_ticket_team", "name": "helpdesk_user_default_ticket_team",
"version": "16.0.1.1.0", "version": "16.0.1.1.0",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/helpdesk-tools", "website": "https://elabore.coop",
"maintainer": "Stéphan Sainléger", "maintainer": "Stéphan Sainléger",
"license": "AGPL-3", "license": "AGPL-3",
"category": "Tools", "category": "Tools",

View File

@@ -1,5 +1,4 @@
from odoo import api, models from odoo import api, fields, models, tools
class HelpdeskTicket(models.Model): class HelpdeskTicket(models.Model):
_inherit = "helpdesk.ticket" _inherit = "helpdesk.ticket"

View File

@@ -1,9 +1,6 @@
from odoo import fields, models from odoo import _, api, fields, models
class Users(models.Model): class Users(models.Model):
_inherit = "res.users" _inherit = "res.users"
default_helpdesk_ticket_team_id = fields.Many2one( default_helpdesk_ticket_team_id = fields.Many2one('helpdesk.ticket.team', string='Default Helpdesk Team')
"helpdesk.ticket.team", string="Default Helpdesk Team"
)

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<odoo> <odoo>
<record id="view_users_form_inherit_default_helpdesk_team" model="ir.ui.view"> <record id="view_users_form_inherit_default_helpdesk_team" model="ir.ui.view">
<field name="name">view.users.form.inherit.default.helpdesk.team</field> <field name="name">view.users.form.inherit.default.helpdesk.team</field>