Merge lp:~openerp-dev/openobject-addons/6.0-opw-578969-cbi into lp:openobject-addons/6.0

[Chris Biersbach (OpenERP)]

To reproduce this issue, try to send invitations via the module survey.

On non-english-locale systems, this will cause a Traceback with a UnicodeDecodeError.

The cause of this is the function string.letters, called when generating the password.
This return only a-z,A-Z in english locale but also special characters in other locale.
The solution was to replace it with a call to string.ascii_letters, which always return a-z,A-Z.

I also removed some unused code that has been there for a long time (2010) and was never used since, so it is not needed anymore. I figured that it was some old debugging code that was not removed.

[lp:~openerp-dev/openobject-addons/6.0-opw-578969-cbi]

5352. By Chris Biersbach (OpenERP) on 2012-10-09

[FIX] A report was created in a directory where sometimes the user has no write access. I changed this to automatically detect the temporary folder of the OS and create the report there, which is always possible

Unmerged revisions

5352. By Chris Biersbach (OpenERP) on 2012-10-09

[FIX] A report was created in a directory where sometimes the user has no write access. I changed this to automatically detect the temporary folder of the OS and create the report there, which is always possible

5351. By Chris Biersbach (OpenERP) on 2012-10-03

[FIX] changed a call to string.letters into a call to string.ascii_letters to avoid problems related to non-ascii characters. Also removed some unused code.

=== modified file 'survey/wizard/survey_send_invitation.py'
--- survey/wizard/survey_send_invitation.py	2011-01-14 00:11:01 +0000
+++ survey/wizard/survey_send_invitation.py	2012-10-09 12:04:21 +0000
@@ -56,7 +56,7 @@
     }
 
     def genpasswd(self):
-        chars = string.letters + string.digits
+        chars = string.ascii_letters + string.digits
         return ''.join([choice(chars) for i in range(6)])
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -81,7 +81,13 @@
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
         try:
-            ret_file_name = addons.get_module_resource('survey', 'report') + file_name + '.pdf'
+            # Windows: Use %temp% environment variable
+            if os.name == 'nt':
+                tempfolder = os.environ['temp']
+            # Unixoid Oses: user /tmp
+            elif os.name == 'posix':
+                tempfolder = '/tmp'
+            ret_file_name = tempfolder + os.sep + file_name + '.pdf'
             service = netsvc.LocalService(report_name);
             (result, format) = service.create(cr, uid, res_ids, {}, {})
             fp = open(ret_file_name, 'wb+');
@@ -110,7 +116,6 @@
         act_id = self.pool.get('ir.actions.act_window')
         act_id = act_id.search(cr, uid, [('res_model', '=' , 'survey.name.wiz'), \
                         ('view_type', '=', 'form')])
-        out = "login,password\n"
         skipped = 0
         existing = ""
         created = ""
@@ -125,8 +130,8 @@
             for use in exist_user:
                 new_user.append(use.id)
         for id in survey_ref.browse(cr, uid, survey_ids):
-            report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
-            file = open(addons.get_module_resource('survey', 'report') + id.title +".pdf")
+            report, ret_file_name = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
+            file = open(ret_file_name)
             file_data = ""
             while 1:
                 line = file.readline()
@@ -135,7 +140,7 @@
                     break
             attachments.append((id.title +".pdf",file_data))
             file.close()
-            os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf")
+            os.remove(ret_file_name)
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
             for addr in partner.address:
@@ -168,7 +173,6 @@
                                  (user_email.name, user_email.login, user_email.password)
                     continue
                 passwd= self.genpasswd()
-                out+= addr.email + ',' + passwd + '\n'
                 mail= record['mail'] % {'login' : addr.email, 'passwd' : passwd, 'name' : addr.name}
                 if record['send_mail']:
                     ans = tools.email_send(record['mail_from'], [addr.email], \