Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/server-tools (16.0) #1697

Merged
merged 5 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ addon | version | maintainers | summary
[excel_import_export](excel_import_export/) | 16.0.1.3.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Base module for developing Excel import/export/report
[excel_import_export_demo](excel_import_export_demo/) | 16.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Excel Import/Export/Report Demo
[excel_import_export_unidecode](excel_import_export_unidecode/) | 16.0.1.0.1 | | Add unidecode option to excel import/export/report
[fetchmail_attach_from_folder](fetchmail_attach_from_folder/) | 16.0.1.4.0 | [![NL66278](https://github.com/NL66278.png?size=30px)](https://github.com/NL66278) | Attach mails in an IMAP folder to existing objects
[fetchmail_attach_from_folder](fetchmail_attach_from_folder/) | 16.0.1.5.0 | [![NL66278](https://github.com/NL66278.png?size=30px)](https://github.com/NL66278) | Attach mails in an IMAP folder to existing objects
[html_text](html_text/) | 16.0.1.0.1 | | Generate excerpts from any HTML field
[iap_alternative_provider](iap_alternative_provider/) | 16.0.1.0.0 | [![sebastienbeau](https://github.com/sebastienbeau.png?size=30px)](https://github.com/sebastienbeau) | Base module for providing alternative provider for iap apps
[jsonifier](jsonifier/) | 16.0.0.0.1 | | JSON-ify data for all models
Expand Down
8 changes: 4 additions & 4 deletions fetchmail_attach_from_folder/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Email gateway - folders
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:b5ee1bcd71066b368da923b5aa94b37da6f960f51ffd129b199967db10b576d7
!! source digest: sha256:02f59002311ec1779781e9616b236d4a47a8b527bf0e09e4e1043cee650b439d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down Expand Up @@ -116,9 +116,9 @@ Authors
Contributors
------------

- Holger Brunn [email protected]
- Ronald Portier [email protected]
- Alexandre Fayolle [email protected]
- Holger Brunn [email protected]
- Ronald Portier [email protected]
- Alexandre Fayolle [email protected]

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion fetchmail_attach_from_folder/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Email gateway - folders",
"summary": "Attach mails in an IMAP folder to existing objects",
"version": "16.0.1.4.0",
"version": "16.0.1.5.0",
"author": "Therp BV,Odoo Community Association (OCA)",
"maintainers": ["NL66278"],
"website": "https://github.com/OCA/server-tools",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ msgstr ""
#. module: fetchmail_attach_from_folder
#. odoo-python
#: code:addons/fetchmail_attach_from_folder/models/fetchmail_server.py:0
#: code:addons/fetchmail_attach_from_folder/models/fetchmail_server.py:0
#, python-format
msgid "Confirm connection first."
msgstr ""
Expand Down
3 changes: 2 additions & 1 deletion fetchmail_attach_from_folder/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ msgstr "Data"
#. module: fetchmail_attach_from_folder
#: model:ir.model,name:fetchmail_attach_from_folder.model_fetchmail_server_folder
msgid "Define folders (IMAP mailboxes) from which to fetch mail."
msgstr "Definire le cartelle (cassette posta IMAP) dalle quali ricevere e-mail."
msgstr ""
"Definire le cartelle (cassette posta IMAP) dalle quali ricevere e-mail."

#. module: fetchmail_attach_from_folder
#: model:ir.model.fields,help:fetchmail_attach_from_folder.field_fetchmail_server_folder__delete_matching
Expand Down
7 changes: 6 additions & 1 deletion fetchmail_attach_from_folder/models/fetchmail_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import re

from odoo import _, api, fields, models
from odoo.exceptions import UserError

_logger = logging.getLogger(__name__)

Expand All @@ -30,7 +31,11 @@ def parse_list_response(line):
if this.state != "done":
this.folders_available = _("Confirm connection first.")
continue
connection = this.connect()
try:
connection = this.connect()
except UserError:
this.folders_available = _("Confirm connection first.")
continue
list_result = connection.list()
if list_result[0] != "OK":
this.folders_available = _("Unable to retrieve folders.")
Expand Down
2 changes: 1 addition & 1 deletion fetchmail_attach_from_folder/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Email gateway - folders</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:b5ee1bcd71066b368da923b5aa94b37da6f960f51ffd129b199967db10b576d7
!! source digest: sha256:02f59002311ec1779781e9616b236d4a47a8b527bf0e09e4e1043cee650b439d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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-tools/tree/16.0/fetchmail_attach_from_folder"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-tools-16-0/server-tools-16-0-fetchmail_attach_from_folder"><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-tools&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Adds the possibility to attach emails from a certain IMAP folder to
Expand Down
Loading