Skip to content

Commit

Permalink
Merge branch '16.0' of github.com:onesteinbv/addons-oca into 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ByteMeAsap committed Jan 29, 2025
2 parents 0f95d90 + 24d9d5a commit f1e0aae
Show file tree
Hide file tree
Showing 92 changed files with 9,175 additions and 1,508 deletions.
2 changes: 1 addition & 1 deletion base_technical_features/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Technical features group
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ef000192ce3bd670895ba5f923b01bbf17374b745bc2b722693a6d7068475901
!! source digest: sha256:f009e3aff22520aaf9dc7cf1f2d5956fb37d93a69894e8849df0a83b2b771693
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
3 changes: 2 additions & 1 deletion base_technical_features/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
{
"name": "Technical features group",
"summary": "Access to technical features without activating debug mode",
"version": "16.0.1.0.0",
"version": "16.0.1.0.1",
"category": "Usability",
"website": "https://github.com/OCA/server-ux",
"author": "Opener B.V., Odoo Community Association (OCA)",
"data": ["security/res_groups.xml", "views/res_users.xml", "data/res_users.xml"],
"license": "AGPL-3",
"installable": True,
"depends": ["base"],
}
23 changes: 13 additions & 10 deletions base_technical_features/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,60 @@ msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-21 04:22+0000\n"
"PO-Revision-Date: 2017-01-21 04:22+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
"PO-Revision-Date: 2024-12-31 17:06+0000\n"
"Last-Translator: samibc2c <sami.bouzidi@camptocamp.com>\n"
"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 5.6.2\n"

#. module: base_technical_features
#: model:ir.model,name:base_technical_features.model_base
msgid "Base"
msgstr ""
msgstr "Base"

#. module: base_technical_features
#: model:ir.model,name:base_technical_features.model_ir_ui_menu
msgid "Menu"
msgstr ""
msgstr "Menu"

#. module: base_technical_features
#: model:ir.model.fields,field_description:base_technical_features.field_res_users__show_technical_features
msgid "Show field Technical Features"
msgstr ""
msgstr "Montrer le champ Fonctionnalités techniques"

#. module: base_technical_features
#: model:ir.model.fields,field_description:base_technical_features.field_res_users__technical_features
msgid "Technical Features"
msgstr ""
msgstr "Fonctionnalités techniques"

#. module: base_technical_features
#: model:res.groups,name:base_technical_features.group_technical_features
msgid "Technical Features (w/o debug mode)"
msgstr ""
msgstr "Fonctionnalités techniques (sans le mode développeur)"

#. module: base_technical_features
#. odoo-python
#: code:addons/base_technical_features/models/res_users.py:0
#, python-format
msgid "The user does not have access to technical features."
msgstr ""
msgstr "L'utilisateur n'a pas accès aux fonctionnalités techniques."

#. module: base_technical_features
#: model:ir.model,name:base_technical_features.model_res_users
msgid "User"
msgstr ""
msgstr "Utilisateur"

#. module: base_technical_features
#: model:ir.model.fields,help:base_technical_features.field_res_users__show_technical_features
msgid ""
"Whether to display the technical features field in the user preferences."
msgstr ""
"Afficher ou non le champ des fonctionnalités techniques dans les préférences "
"utilisateurs."

#~ msgid "Users"
#~ msgstr "Utilisateurs"
14 changes: 8 additions & 6 deletions base_technical_features/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -369,7 +369,7 @@ <h1>Technical features group</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ef000192ce3bd670895ba5f923b01bbf17374b745bc2b722693a6d7068475901
!! source digest: sha256:f009e3aff22520aaf9dc7cf1f2d5956fb37d93a69894e8849df0a83b2b771693
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-ux/tree/16.0/base_technical_features"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-ux-16-0/server-ux-16-0-base_technical_features"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-ux&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
</div>
Expand Down Expand Up @@ -438,7 +438,9 @@ <h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
<div class="section" id="maintainers">
<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>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.</p>
Expand Down
2 changes: 1 addition & 1 deletion helpdesk_mgmt/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Helpdesk Management
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:71aa322793eba273a72d2cf000f8919114a8698300a6b8d682348d22a5c658b8
!! source digest: sha256:7270ae5cca6d8d5c04cbb1f44311d1f572e945d964b42152e92aa0c3b9b85aa6
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
3 changes: 2 additions & 1 deletion helpdesk_mgmt/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "Helpdesk Management",
"summary": """
Helpdesk""",
"version": "16.0.2.2.2",
"version": "16.0.2.7.0",
"license": "AGPL-3",
"category": "After-Sales",
"author": "AdaptiveCity, "
Expand Down Expand Up @@ -37,6 +37,7 @@
"assets": {
"web.assets_frontend": [
"helpdesk_mgmt/static/src/js/new_ticket.js",
"helpdesk_mgmt/static/src/js/portal.js", # TODO: push to OCA
],
},
"development_status": "Beta",
Expand Down
5 changes: 4 additions & 1 deletion helpdesk_mgmt/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,18 @@ def submit_ticket(self, **kw):
new_ticket = request.env["helpdesk.ticket"].sudo().create(vals)
new_ticket.message_subscribe(partner_ids=request.env.user.partner_id.ids)
if kw.get("attachment"):
IrAttachment = request.env["ir.attachment"]
attachment_ids = IrAttachment
for c_file in request.httprequest.files.getlist("attachment"):
data = c_file.read()
if c_file.filename:
request.env["ir.attachment"].sudo().create(
attachment_ids += IrAttachment.sudo().create(
{
"name": c_file.filename,
"datas": base64.b64encode(data),
"res_model": "helpdesk.ticket",
"res_id": new_ticket.id,
}
)
attachment_ids.sudo().generate_access_token()
return werkzeug.utils.redirect("/my/ticket/%s" % new_ticket.id)
11 changes: 11 additions & 0 deletions helpdesk_mgmt/controllers/myaccount.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,22 @@ def _ticket_get_page_view_values(self, ticket, access_token, **kwargs):
closed_stages = ticket.team_id._get_applicable_stages().filtered(
lambda s: s.close_from_portal
)
files = (
request.env["ir.attachment"]
.sudo()
.search(
[
("res_model", "=", "helpdesk.ticket"),
("res_id", "=", ticket.id),
]
)
)
values = {
"closed_stages": closed_stages, # used to display close buttons
"page_name": "ticket",
"ticket": ticket,
"user": request.env.user,
"files": files,
}
return self._get_page_view_values(
ticket, access_token, values, "my_tickets_history", False, **kwargs
Expand Down
13 changes: 11 additions & 2 deletions helpdesk_mgmt/demo/helpdesk_demo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@
<field eval="&quot;General Alias for tickets&quot;" name="alias_name" />
<field ref="model_helpdesk_ticket" name="alias_model_id" />
</record>
<record id="mail_alias_2" model="mail.alias">
<field eval="&quot;General Alias 2 for tickets&quot;" name="alias_name" />
<field ref="model_helpdesk_ticket" name="alias_model_id" />
</record>
<record id="mail_alias_3" model="mail.alias">
<field eval="&quot;General Alias 3 for tickets&quot;" name="alias_name" />
<field ref="model_helpdesk_ticket" name="alias_model_id" />
</record>

<!-- Teams -->
<record id="helpdesk_team_1" model="helpdesk.ticket.team">
<field eval="&quot;Localization team&quot;" name="name" />
Expand All @@ -46,15 +55,15 @@
<field eval="&quot;1&quot;" name="active" />
<field name="category_ids" eval="[(6,0,[ref('helpdesk_category_1')])]" />
<field name="company_id" ref="base.main_company" />
<field name="alias_id" ref="mail_alias_1" />
<field name="alias_id" ref="mail_alias_2" />
</record>
<record id="helpdesk_team_3" model="helpdesk.ticket.team">
<field eval="&quot;Consultants&quot;" name="name" />
<field name="user_ids" eval="[(6,0,[ref('base.user_root')])]" />
<field eval="&quot;1&quot;" name="active" />
<field name="category_ids" eval="[(6,0,[ref('helpdesk_category_2')])]" />
<field name="company_id" ref="base.main_company" />
<field name="alias_id" ref="mail_alias_1" />
<field name="alias_id" ref="mail_alias_3" />
</record>
<!-- Tags -->
<record id="helpdesk_tag_1" model="helpdesk.ticket.tag">
Expand Down
Loading

0 comments on commit f1e0aae

Please sign in to comment.