Merge lp:~openerp-commiter/openobject-addons/6.0-opw-4594-dhs into lp:openobject-addons/6.0

[Dhruti Shastri(OpenERP)]

[Jay Vora (Serpent Consulting Services) (jayvora)]

Dhruti,

Thanks for the patch, but can you please try to correct the no. of unnecessary lines for the patch?
Moreover, please try to see the relevant lines of code where %(e) has been used,correct them too.

Thanks.

review: Needs Fixing

[Jay Vora (Serpent Consulting Services) (jayvora)]

Dhruti,

I am rejecting the proposal as this needs corrections and currently not to-the-shoulder to latest addons.

Thanks.

Unmerged revisions

4472. By Dhruti Shastri(OpenERP) on 2011-03-21

[FIX] email_template : Added tools.ustr to convert the string (Ref : case 4594)

=== modified file 'email_template/email_template_account.py'
--- email_template/email_template_account.py	2011-01-14 00:11:01 +0000
+++ email_template/email_template_account.py	2011-03-21 13:43:19 +0000
@@ -81,10 +81,10 @@
                         size=64, required=True,
                         readonly=True, select=True,
                         help="The description is used as the Sender name along with the provided From Email, \
-unless it is already specified in the From Email, e.g: John Doe <[e-mail]>", 
+unless it is already specified in the From Email, e.g: John Doe <[e-mail]>",
                         states={'draft':[('readonly', False)]}),
-        'auto_delete': fields.boolean('Auto Delete', size=64, readonly=True, 
-                                      help="Permanently delete emails after sending", 
+        'auto_delete': fields.boolean('Auto Delete', size=64, readonly=True,
+                                      help="Permanently delete emails after sending",
                                       states={'draft':[('readonly', False)]}),
         'user':fields.many2one('res.users',
                         'Related User', required=True,
@@ -112,7 +112,7 @@
                         states={'draft':[('readonly', False)]}),
         'smtptls':fields.boolean('TLS',
                         states={'draft':[('readonly', False)]}, readonly=True),
-                                
+
         'smtpssl':fields.boolean('SSL/TLS (only in python 2.6)',
                         states={'draft':[('readonly', False)]}, readonly=True),
         'send_pref':fields.selection([
@@ -159,7 +159,7 @@
          'send_pref':lambda *a: 'html',
          'smtptls':lambda *a:True,
      }
-    
+
     _sql_constraints = [
         (
          'email_uniq',
@@ -172,9 +172,9 @@
 
     def _constraint_unique(self, cursor, user, ids, context=None):
         """
-        This makes sure that you dont give personal 
+        This makes sure that you dont give personal
         users two accounts with same ID (Validated in sql constaints)
-        However this constraint exempts company accounts. 
+        However this constraint exempts company accounts.
         Any no of co accounts for a user is allowed
         """
         if self.read(cursor, user, ids, ['company'])[0]['company'] == 'no':
@@ -188,7 +188,7 @@
                 return True
         else:
             return True
-        
+
     _constraints = [
         (_constraint_unique,
          'Error: You are not allowed to have more than 1 account.',
@@ -198,15 +198,15 @@
     def get_outgoing_server(self, cursor, user, ids, context=None):
         """
         Returns the Out Going Connection (SMTP) object
-        
+
         @attention: DO NOT USE except_osv IN THIS METHOD
         @param cursor: Database Cursor
         @param user: ID of current user
-        @param ids: ID/list of ids of current object for 
+        @param ids: ID/list of ids of current object for
                     which connection is required
                     First ID will be chosen from lists
         @param context: Context
-        
+
         @return: SMTP server object or Exception
         """
         #Type cast ids to integer
@@ -214,7 +214,7 @@
             ids = ids[0]
         this_object = self.browse(cursor, user, ids, context=context)
         if this_object:
-            if this_object.smtpserver and this_object.smtpport: 
+            if this_object.smtpserver and this_object.smtpport:
                 try:
                     if this_object.smtpssl:
                         serv = smtplib.SMTP_SSL(this_object.smtpserver, this_object.smtpport)
@@ -234,14 +234,14 @@
                 return serv
             raise Exception(_("SMTP SERVER or PORT not specified"))
         raise Exception(_("Core connection for the given ID does not exist"))
-    
+
     def check_outgoing_connection(self, cursor, user, ids, context=None):
         """
         checks SMTP credentials and confirms if outgoing connection works
         (Attached to button)
         @param cursor: Database Cursor
         @param user: ID of current user
-        @param ids: list of ids of current object for 
+        @param ids: list of ids of current object for
                     which connection is required
         @param context: Context
         """
@@ -253,9 +253,9 @@
         except Exception, error:
             raise osv.except_osv(
                                  _("Out going connection test failed"),
-                                 _("Reason: %s") % error
+                                 _("Reason: %s") % tools.ustr(error)
                                  )
-    
+
     def do_approval(self, cr, uid, ids, context=None):
         #TODO: Check if user has rights
         self.write(cr, uid, ids, {'state':'approved'}, context=context)
@@ -279,12 +279,12 @@
         else:
             logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
             return False
-                      
+
 #**************************** MAIL SENDING FEATURES ***********************#
 
 
 
-    
+
     def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
         #TODO: Replace all this with a single email object
         if body is None:
@@ -294,7 +294,7 @@
         if context is None:
             context = {}
         logger = netsvc.Logger()
-        for id in ids:  
+        for id in ids:
             core_obj = self.browse(cr, uid, id, context)
             serv = self.smtp_connection(cr, uid, id)
             if serv:
@@ -307,7 +307,7 @@
                         text_part = MIMEMultipart(_subtype=text_subtype)
                         payload_part.attach(text_part)
                     else:
-                        # otherwise a single multipart/mixed will do the whole job 
+                        # otherwise a single multipart/mixed will do the whole job
                         payload_part = text_part = MIMEMultipart(_subtype=text_subtype)
 
                     if subject:
@@ -322,7 +322,7 @@
                         payload_part['From'] = sender_name + " <" + core_obj.email_id + ">"
                     payload_part['Organization'] = tools.ustr(core_obj.user.company_id.name)
                     payload_part['Date'] = formatdate()
-                    addresses_l = extract_emails_from_dict(addresses) 
+                    addresses_l = extract_emails_from_dict(addresses)
                     if addresses_l['To']:
                         payload_part['To'] = u','.join(addresses_l['To'])
                     if addresses_l['CC']:
@@ -430,28 +430,28 @@
                                     e)
                       )
         return date_as_date
-        
+
     def send_receive(self, cr, uid, ids, context=None):
         for id in ids:
             ctx = context.copy()
             ctx['filters'] = [('account_id', '=', id)]
             self.pool.get('email_template.mailbox').send_all_mail(cr, uid, [], context=ctx)
         return True
- 
+
     def decode_header_text(self, text):
         """ Decode internationalized headers RFC2822.
-            To, CC, BCC, Subject fields can contain 
+            To, CC, BCC, Subject fields can contain
             text slices with different encodes, like:
-                =?iso-8859-1?Q?Enric_Mart=ED?= <[e-mail]>, 
+                =?iso-8859-1?Q?Enric_Mart=ED?= <[e-mail]>,
                 =?Windows-1252?Q?David_G=F3mez?= <[e-mail]>
             Sometimes they include extra " character at the beginning/
             end of the contact name, like:
                 "=?iso-8859-1?Q?Enric_Mart=ED?=" <[e-mail]>
-            and decode_header() does not work well, so we use regular 
+            and decode_header() does not work well, so we use regular
             expressions (?=   ? ?   ?=) to split the text slices
         """
         if not text:
-            return text        
+            return text
         p = re.compile("(=\?.*?\?.\?.*?\?=)")
         text2 = ''
         try: