From d41086e21010188f7a842607e4f855408472c798 Mon Sep 17 00:00:00 2001
From: Ivan Yelizariev <ivann.exe@gmail.com>
Date: Mon, 20 Jan 2014 14:00:07 +0600
Subject: [PATCH] upload

---
 __init__.py     |  1 +
 __openerp__.py  | 36 ++++++++++++++++++++++++++++++++++++
 mail_fix_553.py | 25 +++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 __init__.py
 create mode 100644 __openerp__.py
 create mode 100644 mail_fix_553.py

diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..c978833
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1 @@
+import mail_fix_553
diff --git a/__openerp__.py b/__openerp__.py
new file mode 100644
index 0000000..7a9d6af
--- /dev/null
+++ b/__openerp__.py
@@ -0,0 +1,36 @@
+{
+    "name" : "Fix error 553",
+    "version" : "0.3",
+    "author" : "Ivan Yelizariev",
+    "category" : "Mail",
+    "website" : "https://it-projects.info",
+    "description": """Update 'Reply-to' field to catchall value in order to fix problem like that:
+
+    2014-01-18 06:25:56,532 6789 INFO trunk openerp.addons.mail.mail_thread: Routing mail from <MYLOGIN@yandex.ru> to admin@MYDOMAIN.com with Message-Id <49131390026345@web16h.yandex.ru>: direct alias match: (u'res.users', 1, {}, 1, browse_record(mail.alias, 1))
+2014-01-18 06:25:57,212 6789 ERROR trunk openerp.addons.base.ir.ir_mail_server: Mail delivery failed via SMTP server 'smtp.yandex.ru'.
+SMTPSenderRefused: 553
+5.7.1 Sender address rejected: not owned by auth user.
+MYLOGIN@yandex.ru
+Traceback (most recent call last):
+  File "/mnt/files/src/openerp-server/server/openerp/addons/base/ir/ir_mail_server.py", line 465, in send_email
+    smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
+  File "/usr/lib/python2.7/smtplib.py", line 722, in sendmail
+    raise SMTPSenderRefused(code, resp, from_addr)
+SMTPSenderRefused: (553, '5.7.1 Sender address rejected: not owned by auth user.', 'MYLOGIN@yandex.ru')
+
+2014-01-18 06:25:57,216 6789 ERROR trunk openerp.addons.mail.mail_mail: failed sending mail.mail 2
+Traceback (most recent call last):
+  File "/mnt/files/src/openerp-server/addons/mail/mail_mail.py", line 284, in send
+    context=context)
+  File "/mnt/files/src/openerp-server/server/openerp/addons/base/ir/ir_mail_server.py", line 478, in send_email
+    raise MailDeliveryException(_("Mail Delivery Failed"), msg)
+MailDeliveryException: (u'Mail Delivery Failed', u"Mail delivery failed via SMTP server 'smtp.yandex.ru'.\nSMTPSenderRefused: 553\n5.7.1 Sender address rejected: not owned by auth user.\nMYLOGIN@yandex.ru")
+2014-01-18 06:25:57,223 6789 INFO trunk openerp.addons.fetchmail.fetchmail: fetched/processed 1 email(s) on imap server yandex
+
+    """,
+    "depends" : ["base", "mail"],
+    #"init_xml" : [],
+    #"update_xml" : [],
+    #"active": True,
+    "installable": True
+}
diff --git a/mail_fix_553.py b/mail_fix_553.py
new file mode 100644
index 0000000..e528dcd
--- /dev/null
+++ b/mail_fix_553.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+import re
+from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
+
+class mail_mail(osv.Model):
+    _inherit = "mail.mail"
+    def send(self, cr, uid, ids, context=None, **kwargs):
+        catchall_alias = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.alias", context=context)
+        catchall_domain = self.pool['ir.config_parameter'].get_param(cr, uid, "mail.catchall.domain", context=context)
+
+        fix_ids = []
+        for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
+            if re.search('@%s>?\s*$'%catchall_domain, mail.email_from) is None:
+                print 'fix:', mail.email_from
+                fix_ids.append(mail.id)
+
+        email_from = '%s@%s' % (catchall_alias, catchall_domain)
+        print 'new email', email_from
+
+        if fix_ids:
+            self.write(cr, uid, fix_ids, {'email_from': email_from}, context=context)
+
+        return super(mail_mail, self).send(cr, uid, ids, context=context, **kwargs)