1.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\xml\thread.xml 324行
代碼段：（註釋部分源碼）
<!-- on <p t-att-href="message.getURL()" t-att-data-oe-model="message.getDocumentModel()" t-att-data-oe-id="message.getDocumentID()" class="o_document_link" visibility="gone"><t t-esc="message.getDocumentName()"/></p>-->
2.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\models\mail_thread.py 1259-1340行
代碼段：（註釋部分源碼+添加代碼）
# 註釋掉的源碼
#dest_aliases = Alias.search([('alias_name', 'in', rcpt_tos_localparts)])
#if dest_aliases:
# routes = []
# for alias in dest_aliases:
# user_id = alias.alias_user_id.id
# if not user_id:
# # TDE note: this could cause crashes, because no clue that the user
# # that send the email has the right to create or modify a new document
# # Fallback on user_id = uid
# # Note: recognized partners will be added as followers anyway
# # user_id = self._message_find_user_id(message)
# user_id = self._uid
# _logger.info('No matching user_id for the alias %s', alias.alias_name)
# route = (alias.alias_model_id.model, alias.alias_force_thread_id, safe_eval(alias.alias_defaults), user_id, alias)
# route = self.message_route_verify(
# message, message_dict, route,
# update_author=True, assert_model=True, create_fallback=True)
# if route:
# _logger.info(
# 'Routing mail from %s to %s with Message-Id %s: direct alias match: %r',
# email_from, email_to, message_id, route)
# routes.append(route)
# return routes
# 如果是第三方發來的新郵件
get_alias = Alias.search([('alias_name', 'in', rcpt_tos_localparts)])
if get_alias:
alias = get_alias
else:
login = (tools.email_split(email_to) or [''])[0]
user = self.env['res.users'].search([('login', '=', login)], limit=1)
alias = self.env['mail.alias'].sudo().create({
'alias_name': email_to_localpart,
'alias_user_id': user.id,
'alias_model_id': self.env['ir.model']._get('mail.channel').id,
'alias_contact': 'everyone',
})
new_channel = self.env['mail.channel'].sudo().create({
'alias_id': alias.id,
'name': message_dict['subject']+' '+(tools.email_split(email_from) or [''])[0].lower(),
'channel_type': 'channel',
})
attachment_ids = []
for i in message_dict['attachments']:
new_attachment = self.env['ir.attachment'].create({
'name': i.fname,
'datas': base64.encodestring(i.content),
'datas_fname': i.fname,
'res_model': 'mail.channel',
'res_id': new_channel.id
})
attachment_ids.append((4,new_attachment.id))
partner = self.env['res.partner'].sudo().search([('email','=',(tools.email_split(email_to) or [''])[0])])
partner_id = [partner.id]
values = {
'author_id': '',
'model': '',
'res_id': new_channel.id,
'record_name': new_channel.name,
'body': message_dict['body'],
'subject': message_dict['subject'],
'email_from': email_from,
'reply_to': email_from,
'message_type': message_dict['message_type'],
'parent_id': '',
'subtype_id': 1,
'message_id': message_dict['message_id'],
'partner_ids': partner_id,
'attachment_ids': attachment_ids,
'add_sign': ''
}
new_message = self.env['mail.message'].sudo().create(values)
message_id = new_message.id
received = self.env['mail.notification']
received.sudo().create({
'mail_message_id': message_id,
'res_partner_id': partner_id[0],
'is_read': False,
'is_email': True,
})
return []
3.
E:\WorkSpace\eodoo\eodoo\odoo\addons\fetchmail\models\fetchmail.py 204-207行
代碼段：（修改代碼，避免郵件服務器刪除郵件出現異常）
try:
pop_server.dele(num)
except Exception:
pass
4.
E:\WorkSpace\eodoo\eodoo\odoo\addons\base\models\ir_mail_server.py 220-225行
483-484行
代碼段：（修改代碼，修改發件服務器的獲取方式）
#修改前的代碼
#mail_server = self.sudo().search([], order='sequence', limit=1)
if user:
mail_server = self.sudo().search([('smtp_user','=',user)])
else:
mail_server = self.sudo().search([], order='sequence', limit=1)
#smtp = smtp or self.connect(
smtp = self.connect(
5.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\models\mail_mail.py 369-374行
代碼段：（添加調用IrMailServer.send_email方法傳入的參數smtp_user）
#修改的
smtp_user = mail.email_from.split('<')[-1][:-1]
try:
#添加的屬性 smtp_user=smtp_user
res = IrMailServer.send_email(
msg, mail_server_id=mail.mail_server_id.id, smtp_session=smtp_session, smtp_user=smtp_user)
6.
E:\WorkSpace\eodoo\eodoo\odoo\addons\web\controllers\main.py 1074-1106行
代碼段：(新增處理髮送郵件的路由和處理函數)
# 新增的路由
@http.route('/web/dataset/reply_email', type='json', auth="user")
def reply_email(self,kwargs):
try:
author_id = request.env['mail.message']._get_default_author().id
subtype_id = request.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment')
MailMessage = request.env['mail.message']
MailMail = request.env['mail.mail']
values = {
'add_sign':True,
'attachment_ids':[(4,aid) for aid in kwargs['attachment_ids']],
'author_id':author_id,
'body':kwargs['body'],
'subject':kwargs['subject'],
'message_type':'comment',
'subtype_id':subtype_id,
'parent_id':False,
}
new_message = MailMessage.create(values)
values['canned_response_ids'] = []
mail_values = {
'auto_delete':True,
'body_html':new_message.body,
'mail_message_id':new_message.id,
'mail_server_id':False,
'email_to':kwargs['email_to'],
'subject':new_message.subject,
}
email = MailMail.create(mail_values)
email.send()
return '發送成功'
except Exception:
return "發送失敗，請重試"
7.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\xml\composer.xml 10-12行
代碼段：（添加代碼）
<div t-if="widget.extended" class="o_composer_to">
<input type="hidden" class="o_input"/>
</div>
8.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\js\composers\extended_composer.js 70-75行
90-91行
代碼段：（添加代碼）
/**
* @param {string} to
*/
setTo: function (to) {
this.$('.o_composer_to input').val(to);
},
var to = this.$('.o_composer_to input').val()
message.email_to = to;
9.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\js\discuss.js 842-843行
代碼段：（添加代碼）
var email_to = message.getDocumentName().split(' ')[message.getDocumentName().split(' ').length-1];
this._extendedComposer.setTo(email_to);
10.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\js\composers\basic_composer.js 400-438行
代碼段：（將源代碼的三條語句放入try中，捕獲到異常則調用新增的代碼進行郵件發送，保證系統內建的方式和新增都郵件發送方式都可用）
try{
self.trigger('post_message', message);
self._clearComposerOnSend();
self.$input.focus();
}
catch(TypeError){
var email_to = message.email_to;
var content = message.content;
var attachments = message.attachment_ids;
var local_path = window.location.href;
var url = local_path.split('web')[0] + "web/dataset/reply_email";
var data = {
"jsonrpc": "2.0",
"method": "reply_email",
"params": {
"kwargs": {
"partner_ids": [],
"body": content,
"subject": message.subject,
"attachment_ids": attachments,
"email_to": email_to,
"canned_response_ids": [],
"message_type": "comment",
"subtype": "mail.mt_comment"
}
}
}
var httpRequest = new XMLHttpRequest();
httpRequest.open('POST', url, true);
httpRequest.setRequestHeader("Content-type", "application/json");
httpRequest.send(JSON.stringify(data))
httpRequest.onreadystatechange = function () {
if (httpRequest.readyState == 4 && httpRequest.status == 200){
var response = httpRequest.responseText;
var res = JSON.parse(unescape(response))
alert(res.result);
}
}
};
11.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\xml\discuss.xml 74-88行
代碼段：在討論頁面新增收件服務器和發件服務器按鈕
<!-- 以下爲新增的代碼 -->
<hr class="mb8"/>
<t t-set="type" t-value="'private'"/>
<t t-call="mail.discuss.SidebarTitle">
<t t-set="title">設置</t>
<t t-set="icon" t-value="fa-eye-slash"/>
</t>
<button type="object" class="o_receive_mail_server_button">
收件服務器
</button>
<button type="button" class="o_send_mail_server_button">
發件服務器
</button>
<!-- END -->
12.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\js\discuss.js 192-193行
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\static\src\js\discuss.js 196-239行
代碼段：新增按鈕點擊事件以及點擊事件綁定的函數
'click .o_receive_mail_server_button': '_onFetchMailServerSettingsClick',
'click .o_send_mail_server_button': '_onSendMailServerSettingsClick',
/**
* @private
*/
_onFetchMailServerSettingsClick: function () {
var self = this;
var def = $.Deferred();
return self._rpc({
model: 'fetchmail_server',
method: 'fetch_mail_server_set',
args: [{
company_id: session.company_id,
currency_id: session.company_currency_id,
}],
kwargs: {
context: session.user_context,
},
}).then(function (action) {
return self.do_action(action);
}).always(function () {
def.reject();
});
},
/**
* @private
*/
_onSendMailServerSettingsClick: function () {
var self = this;
var def = $.Deferred();
return self._rpc({
model: 'sendmail_server',
method: 'send_mail_server_set',
args: [{
company_id: session.company_id,
currency_id: session.company_currency_id,
}],
kwargs: {
context: session.user_context
}
}).then(function (action) {
return self.do_action(action);
}).always(function () {
def.reject();
});
},
13.
E:\WorkSpace\eodoo\eodoo\odoo\addons\web\controllers\main.py 1039-1071行
源代碼：
return self._call_kw(model, method, args, kwargs)
修改後的代碼：新增的試圖處理函數
if model not in ('fetchmail_server','sendmail_server'):
return self._call_kw(model, method, args, kwargs)
else:
tz = kwargs['context']['tz']
uid = kwargs['context']['uid']
lang = kwargs['context']['lang']
if model == "fetchmail_server" and method == "fetch_mail_server_set":
action_id = request.env['ir.actions.actions'].search([('name','=',"Incoming Mail Servers")]).id
else:
action_id = request.env['ir.actions.actions'].search([('name','=',"Outgoing Mail Servers")]).id
model = "res.config.settings"
method = "create"
kwargs = {
"context":{
"tz": tz,
"uid": uid,
"lang": lang,
"module": "general_settings"
}
}
result = self.call_kw(model=model,method=method,args=args,kwargs=kwargs)
additional_context = {
"tz": tz,
"uid": uid,
"lang": lang,
"module": "general_settings",
"active_model": "res.config.settings",
"active_ids": [result],
"active_id": result
}
action = Action()
return action.load(action_id=action_id,additional_context=additional_context)
14.
E:\WorkSpace\eodoo\eodoo\odoo\addons\mail\models\mail_message.py 249-252行
代碼段：修改刪除郵件不刪除星標記錄的BUG
#取消郵件的星標
starred = not self.starred
if not starred:
self.sudo().write({'starred_partner_ids': [(3, self.env.user.partner_id.id)]})
15.
E:\WorkSpace\eodoo\eodoo\odoo\addons\base\models\ir_mail_server.py 139-142行
代碼段：取消smtp_user和smtp_pass兩個字段的權限限制
#smtp_user = fields.Char(string='Username', help="Optional username for SMTP authentication", groups='base.group_system')
#smtp_pass = fields.Char(string='Password', help="Optional password for SMTP authentication", groups='base.group_system')
smtp_user = fields.Char(string='Username', help="Optional username for SMTP authentication")
smtp_pass = fields.Char(string='Password', help="Optional password for SMTP authentication")