From fb734983b3f1573b383c3cf64924ee63784b2c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Tue, 22 Nov 2011 09:48:20 +0100 Subject: [PATCH 01/40] [add] mail_environment --- mail_environment/__init__.py | 6 ++ mail_environment/__openerp__.py | 22 +++++ mail_environment/env_mail.py | 142 ++++++++++++++++++++++++++++++++ mail_environment/mail_view.xml | 28 +++++++ 4 files changed, 198 insertions(+) create mode 100644 mail_environment/__init__.py create mode 100644 mail_environment/__openerp__.py create mode 100644 mail_environment/env_mail.py create mode 100644 mail_environment/mail_view.xml diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py new file mode 100644 index 00000000..beab69dc --- /dev/null +++ b/mail_environment/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Author Nicolas Bessi. Copyright Camptocamp SA +############################################################################## +from . import env_mail \ No newline at end of file diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py new file mode 100644 index 00000000..3c74e209 --- /dev/null +++ b/mail_environment/__openerp__.py @@ -0,0 +1,22 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Author Nicolas Bessi. Copyright Camptocamp SA +############################################################################## +{ + 'name': 'Server env config for mail + fetchmail', + 'version': '0.1', + 'category': 'Tools', + 'description': """ + extend mail and fetch mail with server env + """, + 'author': 'Camptocamp', + 'website': 'http://openerp.camptocamp.com', + 'depends': ['mail', 'fetchmail', 'server_environment', 'server_environment_files', 'crm'], + 'init_xml': [], + 'update_xml': ['mail_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py new file mode 100644 index 00000000..a1f9b426 --- /dev/null +++ b/mail_environment/env_mail.py @@ -0,0 +1,142 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Author Nicolas Bessi. Copyright Camptocamp SA +############################################################################## +from osv import fields +from osv import osv + +from server_environment import serv_config + + +class IRMAIL(osv.osv): + _inherit = "ir.mail_server" + + def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): + """ + Return configuration + """ + res = {} + for conf in self.browse(cursor, uid, ids): + res_dict = dict(serv_config.items('outgoing_mail')) + res_dict['smtp_port'] = int(res_dict.get('smtp_port', 587)) + res[conf.id] = res_dict + return res + + _columns = { + 'smtp_host': fields.function(_get_smtp_conf, + method=True, + string='SMTP Server', + type="char", + multi='smtp_host', + size=128), + 'smtp_port': fields.function(_get_smtp_conf, + method=True, + string='SMTP Port', + type="integer", + multi='smtp_port', + help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases.", + size=5), + 'smtp_user': fields.function(_get_smtp_conf, + method=True, + string='Username', + type="char", + multi='smtp_user', + help="Optional username for SMTP authentication", + size=64), + 'smtp_pass': fields.function(_get_smtp_conf, + method=True, + string='Password', + type="char", + multi='smtp_pass', + help="Optional password for SMTP authentication", + size=64), + 'smtp_encryption' :fields.function(_get_smtp_conf, + method=True, + string='smtp_encryption', + type="char", + multi='smtp_encryption', + help="Choose the connection encryption scheme:\n" + "- none: SMTP sessions are done in cleartext.\n" + "- starttls: TLS encryption is requested at start of SMTP session (Recommended)\n" + "- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)", + size=64)} + +IRMAIL() + + +class FetchmailServer(osv.osv): + """Incoming POP/IMAP mail server account""" + _inherit = 'fetchmail.server' + + def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): + """ + Return configuration + """ + res = {} + + for conf in self.browse(cursor, uid, ids): + res_dict = dict(serv_config.items('incoming_mail')) + res_dict['port'] = int(res_dict.get('port', 993)) + res_dict['is_ssl'] = bool(int(res_dict.get('is_ssl', 0))) + res_dict['attach'] = bool(int(res_dict.get('attach', 0))) + res_dict['original'] = bool(int(res_dict.get('original', 0))) + res[conf.id] = res_dict + return res + + _columns = { + 'server': fields.function(_get_incom_conf, + method=True, + string='Server', + type="char", + multi='server', + size=256, help="Hostname or IP of the mail server"), + 'port': fields.function(_get_incom_conf, + method=True, + string='Port', + type="integer", + multi='port', + help="Hostname or IP of the mail server"), + 'type': fields.function(_get_incom_conf, + method=True, + string='Type', + type="char", + multi='type', + size=64, + help="pop, imap, local"), + 'is_ssl': fields.function(_get_incom_conf, + method=True, + string='Is SSL', + type="boolean", + multi='is_ssl', + help='Connections are encrypted with SSL/TLS through' + ' a dedicated port (default: IMAPS=993, POP3S=995)'), + 'attach': fields.function(_get_incom_conf, + method=True, + string='Keep Attachments', + type="boolean", + multi='attach', + help="Whether attachments should be downloaded. " + "If not enabled, incoming emails will be stripped of any attachments before being processed"), + 'original': fields.function(_get_incom_conf, + method=True, + string='Keep Original', + type="boolean", + multi='attach', + help="Whether a full original copy of each email should be kept for reference" + "and attached to each processed message. This will usually double the size of your message database."), + 'user': fields.function(_get_incom_conf, + method=True, + string='Username', + type="char", + multi='user', + size=64), + 'password': fields.function(_get_incom_conf, + method=True, + string='password', + type="char", + multi='password', + size=64)} +FetchmailServer() + + \ No newline at end of file diff --git a/mail_environment/mail_view.xml b/mail_environment/mail_view.xml new file mode 100644 index 00000000..2a93a2df --- /dev/null +++ b/mail_environment/mail_view.xml @@ -0,0 +1,28 @@ + + + + + + inherit_fetchmail_for_env_support + fetchmail.server + + + + form + + + + + + + + + + + + + + + + + \ No newline at end of file From ff9c6f522d743959bb5a6a55382edad6009143cd Mon Sep 17 00:00:00 2001 From: "@" <@> Date: Tue, 22 Nov 2011 10:45:49 +0100 Subject: [PATCH 02/40] [IMP] mail_environment misc --- mail_environment/__init__.py | 7 +-- mail_environment/__openerp__.py | 51 +++++++++++++++- mail_environment/env_mail.py | 104 ++++++++++++++++++++++---------- 3 files changed, 122 insertions(+), 40 deletions(-) diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py index beab69dc..be0b4da9 100644 --- a/mail_environment/__init__.py +++ b/mail_environment/__init__.py @@ -1,6 +1 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Author Nicolas Bessi. Copyright Camptocamp SA -############################################################################## -from . import env_mail \ No newline at end of file +from . import env_mail diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index 3c74e209..fce396f8 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -1,16 +1,61 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Author Nicolas Bessi. Copyright Camptocamp SA +# Author: Nicolas Bessi +# Copyright 2012 Camptocamp SA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# ############################################################################## + { 'name': 'Server env config for mail + fetchmail', 'version': '0.1', 'category': 'Tools', 'description': """ - extend mail and fetch mail with server env +Extend mail and fetch mail with server environment module. + +In config files, sections outgoint_mail and incoming_mails are default values for all Outgoing Mail Servers and Fetchmail Servers. +For each server, you can (re)define values with a section named "outgoing_mail.resource_name" where resource_name is the name of your server. + +Exemple of config file : + +[outgoing_mail] +smtp_host = smtp.myserver.com +smtp_port = 587 +smtp_user = +smtp_pass = +smtp_encryption = ssl + +[outgoing_mail.openerp_smtp_server1] +smtp_user = openerp +smtp_pass = openerp + +[incoming_mail.openerp_pop_mail1] +server = mail.myserver.com +port = 110 +type = pop +is_ssl = 0 +attach = 0 +original = 0 +user = openerp@myserver.com +password = openerp + + """, 'author': 'Camptocamp', + 'license': 'AGPL-3', 'website': 'http://openerp.camptocamp.com', 'depends': ['mail', 'fetchmail', 'server_environment', 'server_environment_files', 'crm'], 'init_xml': [], diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py index a1f9b426..59d5f5fe 100644 --- a/mail_environment/env_mail.py +++ b/mail_environment/env_mail.py @@ -1,15 +1,31 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Author Nicolas Bessi. Copyright Camptocamp SA +# Author: Nicolas Bessi +# Copyright 2012 Camptocamp SA +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# ############################################################################## + from osv import fields from osv import osv from server_environment import serv_config -class IRMAIL(osv.osv): +class IrMail(osv.osv): _inherit = "ir.mail_server" def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): @@ -17,10 +33,22 @@ def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): Return configuration """ res = {} - for conf in self.browse(cursor, uid, ids): - res_dict = dict(serv_config.items('outgoing_mail')) - res_dict['smtp_port'] = int(res_dict.get('smtp_port', 587)) - res[conf.id] = res_dict + for mail_server in self.browse(cursor, uid, ids): + global_section_name = 'outgoing_mail' + + # default vals + config_vals = {'smtp_port': 587} + if serv_config.has_section(global_section_name): + config_vals.update((serv_config.items(global_section_name))) + + custom_section_name = '.'.join((global_section_name, mail_server.name)) + if serv_config.has_section(custom_section_name): + config_vals.update(serv_config.items(custom_section_name)) + + if config_vals.get('smtp_port'): + config_vals['smtp_port'] = int(config_vals['smtp_port']) + + res[mail_server.id] = config_vals return res _columns = { @@ -28,41 +56,41 @@ def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): method=True, string='SMTP Server', type="char", - multi='smtp_host', + multi='outgoing_mail_config', size=128), 'smtp_port': fields.function(_get_smtp_conf, method=True, string='SMTP Port', type="integer", - multi='smtp_port', + multi='outgoing_mail_config', help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases.", size=5), 'smtp_user': fields.function(_get_smtp_conf, method=True, string='Username', type="char", - multi='smtp_user', + multi='outgoing_mail_config', help="Optional username for SMTP authentication", size=64), 'smtp_pass': fields.function(_get_smtp_conf, method=True, string='Password', type="char", - multi='smtp_pass', + multi='outgoing_mail_config', help="Optional password for SMTP authentication", size=64), 'smtp_encryption' :fields.function(_get_smtp_conf, method=True, string='smtp_encryption', type="char", - multi='smtp_encryption', + multi='outgoing_mail_config', help="Choose the connection encryption scheme:\n" "- none: SMTP sessions are done in cleartext.\n" "- starttls: TLS encryption is requested at start of SMTP session (Recommended)\n" "- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)", size=64)} -IRMAIL() +IrMail() class FetchmailServer(osv.osv): @@ -74,14 +102,30 @@ def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): Return configuration """ res = {} - - for conf in self.browse(cursor, uid, ids): - res_dict = dict(serv_config.items('incoming_mail')) - res_dict['port'] = int(res_dict.get('port', 993)) - res_dict['is_ssl'] = bool(int(res_dict.get('is_ssl', 0))) - res_dict['attach'] = bool(int(res_dict.get('attach', 0))) - res_dict['original'] = bool(int(res_dict.get('original', 0))) - res[conf.id] = res_dict + for fetchmail in self.browse(cursor, uid, ids): + global_section_name = 'incoming_mail' + + key_types = {'port': int, + 'is_ssl': lambda a: bool(int(a)), + 'attach': lambda a: bool(int(a)), + 'original': lambda a: bool(int(a)),} + + # default vals + config_vals = {'port': 993, + 'is_ssl': 0, + 'attach': 0, + 'original': 0} + if serv_config.has_section(global_section_name): + config_vals.update(serv_config.items(global_section_name)) + + custom_section_name = '.'.join((global_section_name, fetchmail.name)) + if serv_config.has_section(custom_section_name): + config_vals.update(serv_config.items(custom_section_name)) + + for key, to_type in key_types.iteritems(): + if config_vals.get(key): + config_vals[key] = to_type(config_vals[key]) + res[fetchmail.id] = config_vals return res _columns = { @@ -89,54 +133,52 @@ def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): method=True, string='Server', type="char", - multi='server', + multi='income_mail_config', size=256, help="Hostname or IP of the mail server"), 'port': fields.function(_get_incom_conf, method=True, string='Port', type="integer", - multi='port', + multi='income_mail_config', help="Hostname or IP of the mail server"), 'type': fields.function(_get_incom_conf, method=True, string='Type', type="char", - multi='type', + multi='income_mail_config', size=64, help="pop, imap, local"), 'is_ssl': fields.function(_get_incom_conf, method=True, string='Is SSL', type="boolean", - multi='is_ssl', + multi='income_mail_config', help='Connections are encrypted with SSL/TLS through' ' a dedicated port (default: IMAPS=993, POP3S=995)'), 'attach': fields.function(_get_incom_conf, method=True, string='Keep Attachments', type="boolean", - multi='attach', + multi='income_mail_config', help="Whether attachments should be downloaded. " "If not enabled, incoming emails will be stripped of any attachments before being processed"), 'original': fields.function(_get_incom_conf, method=True, string='Keep Original', type="boolean", - multi='attach', + multi='income_mail_config', help="Whether a full original copy of each email should be kept for reference" "and attached to each processed message. This will usually double the size of your message database."), 'user': fields.function(_get_incom_conf, method=True, string='Username', type="char", - multi='user', + multi='income_mail_config', size=64), 'password': fields.function(_get_incom_conf, method=True, string='password', type="char", - multi='password', + multi='income_mail_config', size=64)} FetchmailServer() - - \ No newline at end of file From 08187a877d544e8f21f844e9fc0db76010b3fd1f Mon Sep 17 00:00:00 2001 From: Joel Grand-Guillaume Date: Fri, 8 Nov 2013 15:06:53 +0100 Subject: [PATCH 03/40] [FIX] Add fnct_search on type in order to avoid error when ir.cron run the fetch task --- mail_environment/env_mail.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py index 59d5f5fe..e5c8bb99 100644 --- a/mail_environment/env_mail.py +++ b/mail_environment/env_mail.py @@ -128,6 +128,29 @@ def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): res[fetchmail.id] = config_vals return res + def _type_search(self, cr, uid, obj, name, args, context={}): + result_ids = [] + # read all incomming servers values + all_ids = self.search(cr, uid, [], context=context) + results = self.read(cr, uid, all_ids, ['id','type'], context=context) + args = args[:] + i = 0 + while i < len(args): + operator = args[i][1] + if operator == '=': + for res in results: + if (res['type'] == args[i][2]) and (res['id'] not in result_ids): + result_ids.append(res['id']) + elif operator == 'in': + for search_vals in args[i][2]: + for res in results: + if (res['type'] == search_vals) and (res['id'] not in result_ids): + result_ids.append(res['id']) + else: + continue + i += 1 + return [('id', 'in', result_ids)] + _columns = { 'server': fields.function(_get_incom_conf, method=True, @@ -146,6 +169,7 @@ def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): string='Type', type="char", multi='income_mail_config', + fnct_search=_type_search, size=64, help="pop, imap, local"), 'is_ssl': fields.function(_get_incom_conf, From b59f53b09ac16752bb3e4c287022dd8b645ec912 Mon Sep 17 00:00:00 2001 From: Jose Morales Date: Sun, 16 Feb 2014 19:13:30 -0530 Subject: [PATCH 04/40] [IMP] 7.0 no view type required --- mail_environment/mail_view.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mail_environment/mail_view.xml b/mail_environment/mail_view.xml index 2a93a2df..59577ed2 100644 --- a/mail_environment/mail_view.xml +++ b/mail_environment/mail_view.xml @@ -8,7 +8,6 @@ - form @@ -25,4 +24,4 @@ - \ No newline at end of file + From 7bbe1abaff49d0a5f4ad1b328127277e3bbf97fd Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Wed, 8 Oct 2014 11:30:14 +0200 Subject: [PATCH 05/40] mail_eniroment misc improvements * Move mail_environment in root folder * Use absolute imports for openerp and new Model classes * Use cr argument instead of cursor, propagate context * Update fields, remove deprecated 'method' argument, change 'states' otherwise the fields are not readonly (seems that the 'states' of the original field is kept. * Activate the installable flag * Indentation of the view with 2 spaces * Remove only the attrs attribute instead of redefining the whole field * pep8 * crm is not a dependency for mail_environment * Fix typo in manifest --- mail_environment/__init__.py | 1 + mail_environment/__openerp__.py | 15 +- mail_environment/env_mail.py | 254 +++++++++++++++++--------------- mail_environment/mail_view.xml | 45 +++--- 4 files changed, 171 insertions(+), 144 deletions(-) diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py index be0b4da9..89dd1478 100644 --- a/mail_environment/__init__.py +++ b/mail_environment/__init__.py @@ -1 +1,2 @@ +# -*- coding: utf-8 -*- from . import env_mail diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index fce396f8..05efe571 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -26,15 +26,17 @@ 'description': """ Extend mail and fetch mail with server environment module. -In config files, sections outgoint_mail and incoming_mails are default values for all Outgoing Mail Servers and Fetchmail Servers. -For each server, you can (re)define values with a section named "outgoing_mail.resource_name" where resource_name is the name of your server. +In config files, sections outgoing_mail and incoming_mails are default values +for all Outgoing Mail Servers and Fetchmail Servers. +For each server, you can (re)define values with a section named +"outgoing_mail.resource_name" where resource_name is the name of your server. Exemple of config file : [outgoing_mail] smtp_host = smtp.myserver.com smtp_port = 587 -smtp_user = +smtp_user = smtp_pass = smtp_encryption = ssl @@ -57,11 +59,14 @@ 'author': 'Camptocamp', 'license': 'AGPL-3', 'website': 'http://openerp.camptocamp.com', - 'depends': ['mail', 'fetchmail', 'server_environment', 'server_environment_files', 'crm'], + 'depends': ['mail', + 'fetchmail', + 'server_environment', + 'server_environment_files', + ], 'init_xml': [], 'update_xml': ['mail_view.xml'], 'demo_xml': [], 'installable': True, 'active': False, } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py index e5c8bb99..c4025340 100644 --- a/mail_environment/env_mail.py +++ b/mail_environment/env_mail.py @@ -19,21 +19,20 @@ # ############################################################################## -from osv import fields -from osv import osv +from openerp.osv import orm, fields -from server_environment import serv_config +from openerp.addons.server_environment import serv_config -class IrMail(osv.osv): +class IrMail(orm.Model): _inherit = "ir.mail_server" - - def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): + + def _get_smtp_conf(self, cr, uid, ids, name, args, context=None): """ Return configuration """ res = {} - for mail_server in self.browse(cursor, uid, ids): + for mail_server in self.browse(cr, uid, ids, context=context): global_section_name = 'outgoing_mail' # default vals @@ -41,7 +40,8 @@ def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): if serv_config.has_section(global_section_name): config_vals.update((serv_config.items(global_section_name))) - custom_section_name = '.'.join((global_section_name, mail_server.name)) + custom_section_name = '.'.join((global_section_name, + mail_server.name)) if serv_config.has_section(custom_section_name): config_vals.update(serv_config.items(custom_section_name)) @@ -52,73 +52,85 @@ def _get_smtp_conf(self, cursor, uid, ids, name, args, context=None): return res _columns = { - 'smtp_host': fields.function(_get_smtp_conf, - method=True, - string='SMTP Server', - type="char", - multi='outgoing_mail_config', - size=128), - 'smtp_port': fields.function(_get_smtp_conf, - method=True, - string='SMTP Port', - type="integer", - multi='outgoing_mail_config', - help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases.", - size=5), - 'smtp_user': fields.function(_get_smtp_conf, - method=True, - string='Username', - type="char", - multi='outgoing_mail_config', - help="Optional username for SMTP authentication", - size=64), - 'smtp_pass': fields.function(_get_smtp_conf, - method=True, - string='Password', - type="char", - multi='outgoing_mail_config', - help="Optional password for SMTP authentication", - size=64), - 'smtp_encryption' :fields.function(_get_smtp_conf, - method=True, - string='smtp_encryption', - type="char", - multi='outgoing_mail_config', - help="Choose the connection encryption scheme:\n" - "- none: SMTP sessions are done in cleartext.\n" - "- starttls: TLS encryption is requested at start of SMTP session (Recommended)\n" - "- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)", - size=64)} - -IrMail() - - -class FetchmailServer(osv.osv): + 'smtp_host': fields.function( + _get_smtp_conf, + string='SMTP Server', + type="char", + multi='outgoing_mail_config', + states={'draft': [('readonly', True)]}, + help="Hostname or IP of SMTP server"), + 'smtp_port': fields.function( + _get_smtp_conf, + string='SMTP Port', + type="integer", + multi='outgoing_mail_config', + states={'draft': [('readonly', True)]}, + help="SMTP Port. Usually 465 for SSL, " + "and 25 or 587 for other cases.", + size=5), + 'smtp_user': fields.function( + _get_smtp_conf, + string='Username', + type="char", + multi='outgoing_mail_config', + states={'draft': [('readonly', True)]}, + help="Optional username for SMTP authentication", + size=64), + 'smtp_pass': fields.function( + _get_smtp_conf, + string='Password', + type="char", + multi='outgoing_mail_config', + states={'draft': [('readonly', True)]}, + help="Optional password for SMTP authentication", + size=64), + 'smtp_encryption': fields.function( + _get_smtp_conf, + string='smtp_encryption', + type="selection", + multi='outgoing_mail_config', + selection=[('none', 'None'), + ('starttls', 'TLS (STARTTLS)'), + ('ssl', 'SSL/TLS')], + states={'draft': [('readonly', True)]}, + help="Choose the connection encryption scheme:\n" + "- none: SMTP sessions are done in cleartext.\n" + "- starttls: TLS encryption is requested at start " + "of SMTP session (Recommended)\n" + "- ssl: SMTP sessions are encrypted with SSL/TLS " + "through a dedicated port (default: 465)") + } + + +class FetchmailServer(orm.Model): """Incoming POP/IMAP mail server account""" _inherit = 'fetchmail.server' - def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): + def _get_incom_conf(self, cr, uid, ids, name, args, context=None): """ Return configuration """ res = {} - for fetchmail in self.browse(cursor, uid, ids): + for fetchmail in self.browse(cr, uid, ids, context=context): global_section_name = 'incoming_mail' key_types = {'port': int, 'is_ssl': lambda a: bool(int(a)), 'attach': lambda a: bool(int(a)), - 'original': lambda a: bool(int(a)),} + 'original': lambda a: bool(int(a)), + } # default vals config_vals = {'port': 993, 'is_ssl': 0, 'attach': 0, - 'original': 0} + 'original': 0, + } if serv_config.has_section(global_section_name): config_vals.update(serv_config.items(global_section_name)) - custom_section_name = '.'.join((global_section_name, fetchmail.name)) + custom_section_name = '.'.join((global_section_name, + fetchmail.name)) if serv_config.has_section(custom_section_name): config_vals.update(serv_config.items(custom_section_name)) @@ -128,81 +140,93 @@ def _get_incom_conf(self, cursor, uid, ids, name, args, context=None): res[fetchmail.id] = config_vals return res - def _type_search(self, cr, uid, obj, name, args, context={}): + def _type_search(self, cr, uid, obj, name, args, context=None): result_ids = [] - # read all incomming servers values + # read all incoming servers values all_ids = self.search(cr, uid, [], context=context) - results = self.read(cr, uid, all_ids, ['id','type'], context=context) + results = self.read(cr, uid, all_ids, ['id', 'type'], context=context) args = args[:] i = 0 while i < len(args): operator = args[i][1] if operator == '=': for res in results: - if (res['type'] == args[i][2]) and (res['id'] not in result_ids): + if (res['type'] == args[i][2] and + res['id'] not in result_ids): result_ids.append(res['id']) elif operator == 'in': for search_vals in args[i][2]: for res in results: - if (res['type'] == search_vals) and (res['id'] not in result_ids): - result_ids.append(res['id']) + if (res['type'] == search_vals and + res['id'] not in result_ids): + result_ids.append(res['id']) else: continue i += 1 return [('id', 'in', result_ids)] _columns = { - 'server': fields.function(_get_incom_conf, - method=True, - string='Server', - type="char", - multi='income_mail_config', - size=256, help="Hostname or IP of the mail server"), - 'port': fields.function(_get_incom_conf, - method=True, - string='Port', - type="integer", - multi='income_mail_config', - help="Hostname or IP of the mail server"), - 'type': fields.function(_get_incom_conf, - method=True, - string='Type', - type="char", - multi='income_mail_config', - fnct_search=_type_search, - size=64, - help="pop, imap, local"), - 'is_ssl': fields.function(_get_incom_conf, - method=True, - string='Is SSL', - type="boolean", - multi='income_mail_config', - help='Connections are encrypted with SSL/TLS through' - ' a dedicated port (default: IMAPS=993, POP3S=995)'), - 'attach': fields.function(_get_incom_conf, - method=True, - string='Keep Attachments', - type="boolean", - multi='income_mail_config', - help="Whether attachments should be downloaded. " - "If not enabled, incoming emails will be stripped of any attachments before being processed"), - 'original': fields.function(_get_incom_conf, - method=True, - string='Keep Original', - type="boolean", - multi='income_mail_config', - help="Whether a full original copy of each email should be kept for reference" - "and attached to each processed message. This will usually double the size of your message database."), - 'user': fields.function(_get_incom_conf, - method=True, - string='Username', - type="char", - multi='income_mail_config', - size=64), - 'password': fields.function(_get_incom_conf, - method=True, - string='password', - type="char", - multi='income_mail_config', - size=64)} -FetchmailServer() + 'server': fields.function( + _get_incom_conf, + string='Server', + type="char", + multi='income_mail_config', + states={'draft': [('readonly', True)]}, + help="Hostname or IP of the mail server"), + 'port': fields.function( + _get_incom_conf, + string='Port', + type="integer", + states={'draft': [('readonly', True)]}, + multi='income_mail_config'), + 'type': fields.function( + _get_incom_conf, + string='Type', + type="selection", + selection=[('pop', 'POP Server'), + ('imap', 'IMAP Server'), + ('local', 'Local Server'), + ], + multi='income_mail_config', + fnct_search=_type_search, + states={'draft': [('readonly', True)]}, + help="pop, imap, local"), + 'is_ssl': fields.function( + _get_incom_conf, + string='Is SSL', + type="boolean", + multi='income_mail_config', + states={'draft': [('readonly', True)]}, + help='Connections are encrypted with SSL/TLS through' + ' a dedicated port (default: IMAPS=993, POP3S=995)'), + 'attach': fields.function( + _get_incom_conf, + string='Keep Attachments', + type="boolean", + multi='income_mail_config', + states={'draft': [('readonly', True)]}, + help="Whether attachments should be downloaded. " + "If not enabled, incoming emails will be stripped of any " + "attachments before being processed"), + 'original': fields.function( + _get_incom_conf, + string='Keep Original', + type="boolean", + multi='income_mail_config', + states={'draft': [('readonly', True)]}, + help="Whether a full original copy of each email should be kept " + "for reference and attached to each processed message. This " + "will usually double the size of your message database."), + 'user': fields.function( + _get_incom_conf, + string='Username', + type="char", + states={'draft': [('readonly', True)]}, + multi='income_mail_config'), + 'password': fields.function( + _get_incom_conf, + string='password', + type="char", + states={'draft': [('readonly', True)]}, + multi='income_mail_config') + } diff --git a/mail_environment/mail_view.xml b/mail_environment/mail_view.xml index 59577ed2..505b9527 100644 --- a/mail_environment/mail_view.xml +++ b/mail_environment/mail_view.xml @@ -1,27 +1,24 @@ - - - - inherit_fetchmail_for_env_support - fetchmail.server - - - - - - - - - - - - - - - - - - - + + + inherit_fetchmail_for_env_support + fetchmail.server + + + + + + + + + + + + + + + + + From 2ac27feb640b6cadbd1aa23481ea44e1ef3e8c13 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Mon, 2 Mar 2015 17:28:09 +0100 Subject: [PATCH 06/40] Add OCA as author of OCA addons In order to get visibility on https://www.odoo.com/apps the OCA board has decided to add the OCA as author of all the addons maintained as part of the association. --- mail_environment/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index 05efe571..04f6ae03 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -56,7 +56,7 @@ """, - 'author': 'Camptocamp', + 'author': "Camptocamp,Odoo Community Association (OCA)", 'license': 'AGPL-3', 'website': 'http://openerp.camptocamp.com', 'depends': ['mail', From 4da01ad807871d7d43d5a421b5d827744ceba41c Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Fri, 17 Jul 2015 15:32:06 +0200 Subject: [PATCH 07/40] fix runbot warning rename *_xml entries in manifest --- mail_environment/__openerp__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index 04f6ae03..e1042265 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -64,9 +64,8 @@ 'server_environment', 'server_environment_files', ], - 'init_xml': [], - 'update_xml': ['mail_view.xml'], - 'demo_xml': [], + 'data': ['mail_view.xml'], + 'demo': [], 'installable': True, 'active': False, } From f572628cf1abf692a79896986fea147f4556705d Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 18 Aug 2015 10:47:52 +0200 Subject: [PATCH 08/40] Add missing default oca icons --- mail_environment/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mail_environment/static/description/icon.png diff --git a/mail_environment/static/description/icon.png b/mail_environment/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From a8e0bf92e0a14ce0fb1b4fb63392ae3ea7303f4e Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Tue, 18 Aug 2015 14:33:02 +0200 Subject: [PATCH 09/40] [FIX] like #230, but for mail_environment --- mail_environment/static/description/icon.png | Bin 9455 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mail_environment/static/description/icon.png diff --git a/mail_environment/static/description/icon.png b/mail_environment/static/description/icon.png deleted file mode 100644 index 3a0328b516c4980e8e44cdb63fd945757ddd132d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I From 56b627bb0c9ca24c54376d95d182c415eb50eb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 9 Oct 2015 10:03:09 +0200 Subject: [PATCH 10/40] [UPD] prefix versions with 8.0 --- mail_environment/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index e1042265..cb5dca0e 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -21,7 +21,7 @@ { 'name': 'Server env config for mail + fetchmail', - 'version': '0.1', + 'version': '8.0.0.1.0', 'category': 'Tools', 'description': """ Extend mail and fetch mail with server environment module. From a56b2398b64f2b3a8f69469b29ad29658996fbc9 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 14 Oct 2015 02:53:59 +0200 Subject: [PATCH 11/40] [MIG] Make modules uninstallable --- mail_environment/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index cb5dca0e..f51cb97f 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -66,6 +66,6 @@ ], 'data': ['mail_view.xml'], 'demo': [], - 'installable': True, + 'installable': False, 'active': False, } From d885a7d17dc423944822987d7986f3c03692a697 Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Wed, 20 Jan 2016 19:06:14 +0100 Subject: [PATCH 12/40] 9.0 migration of mail_environment --- mail_environment/README.rst | 121 ++++++++++++++++++++++++++++++++ mail_environment/__openerp__.py | 49 ++----------- 2 files changed, 127 insertions(+), 43 deletions(-) create mode 100644 mail_environment/README.rst diff --git a/mail_environment/README.rst b/mail_environment/README.rst new file mode 100644 index 00000000..388ec9ac --- /dev/null +++ b/mail_environment/README.rst @@ -0,0 +1,121 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +========================================== +Mail configuration with server_environment +========================================== + +This module allows to configure the incoming and outgoing mail servers +using the `server_environment` mechanism: you can then have different +mail servers for the production and the test environment. + +Installation +============ + +To install this module, you need to have the server_environment module +installed and properly configured. + +Configuration +============= + +With this module installed, the incoming and outgoing mail servers are +configured in the `server_environment_files` module (which is a module +you should provide, see the documentation of `server_environment` for +more information). + +In the configuration file of each environment, you may first use the +sections `[outgoing_mail]` and `[incoming_mail]` to configure the +default values respectively for SMTP servers and the IMAP/POP servers. + +Then for each server, you can define additional values or override the +default values with a section named `[outgoing_mail.resource_name]` or +`[incoming_mail.resource_name]` where "resource_name" is the name of +the server. + +Exemple of config file : + +[outgoing_mail] +smtp_host = smtp.myserver.com +smtp_port = 587 +smtp_user = +smtp_pass = +smtp_encryption = ssl + +[outgoing_mail.odoo_smtp_server1] +smtp_user = odoo +smtp_pass = odoo + +[incoming_mail.odoo_pop_mail1] +server = mail.myserver.com +port = 110 +type = pop +is_ssl = 0 +attach = 0 +original = 0 +user = odoo@myserver.com +password = uas1ohV0 + +You will need to create 2 records in the database, one outgoing mail +server with the field `name` set to "odoo_smtp_server1" and one +incoming mail server with the field `name` set to "odoo_pop_mail1". + + +Usage +===== + +Once configured, Odoo will read the mail servers values from the +configuration file related to each environment defined in the main +Odoo file. + + +Known issues / Roadmap +====================== + +* Due to the special nature of this addon, you cannot test it on the OCA +runbot. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. 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 +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Nicolas Bessi +* Yannick Vaucher +* Guewen Baconnier +* Joël Grand-Guillaume +* Holger Brunn +* Alexandre Fayolle + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/mail_environment/__openerp__.py b/mail_environment/__openerp__.py index f51cb97f..f71e4bf7 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__openerp__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -############################################################################## # # Author: Nicolas Bessi # Copyright 2012 Camptocamp SA @@ -16,56 +15,20 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -# -############################################################################## { - 'name': 'Server env config for mail + fetchmail', - 'version': '8.0.0.1.0', + 'name': 'Mail configuration with server_environment', + 'version': '9.0.1.0.0', 'category': 'Tools', - 'description': """ -Extend mail and fetch mail with server environment module. - -In config files, sections outgoing_mail and incoming_mails are default values -for all Outgoing Mail Servers and Fetchmail Servers. -For each server, you can (re)define values with a section named -"outgoing_mail.resource_name" where resource_name is the name of your server. - -Exemple of config file : - -[outgoing_mail] -smtp_host = smtp.myserver.com -smtp_port = 587 -smtp_user = -smtp_pass = -smtp_encryption = ssl - -[outgoing_mail.openerp_smtp_server1] -smtp_user = openerp -smtp_pass = openerp - -[incoming_mail.openerp_pop_mail1] -server = mail.myserver.com -port = 110 -type = pop -is_ssl = 0 -attach = 0 -original = 0 -user = openerp@myserver.com -password = openerp - - - """, + 'summary': 'Configure mail servers with server_environment_files', 'author': "Camptocamp,Odoo Community Association (OCA)", 'license': 'AGPL-3', - 'website': 'http://openerp.camptocamp.com', - 'depends': ['mail', - 'fetchmail', + 'website': 'http://odoo-community.org', + 'depends': ['fetchmail', 'server_environment', 'server_environment_files', ], 'data': ['mail_view.xml'], - 'demo': [], - 'installable': False, + 'installable': True, 'active': False, } From ce6c8da0736c2cd185922335c3c54d6a0b3bd61e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 16:08:19 +0200 Subject: [PATCH 13/40] [MIG] pre migration changes [MIG] Rename manifest files --- mail_environment/{__openerp__.py => __manifest__.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename mail_environment/{__openerp__.py => __manifest__.py} (97%) diff --git a/mail_environment/__openerp__.py b/mail_environment/__manifest__.py similarity index 97% rename from mail_environment/__openerp__.py rename to mail_environment/__manifest__.py index f71e4bf7..6026bf77 100644 --- a/mail_environment/__openerp__.py +++ b/mail_environment/__manifest__.py @@ -29,6 +29,6 @@ 'server_environment_files', ], 'data': ['mail_view.xml'], - 'installable': True, + 'installable': False, 'active': False, } From 67fe2d5d1a3359f5b357fbb72db1b4f473d16684 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Wed, 21 Dec 2016 12:45:46 +0100 Subject: [PATCH 14/40] Migrate mail_environment to 10.0 --- mail_environment/README.rst | 6 +- mail_environment/__init__.py | 2 +- mail_environment/__manifest__.py | 26 +- mail_environment/env_mail.py | 232 ------------------ mail_environment/mail_view.xml | 24 -- mail_environment/models/__init__.py | 3 + mail_environment/models/fetchmail_server.py | 74 ++++++ mail_environment/models/ir_mail_server.py | 46 ++++ .../views/fetchmail_server_views.xml | 21 ++ 9 files changed, 152 insertions(+), 282 deletions(-) delete mode 100644 mail_environment/env_mail.py delete mode 100644 mail_environment/mail_view.xml create mode 100644 mail_environment/models/__init__.py create mode 100644 mail_environment/models/fetchmail_server.py create mode 100644 mail_environment/models/ir_mail_server.py create mode 100644 mail_environment/views/fetchmail_server_views.xml diff --git a/mail_environment/README.rst b/mail_environment/README.rst index 388ec9ac..fd0643a2 100644 --- a/mail_environment/README.rst +++ b/mail_environment/README.rst @@ -81,11 +81,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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 -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py index 89dd1478..a0fdc10f 100644 --- a/mail_environment/__init__.py +++ b/mail_environment/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -from . import env_mail +from . import models diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py index 6026bf77..ca9d8e06 100644 --- a/mail_environment/__manifest__.py +++ b/mail_environment/__manifest__.py @@ -1,24 +1,10 @@ # -*- coding: utf-8 -*- -# -# Author: Nicolas Bessi -# Copyright 2012 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# Copyright 2012-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) { 'name': 'Mail configuration with server_environment', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Tools', 'summary': 'Configure mail servers with server_environment_files', 'author': "Camptocamp,Odoo Community Association (OCA)", @@ -28,7 +14,7 @@ 'server_environment', 'server_environment_files', ], - 'data': ['mail_view.xml'], - 'installable': False, - 'active': False, + 'data': ['views/fetchmail_server_views.xml', + ], + 'installable': True, } diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py deleted file mode 100644 index c4025340..00000000 --- a/mail_environment/env_mail.py +++ /dev/null @@ -1,232 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Nicolas Bessi -# Copyright 2012 Camptocamp SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import orm, fields - -from openerp.addons.server_environment import serv_config - - -class IrMail(orm.Model): - _inherit = "ir.mail_server" - - def _get_smtp_conf(self, cr, uid, ids, name, args, context=None): - """ - Return configuration - """ - res = {} - for mail_server in self.browse(cr, uid, ids, context=context): - global_section_name = 'outgoing_mail' - - # default vals - config_vals = {'smtp_port': 587} - if serv_config.has_section(global_section_name): - config_vals.update((serv_config.items(global_section_name))) - - custom_section_name = '.'.join((global_section_name, - mail_server.name)) - if serv_config.has_section(custom_section_name): - config_vals.update(serv_config.items(custom_section_name)) - - if config_vals.get('smtp_port'): - config_vals['smtp_port'] = int(config_vals['smtp_port']) - - res[mail_server.id] = config_vals - return res - - _columns = { - 'smtp_host': fields.function( - _get_smtp_conf, - string='SMTP Server', - type="char", - multi='outgoing_mail_config', - states={'draft': [('readonly', True)]}, - help="Hostname or IP of SMTP server"), - 'smtp_port': fields.function( - _get_smtp_conf, - string='SMTP Port', - type="integer", - multi='outgoing_mail_config', - states={'draft': [('readonly', True)]}, - help="SMTP Port. Usually 465 for SSL, " - "and 25 or 587 for other cases.", - size=5), - 'smtp_user': fields.function( - _get_smtp_conf, - string='Username', - type="char", - multi='outgoing_mail_config', - states={'draft': [('readonly', True)]}, - help="Optional username for SMTP authentication", - size=64), - 'smtp_pass': fields.function( - _get_smtp_conf, - string='Password', - type="char", - multi='outgoing_mail_config', - states={'draft': [('readonly', True)]}, - help="Optional password for SMTP authentication", - size=64), - 'smtp_encryption': fields.function( - _get_smtp_conf, - string='smtp_encryption', - type="selection", - multi='outgoing_mail_config', - selection=[('none', 'None'), - ('starttls', 'TLS (STARTTLS)'), - ('ssl', 'SSL/TLS')], - states={'draft': [('readonly', True)]}, - help="Choose the connection encryption scheme:\n" - "- none: SMTP sessions are done in cleartext.\n" - "- starttls: TLS encryption is requested at start " - "of SMTP session (Recommended)\n" - "- ssl: SMTP sessions are encrypted with SSL/TLS " - "through a dedicated port (default: 465)") - } - - -class FetchmailServer(orm.Model): - """Incoming POP/IMAP mail server account""" - _inherit = 'fetchmail.server' - - def _get_incom_conf(self, cr, uid, ids, name, args, context=None): - """ - Return configuration - """ - res = {} - for fetchmail in self.browse(cr, uid, ids, context=context): - global_section_name = 'incoming_mail' - - key_types = {'port': int, - 'is_ssl': lambda a: bool(int(a)), - 'attach': lambda a: bool(int(a)), - 'original': lambda a: bool(int(a)), - } - - # default vals - config_vals = {'port': 993, - 'is_ssl': 0, - 'attach': 0, - 'original': 0, - } - if serv_config.has_section(global_section_name): - config_vals.update(serv_config.items(global_section_name)) - - custom_section_name = '.'.join((global_section_name, - fetchmail.name)) - if serv_config.has_section(custom_section_name): - config_vals.update(serv_config.items(custom_section_name)) - - for key, to_type in key_types.iteritems(): - if config_vals.get(key): - config_vals[key] = to_type(config_vals[key]) - res[fetchmail.id] = config_vals - return res - - def _type_search(self, cr, uid, obj, name, args, context=None): - result_ids = [] - # read all incoming servers values - all_ids = self.search(cr, uid, [], context=context) - results = self.read(cr, uid, all_ids, ['id', 'type'], context=context) - args = args[:] - i = 0 - while i < len(args): - operator = args[i][1] - if operator == '=': - for res in results: - if (res['type'] == args[i][2] and - res['id'] not in result_ids): - result_ids.append(res['id']) - elif operator == 'in': - for search_vals in args[i][2]: - for res in results: - if (res['type'] == search_vals and - res['id'] not in result_ids): - result_ids.append(res['id']) - else: - continue - i += 1 - return [('id', 'in', result_ids)] - - _columns = { - 'server': fields.function( - _get_incom_conf, - string='Server', - type="char", - multi='income_mail_config', - states={'draft': [('readonly', True)]}, - help="Hostname or IP of the mail server"), - 'port': fields.function( - _get_incom_conf, - string='Port', - type="integer", - states={'draft': [('readonly', True)]}, - multi='income_mail_config'), - 'type': fields.function( - _get_incom_conf, - string='Type', - type="selection", - selection=[('pop', 'POP Server'), - ('imap', 'IMAP Server'), - ('local', 'Local Server'), - ], - multi='income_mail_config', - fnct_search=_type_search, - states={'draft': [('readonly', True)]}, - help="pop, imap, local"), - 'is_ssl': fields.function( - _get_incom_conf, - string='Is SSL', - type="boolean", - multi='income_mail_config', - states={'draft': [('readonly', True)]}, - help='Connections are encrypted with SSL/TLS through' - ' a dedicated port (default: IMAPS=993, POP3S=995)'), - 'attach': fields.function( - _get_incom_conf, - string='Keep Attachments', - type="boolean", - multi='income_mail_config', - states={'draft': [('readonly', True)]}, - help="Whether attachments should be downloaded. " - "If not enabled, incoming emails will be stripped of any " - "attachments before being processed"), - 'original': fields.function( - _get_incom_conf, - string='Keep Original', - type="boolean", - multi='income_mail_config', - states={'draft': [('readonly', True)]}, - help="Whether a full original copy of each email should be kept " - "for reference and attached to each processed message. This " - "will usually double the size of your message database."), - 'user': fields.function( - _get_incom_conf, - string='Username', - type="char", - states={'draft': [('readonly', True)]}, - multi='income_mail_config'), - 'password': fields.function( - _get_incom_conf, - string='password', - type="char", - states={'draft': [('readonly', True)]}, - multi='income_mail_config') - } diff --git a/mail_environment/mail_view.xml b/mail_environment/mail_view.xml deleted file mode 100644 index 505b9527..00000000 --- a/mail_environment/mail_view.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - inherit_fetchmail_for_env_support - fetchmail.server - - - - - - - - - - - - - - - - - - diff --git a/mail_environment/models/__init__.py b/mail_environment/models/__init__.py new file mode 100644 index 00000000..493195a0 --- /dev/null +++ b/mail_environment/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +from . import ir_mail_server +from . import fetchmail_server diff --git a/mail_environment/models/fetchmail_server.py b/mail_environment/models/fetchmail_server.py new file mode 100644 index 00000000..6d94def7 --- /dev/null +++ b/mail_environment/models/fetchmail_server.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +# Copyright 2012-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +import operator +from odoo import api, fields, models + +from odoo.addons.server_environment import serv_config + + +class FetchmailServer(models.Model): + """Incoming POP/IMAP mail server account""" + _inherit = 'fetchmail.server' + + server = fields.Char(compute='_compute_server_env', + states={}) + port = fields.Integer(compute='_compute_server_env', + states={}) + type = fields.Selection(compute='_compute_server_env', + search='_search_type', + states={}) + user = fields.Char(compute='_compute_server_env', + states={}) + password = fields.Char(compute='_compute_server_env', + states={}) + is_ssl = fields.Boolean(compute='_compute_server_env') + attach = fields.Boolean(compute='_compute_server_env') + original = fields.Boolean(compute='_compute_server_env') + + @api.depends() + def _compute_server_env(self): + for fetchmail in self: + global_section_name = 'incoming_mail' + + key_types = {'port': int, + 'is_ssl': lambda a: bool(int(a or 0)), + 'attach': lambda a: bool(int(a or 0)), + 'original': lambda a: bool(int(a or 0)), + } + + # default vals + config_vals = {'port': 993, + 'is_ssl': 0, + 'attach': 0, + 'original': 0, + } + if serv_config.has_section(global_section_name): + config_vals.update(serv_config.items(global_section_name)) + + custom_section_name = '.'.join((global_section_name, + fetchmail.name)) + if serv_config.has_section(custom_section_name): + config_vals.update(serv_config.items(custom_section_name)) + + for key, to_type in key_types.iteritems(): + if config_vals.get(key): + config_vals[key] = to_type(config_vals[key]) + + fetchmail.update(config_vals) + + @api.model + def _search_type(self, oper, value): + operators = { + '=': operator.eq, + '!=': operator.ne, + 'in': operator.contains, + 'not in': lambda a, b: not operator.contains(a, b), + } + if oper not in operators: + return [('id', 'in', [])] + servers = self.search([]).filtered( + lambda s: operators[oper](value, s.type) + ) + return [('id', 'in', servers.ids)] diff --git a/mail_environment/models/ir_mail_server.py b/mail_environment/models/ir_mail_server.py new file mode 100644 index 00000000..4aaed625 --- /dev/null +++ b/mail_environment/models/ir_mail_server.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Copyright 2012-2016 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) + +from odoo import api, fields, models + +from odoo.addons.server_environment import serv_config + + +class IrMailServer(models.Model): + _inherit = "ir.mail_server" + + smtp_host = fields.Char(compute='_compute_server_env', + required=False, + readonly=True) + smtp_port = fields.Integer(compute='_compute_server_env', + required=False, + readonly=True) + smtp_user = fields.Char(compute='_compute_server_env', + required=False, + readonly=True) + smtp_pass = fields.Char(compute='_compute_server_env', + required=False, + readonly=True) + smtp_encryption = fields.Selection(compute='_compute_server_env', + required=False, + readonly=True) + + @api.depends() + def _compute_server_env(self): + for server in self: + global_section_name = 'outgoing_mail' + + # default vals + config_vals = {'smtp_port': 587} + if serv_config.has_section(global_section_name): + config_vals.update((serv_config.items(global_section_name))) + + custom_section_name = '.'.join((global_section_name, server.name)) + if serv_config.has_section(custom_section_name): + config_vals.update(serv_config.items(custom_section_name)) + + if config_vals.get('smtp_port'): + config_vals['smtp_port'] = int(config_vals['smtp_port']) + + server.update(config_vals) diff --git a/mail_environment/views/fetchmail_server_views.xml b/mail_environment/views/fetchmail_server_views.xml new file mode 100644 index 00000000..1b04550b --- /dev/null +++ b/mail_environment/views/fetchmail_server_views.xml @@ -0,0 +1,21 @@ + + + + fetchmail.server + + + + + + + + + + + + + + + + + From 050bab9ed66e21e6e1cc098f491f129f9f158971 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Fri, 24 Mar 2017 15:27:55 +0100 Subject: [PATCH 15/40] README.rst - Fix layout --- mail_environment/README.rst | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mail_environment/README.rst b/mail_environment/README.rst index fd0643a2..9dbfb62e 100644 --- a/mail_environment/README.rst +++ b/mail_environment/README.rst @@ -33,28 +33,28 @@ default values with a section named `[outgoing_mail.resource_name]` or `[incoming_mail.resource_name]` where "resource_name" is the name of the server. -Exemple of config file : - -[outgoing_mail] -smtp_host = smtp.myserver.com -smtp_port = 587 -smtp_user = -smtp_pass = -smtp_encryption = ssl - -[outgoing_mail.odoo_smtp_server1] -smtp_user = odoo -smtp_pass = odoo - -[incoming_mail.odoo_pop_mail1] -server = mail.myserver.com -port = 110 -type = pop -is_ssl = 0 -attach = 0 -original = 0 -user = odoo@myserver.com -password = uas1ohV0 +Exemple of config file :: + + [outgoing_mail] + smtp_host = smtp.myserver.com + smtp_port = 587 + smtp_user = + smtp_pass = + smtp_encryption = ssl + + [outgoing_mail.odoo_smtp_server1] + smtp_user = odoo + smtp_pass = odoo + + [incoming_mail.odoo_pop_mail1] + server = mail.myserver.com + port = 110 + type = pop + is_ssl = 0 + attach = 0 + original = 0 + user = odoo@myserver.com + password = uas1ohV0 You will need to create 2 records in the database, one outgoing mail server with the field `name` set to "odoo_smtp_server1" and one @@ -73,7 +73,7 @@ Known issues / Roadmap ====================== * Due to the special nature of this addon, you cannot test it on the OCA -runbot. + runbot. Bug Tracker =========== From 76cdb1a190ae99724891a3cb2bb7aaa0d01d4139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Sun, 23 Apr 2017 21:24:45 +0200 Subject: [PATCH 16/40] [FIX] mail_environment must not depend on server_environment_files Depending on server_environment is enough --- mail_environment/__manifest__.py | 1 - mail_environment/i18n/de.po | 29 +++++++++++++++++++++++++++++ mail_environment/i18n/en.po | 28 ++++++++++++++++++++++++++++ mail_environment/i18n/es.po | 29 +++++++++++++++++++++++++++++ mail_environment/i18n/hr.po | 29 +++++++++++++++++++++++++++++ mail_environment/i18n/pt_BR.po | 23 +++++++++++++++++++++++ mail_environment/i18n/sl.po | 29 +++++++++++++++++++++++++++++ mail_environment/i18n/zh_CN.po | 29 +++++++++++++++++++++++++++++ 8 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 mail_environment/i18n/de.po create mode 100644 mail_environment/i18n/en.po create mode 100644 mail_environment/i18n/es.po create mode 100644 mail_environment/i18n/hr.po create mode 100644 mail_environment/i18n/pt_BR.po create mode 100644 mail_environment/i18n/sl.po create mode 100644 mail_environment/i18n/zh_CN.po diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py index ca9d8e06..5ae2b651 100644 --- a/mail_environment/__manifest__.py +++ b/mail_environment/__manifest__.py @@ -12,7 +12,6 @@ 'website': 'http://odoo-community.org', 'depends': ['fetchmail', 'server_environment', - 'server_environment_files', ], 'data': ['views/fetchmail_server_views.xml', ], diff --git a/mail_environment/i18n/de.po b/mail_environment/i18n/de.po new file mode 100644 index 00000000..0be52af5 --- /dev/null +++ b/mail_environment/i18n/de.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +# Rudolf Schnapka , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-17 12:15+0000\n" +"PO-Revision-Date: 2016-04-21 09:16+0000\n" +"Last-Translator: Rudolf Schnapka \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "POP/IMAP-Server" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "ir.mail_server" diff --git a/mail_environment/i18n/en.po b/mail_environment/i18n/en.po new file mode 100644 index 00000000..f0879718 --- /dev/null +++ b/mail_environment/i18n/en.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-27 01:37+0000\n" +"PO-Revision-Date: 2016-02-26 16:14+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "POP/IMAP Server" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "ir.mail_server" diff --git a/mail_environment/i18n/es.po b/mail_environment/i18n/es.po new file mode 100644 index 00000000..d8565002 --- /dev/null +++ b/mail_environment/i18n/es.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +# Pedro M. Baeza , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-01 10:38+0000\n" +"PO-Revision-Date: 2017-05-01 10:38+0000\n" +"Last-Translator: Pedro M. Baeza , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "ir.mail_server" diff --git a/mail_environment/i18n/hr.po b/mail_environment/i18n/hr.po new file mode 100644 index 00000000..bfa25bc9 --- /dev/null +++ b/mail_environment/i18n/hr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-29 00:48+0000\n" +"PO-Revision-Date: 2016-06-14 10:58+0000\n" +"Last-Translator: Bole \n" +"Language-Team: Croatian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "POP/IMAP Server" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "ir.mail_server" diff --git a/mail_environment/i18n/pt_BR.po b/mail_environment/i18n/pt_BR.po new file mode 100644 index 00000000..f929bd3d --- /dev/null +++ b/mail_environment/i18n/pt_BR.po @@ -0,0 +1,23 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: server-tools (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-29 11:14+0000\n" +"PO-Revision-Date: 2015-09-18 13:55+0000\n" +"Last-Translator: <>\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-tools-8-0/language/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "Servidor POP/IMAP" diff --git a/mail_environment/i18n/sl.po b/mail_environment/i18n/sl.po new file mode 100644 index 00000000..03f146fe --- /dev/null +++ b/mail_environment/i18n/sl.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-02-27 01:37+0000\n" +"PO-Revision-Date: 2016-02-27 16:56+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "POP/IMAP strežnik" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "ir.mail_server" diff --git a/mail_environment/i18n/zh_CN.po b/mail_environment/i18n/zh_CN.po new file mode 100644 index 00000000..6836584c --- /dev/null +++ b/mail_environment/i18n/zh_CN.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +# Translators: +# Jeffery Chenn , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-31 11:58+0000\n" +"PO-Revision-Date: 2016-09-04 06:08+0000\n" +"Last-Translator: Jeffery Chenn \n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "POP/IMAP Server" +msgstr "POP/IMAP 服务器" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "ir.mail_server" +msgstr "" From 55c57b1a4e7aa17071b0956baf594b616ebdd783 Mon Sep 17 00:00:00 2001 From: Simone Orsi Date: Wed, 29 Nov 2017 16:51:05 +0100 Subject: [PATCH 17/40] [11.0][MIG] mail_environment --- mail_environment/README.rst | 4 ++-- mail_environment/__init__.py | 1 - mail_environment/__manifest__.py | 22 +++++++++---------- mail_environment/models/__init__.py | 1 - mail_environment/models/fetchmail_server.py | 6 ++--- mail_environment/models/ir_mail_server.py | 4 +--- .../views/fetchmail_server_views.xml | 4 +++- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/mail_environment/README.rst b/mail_environment/README.rst index 9dbfb62e..4093b45d 100644 --- a/mail_environment/README.rst +++ b/mail_environment/README.rst @@ -33,7 +33,7 @@ default values with a section named `[outgoing_mail.resource_name]` or `[incoming_mail.resource_name]` where "resource_name" is the name of the server. -Exemple of config file :: +Example of config file :: [outgoing_mail] smtp_host = smtp.myserver.com @@ -81,7 +81,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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. +help us smash it by providing a detailed and welcomed feedback. Credits ======= diff --git a/mail_environment/__init__.py b/mail_environment/__init__.py index a0fdc10f..0650744f 100644 --- a/mail_environment/__init__.py +++ b/mail_environment/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import models diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py index 5ae2b651..00983c10 100644 --- a/mail_environment/__manifest__.py +++ b/mail_environment/__manifest__.py @@ -1,19 +1,19 @@ -# -*- coding: utf-8 -*- -# Copyright 2012-2016 Camptocamp SA +# Copyright 2012-2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) { 'name': 'Mail configuration with server_environment', - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Tools', 'summary': 'Configure mail servers with server_environment_files', - 'author': "Camptocamp,Odoo Community Association (OCA)", + 'author': "Camptocamp, Odoo Community Association (OCA)", 'license': 'AGPL-3', - 'website': 'http://odoo-community.org', - 'depends': ['fetchmail', - 'server_environment', - ], - 'data': ['views/fetchmail_server_views.xml', - ], - 'installable': True, + 'website': 'https://github.com/OCA/server-env', + 'depends': [ + 'fetchmail', + 'server_environment', + ], + 'data': [ + 'views/fetchmail_server_views.xml', + ], } diff --git a/mail_environment/models/__init__.py b/mail_environment/models/__init__.py index 493195a0..a21a540e 100644 --- a/mail_environment/models/__init__.py +++ b/mail_environment/models/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- from . import ir_mail_server from . import fetchmail_server diff --git a/mail_environment/models/fetchmail_server.py b/mail_environment/models/fetchmail_server.py index 6d94def7..72cd9261 100644 --- a/mail_environment/models/fetchmail_server.py +++ b/mail_environment/models/fetchmail_server.py @@ -1,10 +1,8 @@ -# -*- coding: utf-8 -*- -# Copyright 2012-2016 Camptocamp SA +# Copyright 2012-2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) import operator from odoo import api, fields, models - from odoo.addons.server_environment import serv_config @@ -52,7 +50,7 @@ def _compute_server_env(self): if serv_config.has_section(custom_section_name): config_vals.update(serv_config.items(custom_section_name)) - for key, to_type in key_types.iteritems(): + for key, to_type in key_types.items(): if config_vals.get(key): config_vals[key] = to_type(config_vals[key]) diff --git a/mail_environment/models/ir_mail_server.py b/mail_environment/models/ir_mail_server.py index 4aaed625..1f45fd36 100644 --- a/mail_environment/models/ir_mail_server.py +++ b/mail_environment/models/ir_mail_server.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- -# Copyright 2012-2016 Camptocamp SA +# Copyright 2012-2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) from odoo import api, fields, models - from odoo.addons.server_environment import serv_config diff --git a/mail_environment/views/fetchmail_server_views.xml b/mail_environment/views/fetchmail_server_views.xml index 1b04550b..0c7f1134 100644 --- a/mail_environment/views/fetchmail_server_views.xml +++ b/mail_environment/views/fetchmail_server_views.xml @@ -1,6 +1,7 @@ - + + fetchmail.server @@ -18,4 +19,5 @@ + From d6770366f87cb2d6d295bc2105b70ae4f757fe6c Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Thu, 19 Jul 2018 22:36:30 +0200 Subject: [PATCH 18/40] Use new server.env.mixin in mail_environment --- mail_environment/__manifest__.py | 6 +- mail_environment/models/fetchmail_server.py | 78 ++++++++----------- mail_environment/models/ir_mail_server.py | 64 +++++++-------- .../views/fetchmail_server_views.xml | 23 ------ 4 files changed, 61 insertions(+), 110 deletions(-) delete mode 100644 mail_environment/views/fetchmail_server_views.xml diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py index 00983c10..46a4b826 100644 --- a/mail_environment/__manifest__.py +++ b/mail_environment/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Mail configuration with server_environment', - 'version': '11.0.1.0.0', + 'version': '11.0.1.1.0', 'category': 'Tools', 'summary': 'Configure mail servers with server_environment_files', 'author': "Camptocamp, Odoo Community Association (OCA)", @@ -13,7 +13,5 @@ 'fetchmail', 'server_environment', ], - 'data': [ - 'views/fetchmail_server_views.xml', - ], + 'data': [], } diff --git a/mail_environment/models/fetchmail_server.py b/mail_environment/models/fetchmail_server.py index 72cd9261..ed333124 100644 --- a/mail_environment/models/fetchmail_server.py +++ b/mail_environment/models/fetchmail_server.py @@ -3,58 +3,46 @@ import operator from odoo import api, fields, models -from odoo.addons.server_environment import serv_config class FetchmailServer(models.Model): """Incoming POP/IMAP mail server account""" - _inherit = 'fetchmail.server' - - server = fields.Char(compute='_compute_server_env', - states={}) - port = fields.Integer(compute='_compute_server_env', - states={}) - type = fields.Selection(compute='_compute_server_env', - search='_search_type', - states={}) - user = fields.Char(compute='_compute_server_env', - states={}) - password = fields.Char(compute='_compute_server_env', - states={}) - is_ssl = fields.Boolean(compute='_compute_server_env') - attach = fields.Boolean(compute='_compute_server_env') - original = fields.Boolean(compute='_compute_server_env') - - @api.depends() - def _compute_server_env(self): - for fetchmail in self: - global_section_name = 'incoming_mail' - - key_types = {'port': int, - 'is_ssl': lambda a: bool(int(a or 0)), - 'attach': lambda a: bool(int(a or 0)), - 'original': lambda a: bool(int(a or 0)), - } - - # default vals - config_vals = {'port': 993, - 'is_ssl': 0, - 'attach': 0, - 'original': 0, - } - if serv_config.has_section(global_section_name): - config_vals.update(serv_config.items(global_section_name)) + _name = 'fetchmail.server' + _inherit = ["fetchmail.server", "server.env.mixin"] + + @property + def _server_env_fields(self): + base_fields = super()._server_env_fields + mail_fields = { + "server": {}, + "port": { + "getter": "getint", + }, + "type": {}, + "user": {}, + "password": {}, + "is_ssl": { + "getter": "getbool", + }, + "attach": { + "getter": "getbool", + }, + "original": { + "getter": "getbool", + }, + } + mail_fields.update(base_fields) + return mail_fields - custom_section_name = '.'.join((global_section_name, - fetchmail.name)) - if serv_config.has_section(custom_section_name): - config_vals.update(serv_config.items(custom_section_name)) + type = fields.Selection(search='_search_type') - for key, to_type in key_types.items(): - if config_vals.get(key): - config_vals[key] = to_type(config_vals[key]) + @api.model + def _server_env_global_section_name(self): + """Name of the global section in the configuration files - fetchmail.update(config_vals) + Can be customized in your model + """ + return 'incoming_mail' @api.model def _search_type(self, oper, value): diff --git a/mail_environment/models/ir_mail_server.py b/mail_environment/models/ir_mail_server.py index 1f45fd36..b1d53cee 100644 --- a/mail_environment/models/ir_mail_server.py +++ b/mail_environment/models/ir_mail_server.py @@ -1,44 +1,32 @@ # Copyright 2012-2018 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl) -from odoo import api, fields, models -from odoo.addons.server_environment import serv_config +from odoo import api, models class IrMailServer(models.Model): - _inherit = "ir.mail_server" - - smtp_host = fields.Char(compute='_compute_server_env', - required=False, - readonly=True) - smtp_port = fields.Integer(compute='_compute_server_env', - required=False, - readonly=True) - smtp_user = fields.Char(compute='_compute_server_env', - required=False, - readonly=True) - smtp_pass = fields.Char(compute='_compute_server_env', - required=False, - readonly=True) - smtp_encryption = fields.Selection(compute='_compute_server_env', - required=False, - readonly=True) - - @api.depends() - def _compute_server_env(self): - for server in self: - global_section_name = 'outgoing_mail' - - # default vals - config_vals = {'smtp_port': 587} - if serv_config.has_section(global_section_name): - config_vals.update((serv_config.items(global_section_name))) - - custom_section_name = '.'.join((global_section_name, server.name)) - if serv_config.has_section(custom_section_name): - config_vals.update(serv_config.items(custom_section_name)) - - if config_vals.get('smtp_port'): - config_vals['smtp_port'] = int(config_vals['smtp_port']) - - server.update(config_vals) + _name = "ir.mail_server" + _inherit = ["ir.mail_server", "server.env.mixin"] + + @property + def _server_env_fields(self): + base_fields = super()._server_env_fields + mail_fields = { + "smtp_host": {}, + "smtp_port": { + "getter": "getint", + }, + "smtp_user": {}, + "smtp_pass": {}, + "smtp_encryption": {}, + } + mail_fields.update(base_fields) + return mail_fields + + @api.model + def _server_env_global_section_name(self): + """Name of the global section in the configuration files + + Can be customized in your model + """ + return 'outgoing_mail' diff --git a/mail_environment/views/fetchmail_server_views.xml b/mail_environment/views/fetchmail_server_views.xml deleted file mode 100644 index 0c7f1134..00000000 --- a/mail_environment/views/fetchmail_server_views.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - fetchmail.server - - - - - - - - - - - - - - - - - - From a69e6681f9ba72750823ce9fc42c1c47fb779cc2 Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Tue, 24 Jul 2018 13:39:22 +0200 Subject: [PATCH 19/40] Infer configparser getter from field type --- mail_environment/models/fetchmail_server.py | 16 ++++------------ mail_environment/models/ir_mail_server.py | 4 +--- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/mail_environment/models/fetchmail_server.py b/mail_environment/models/fetchmail_server.py index ed333124..2e891c7e 100644 --- a/mail_environment/models/fetchmail_server.py +++ b/mail_environment/models/fetchmail_server.py @@ -15,21 +15,13 @@ def _server_env_fields(self): base_fields = super()._server_env_fields mail_fields = { "server": {}, - "port": { - "getter": "getint", - }, + "port": {}, "type": {}, "user": {}, "password": {}, - "is_ssl": { - "getter": "getbool", - }, - "attach": { - "getter": "getbool", - }, - "original": { - "getter": "getbool", - }, + "is_ssl": {}, + "attach": {}, + "original": {}, } mail_fields.update(base_fields) return mail_fields diff --git a/mail_environment/models/ir_mail_server.py b/mail_environment/models/ir_mail_server.py index b1d53cee..7f3c7afe 100644 --- a/mail_environment/models/ir_mail_server.py +++ b/mail_environment/models/ir_mail_server.py @@ -13,9 +13,7 @@ def _server_env_fields(self): base_fields = super()._server_env_fields mail_fields = { "smtp_host": {}, - "smtp_port": { - "getter": "getint", - }, + "smtp_port": {}, "smtp_user": {}, "smtp_pass": {}, "smtp_encryption": {}, From 1b717a696b0c4a7dc67bc35dcf25c1feeaf9850b Mon Sep 17 00:00:00 2001 From: sebalix Date: Fri, 4 Jan 2019 11:36:11 +0100 Subject: [PATCH 20/40] [IMP] mail_environment: new README structure --- mail_environment/README.rst | 64 ++- mail_environment/readme/CONFIGURE.rst | 40 ++ mail_environment/readme/CONTRIBUTORS.rst | 6 + mail_environment/readme/DESCRIPTION.rst | 3 + mail_environment/readme/INSTALL.rst | 2 + mail_environment/readme/ROADMAP.rst | 2 + mail_environment/readme/USAGE.rst | 3 + .../static/description/index.html | 488 ++++++++++++++++++ 8 files changed, 589 insertions(+), 19 deletions(-) create mode 100644 mail_environment/readme/CONFIGURE.rst create mode 100644 mail_environment/readme/CONTRIBUTORS.rst create mode 100644 mail_environment/readme/DESCRIPTION.rst create mode 100644 mail_environment/readme/INSTALL.rst create mode 100644 mail_environment/readme/ROADMAP.rst create mode 100644 mail_environment/readme/USAGE.rst create mode 100644 mail_environment/static/description/index.html diff --git a/mail_environment/README.rst b/mail_environment/README.rst index 4093b45d..190904d5 100644 --- a/mail_environment/README.rst +++ b/mail_environment/README.rst @@ -1,15 +1,39 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ========================================== Mail configuration with server_environment ========================================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github + :target: https://github.com/OCA/server-env/tree/12.0/mail_environment + :alt: OCA/server-env +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-env-12-0/server-env-12-0-mail_environment + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/254/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module allows to configure the incoming and outgoing mail servers using the `server_environment` mechanism: you can then have different mail servers for the production and the test environment. +**Table of contents** + +.. contents:: + :local: + Installation ============ @@ -60,7 +84,6 @@ You will need to create 2 records in the database, one outgoing mail server with the field `name` set to "odoo_smtp_server1" and one incoming mail server with the field `name` set to "odoo_pop_mail1". - Usage ===== @@ -68,7 +91,6 @@ Once configured, Odoo will read the mail servers values from the configuration file related to each environment defined in the main Odoo file. - Known issues / Roadmap ====================== @@ -78,21 +100,23 @@ Known issues / Roadmap Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smash it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Camptocamp Contributors ------------- +~~~~~~~~~~~~ * Nicolas Bessi * Yannick Vaucher @@ -101,17 +125,19 @@ Contributors * Holger Brunn * Alexandre Fayolle -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - 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. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/server-env `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mail_environment/readme/CONFIGURE.rst b/mail_environment/readme/CONFIGURE.rst new file mode 100644 index 00000000..439c6be8 --- /dev/null +++ b/mail_environment/readme/CONFIGURE.rst @@ -0,0 +1,40 @@ +With this module installed, the incoming and outgoing mail servers are +configured in the `server_environment_files` module (which is a module +you should provide, see the documentation of `server_environment` for +more information). + +In the configuration file of each environment, you may first use the +sections `[outgoing_mail]` and `[incoming_mail]` to configure the +default values respectively for SMTP servers and the IMAP/POP servers. + +Then for each server, you can define additional values or override the +default values with a section named `[outgoing_mail.resource_name]` or +`[incoming_mail.resource_name]` where "resource_name" is the name of +the server. + +Example of config file :: + + [outgoing_mail] + smtp_host = smtp.myserver.com + smtp_port = 587 + smtp_user = + smtp_pass = + smtp_encryption = ssl + + [outgoing_mail.odoo_smtp_server1] + smtp_user = odoo + smtp_pass = odoo + + [incoming_mail.odoo_pop_mail1] + server = mail.myserver.com + port = 110 + type = pop + is_ssl = 0 + attach = 0 + original = 0 + user = odoo@myserver.com + password = uas1ohV0 + +You will need to create 2 records in the database, one outgoing mail +server with the field `name` set to "odoo_smtp_server1" and one +incoming mail server with the field `name` set to "odoo_pop_mail1". diff --git a/mail_environment/readme/CONTRIBUTORS.rst b/mail_environment/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..a3fe21ed --- /dev/null +++ b/mail_environment/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* Nicolas Bessi +* Yannick Vaucher +* Guewen Baconnier +* Joël Grand-Guillaume +* Holger Brunn +* Alexandre Fayolle diff --git a/mail_environment/readme/DESCRIPTION.rst b/mail_environment/readme/DESCRIPTION.rst new file mode 100644 index 00000000..d1ac368a --- /dev/null +++ b/mail_environment/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module allows to configure the incoming and outgoing mail servers +using the `server_environment` mechanism: you can then have different +mail servers for the production and the test environment. diff --git a/mail_environment/readme/INSTALL.rst b/mail_environment/readme/INSTALL.rst new file mode 100644 index 00000000..9b480785 --- /dev/null +++ b/mail_environment/readme/INSTALL.rst @@ -0,0 +1,2 @@ +To install this module, you need to have the server_environment module +installed and properly configured. diff --git a/mail_environment/readme/ROADMAP.rst b/mail_environment/readme/ROADMAP.rst new file mode 100644 index 00000000..647e064b --- /dev/null +++ b/mail_environment/readme/ROADMAP.rst @@ -0,0 +1,2 @@ +* Due to the special nature of this addon, you cannot test it on the OCA + runbot. diff --git a/mail_environment/readme/USAGE.rst b/mail_environment/readme/USAGE.rst new file mode 100644 index 00000000..735c18b9 --- /dev/null +++ b/mail_environment/readme/USAGE.rst @@ -0,0 +1,3 @@ +Once configured, Odoo will read the mail servers values from the +configuration file related to each environment defined in the main +Odoo file. diff --git a/mail_environment/static/description/index.html b/mail_environment/static/description/index.html new file mode 100644 index 00000000..67f8d8f4 --- /dev/null +++ b/mail_environment/static/description/index.html @@ -0,0 +1,488 @@ + + + + + + +Mail configuration with server_environment + + + +
+

Mail configuration with server_environment

+ + +

Beta License: AGPL-3 OCA/server-env Translate me on Weblate Try me on Runbot

+

This module allows to configure the incoming and outgoing mail servers +using the server_environment mechanism: you can then have different +mail servers for the production and the test environment.

+

Table of contents

+ +
+

Installation

+

To install this module, you need to have the server_environment module +installed and properly configured.

+
+
+

Configuration

+

With this module installed, the incoming and outgoing mail servers are +configured in the server_environment_files module (which is a module +you should provide, see the documentation of server_environment for +more information).

+

In the configuration file of each environment, you may first use the +sections [outgoing_mail] and [incoming_mail] to configure the +default values respectively for SMTP servers and the IMAP/POP servers.

+

Then for each server, you can define additional values or override the +default values with a section named [outgoing_mail.resource_name] or +[incoming_mail.resource_name] where “resource_name” is the name of +the server.

+

Example of config file

+
+[outgoing_mail]
+smtp_host = smtp.myserver.com
+smtp_port = 587
+smtp_user =
+smtp_pass =
+smtp_encryption = ssl
+
+[outgoing_mail.odoo_smtp_server1]
+smtp_user = odoo
+smtp_pass = odoo
+
+[incoming_mail.odoo_pop_mail1]
+server = mail.myserver.com
+port = 110
+type = pop
+is_ssl = 0
+attach = 0
+original = 0
+user = odoo@myserver.com
+password = uas1ohV0
+
+

You will need to create 2 records in the database, one outgoing mail +server with the field name set to “odoo_smtp_server1” and one +incoming mail server with the field name set to “odoo_pop_mail1”.

+
+
+

Usage

+

Once configured, Odoo will read the mail servers values from the +configuration file related to each environment defined in the main +Odoo file.

+
+
+

Known issues / Roadmap

+
    +
  • Due to the special nature of this addon, you cannot test it on the OCA +runbot.
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/server-env project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 08d30e881849c727354c64b3ea8c3f52d9667d5a Mon Sep 17 00:00:00 2001 From: sebalix Date: Fri, 4 Jan 2019 11:40:58 +0100 Subject: [PATCH 21/40] [MIG] mail_environment: Migration to 12.0 --- mail_environment/__manifest__.py | 3 +- mail_environment/i18n/de.po | 36 +++++++++++--- mail_environment/i18n/en.po | 36 +++++++++++--- mail_environment/i18n/es.po | 29 +++++++++-- mail_environment/i18n/hr.po | 39 ++++++++++++--- mail_environment/i18n/mail_environment.pot | 45 ++++++++++++++++++ mail_environment/i18n/pt_BR.po | 37 ++++++++++++-- mail_environment/i18n/sl.po | 39 ++++++++++++--- mail_environment/i18n/zh_CN.po | 36 +++++++++++--- mail_environment/static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 2 +- 11 files changed, 259 insertions(+), 43 deletions(-) create mode 100644 mail_environment/i18n/mail_environment.pot create mode 100644 mail_environment/static/description/icon.png diff --git a/mail_environment/__manifest__.py b/mail_environment/__manifest__.py index 46a4b826..188ad169 100644 --- a/mail_environment/__manifest__.py +++ b/mail_environment/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Mail configuration with server_environment', - 'version': '11.0.1.1.0', + 'version': '12.0.1.0.0', 'category': 'Tools', 'summary': 'Configure mail servers with server_environment_files', 'author': "Camptocamp, Odoo Community Association (OCA)", @@ -13,5 +13,4 @@ 'fetchmail', 'server_environment', ], - 'data': [], } diff --git a/mail_environment/i18n/de.po b/mail_environment/i18n/de.po index 0be52af5..2f63945f 100644 --- a/mail_environment/i18n/de.po +++ b/mail_environment/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: # Rudolf Schnapka , 2016 msgid "" @@ -11,19 +11,43 @@ msgstr "" "POT-Creation-Date: 2016-04-17 12:15+0000\n" "PO-Revision-Date: 2016-04-21 09:16+0000\n" "Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/language/de/)\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_environment -#: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" msgstr "POP/IMAP-Server" +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" msgstr "ir.mail_server" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" +msgstr "POP/IMAP-Server" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/en.po b/mail_environment/i18n/en.po index f0879718..d2bd1b90 100644 --- a/mail_environment/i18n/en.po +++ b/mail_environment/i18n/en.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: msgid "" msgstr "" @@ -10,19 +10,43 @@ msgstr "" "POT-Creation-Date: 2016-02-27 01:37+0000\n" "PO-Revision-Date: 2016-02-26 16:14+0000\n" "Last-Translator: OCA Transbot \n" -"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/language/en/)\n" +"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/en/)\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: mail_environment -#: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" msgstr "POP/IMAP Server" +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" msgstr "ir.mail_server" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" +msgstr "POP/IMAP Server" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/es.po b/mail_environment/i18n/es.po index d8565002..8e8fdeb5 100644 --- a/mail_environment/i18n/es.po +++ b/mail_environment/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: # Pedro M. Baeza , 2017 msgid "" @@ -12,18 +12,39 @@ msgstr "" "PO-Revision-Date: 2017-05-01 10:38+0000\n" "Last-Translator: Pedro M. Baeza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "IMAP Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" msgstr "" #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" msgstr "ir.mail_server" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "POP Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/hr.po b/mail_environment/i18n/hr.po index bfa25bc9..464b0dd7 100644 --- a/mail_environment/i18n/hr.po +++ b/mail_environment/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: # Bole , 2016 msgid "" @@ -11,19 +11,44 @@ msgstr "" "POT-Creation-Date: 2016-06-29 00:48+0000\n" "PO-Revision-Date: 2016-06-14 10:58+0000\n" "Last-Translator: Bole \n" -"Language-Team: Croatian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/hr/)\n" +"Language-Team: Croatian (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: mail_environment -#: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" msgstr "POP/IMAP Server" +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" msgstr "ir.mail_server" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" +msgstr "POP/IMAP Server" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/mail_environment.pot b/mail_environment/i18n/mail_environment.pot new file mode 100644 index 00000000..44c12442 --- /dev/null +++ b/mail_environment/i18n/mail_environment.pot @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mail_environment +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "IMAP Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +msgid "Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "POP Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" + diff --git a/mail_environment/i18n/pt_BR.po b/mail_environment/i18n/pt_BR.po index f929bd3d..5c0c705f 100644 --- a/mail_environment/i18n/pt_BR.po +++ b/mail_environment/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: msgid "" msgstr "" @@ -10,14 +10,43 @@ msgstr "" "POT-Creation-Date: 2015-09-29 11:14+0000\n" "PO-Revision-Date: 2015-09-18 13:55+0000\n" "Last-Translator: <>\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-tools-8-0/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-" +"tools-8-0/language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" +msgstr "Servidor POP/IMAP" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_ir_mail_server +#, fuzzy +msgid "Mail Server" +msgstr "Servidor POP/IMAP" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" msgstr "Servidor POP/IMAP" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/sl.po b/mail_environment/i18n/sl.po index 03f146fe..7b0594ef 100644 --- a/mail_environment/i18n/sl.po +++ b/mail_environment/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: # Matjaž Mozetič , 2016 msgid "" @@ -11,19 +11,44 @@ msgstr "" "POT-Creation-Date: 2016-02-27 01:37+0000\n" "PO-Revision-Date: 2016-02-27 16:56+0000\n" "Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/sl/)\n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: mail_environment -#: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" msgstr "POP/IMAP strežnik" +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" msgstr "ir.mail_server" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" +msgstr "POP/IMAP strežnik" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" +msgstr "" diff --git a/mail_environment/i18n/zh_CN.po b/mail_environment/i18n/zh_CN.po index 6836584c..ee795ce5 100644 --- a/mail_environment/i18n/zh_CN.po +++ b/mail_environment/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * mail_environment -# +# # Translators: # Jeffery Chenn , 2016 msgid "" @@ -11,19 +11,43 @@ msgstr "" "POT-Creation-Date: 2016-08-31 11:58+0000\n" "PO-Revision-Date: 2016-09-04 06:08+0000\n" "Last-Translator: Jeffery Chenn \n" -"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-" +"tools-9-0/language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: mail_environment -#: model:ir.model,name:mail_environment.model_fetchmail_server -msgid "POP/IMAP Server" +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "IMAP Server" msgstr "POP/IMAP 服务器" +#. module: mail_environment +#: model:ir.model,name:mail_environment.model_fetchmail_server +msgid "Incoming Mail Server" +msgstr "" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +msgid "Local Server" +msgstr "" + #. module: mail_environment #: model:ir.model,name:mail_environment.model_ir_mail_server -msgid "ir.mail_server" +#, fuzzy +msgid "Mail Server" +msgstr "POP/IMAP 服务器" + +#. module: mail_environment +#: selection:fetchmail.server,type:0 +#, fuzzy +msgid "POP Server" +msgstr "POP/IMAP 服务器" + +#. module: mail_environment +#: model:ir.model.fields,field_description:mail_environment.field_fetchmail_server__type +msgid "Server Type" msgstr "" diff --git a/mail_environment/static/description/icon.png b/mail_environment/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/mail_environment/static/description/index.html b/mail_environment/static/description/index.html index 67f8d8f4..5ef4e10d 100644 --- a/mail_environment/static/description/index.html +++ b/mail_environment/static/description/index.html @@ -3,7 +3,7 @@ - + Mail configuration with server_environment