From 3a91d778f0a70e263dbab5bb748b25ef14ad92cb Mon Sep 17 00:00:00 2001 From: "Sbh (Openerp)" Date: Thu, 22 Mar 2012 16:41:18 +0530 Subject: [PATCH] [IMP]survey : remove the loop for address bzr revid: sbh@tinyerp.com-20120322111118-reol0je703syzwyu --- .../account/report/account_print_overdue.py | 2 +- addons/point_of_sale/report/pos_receipt.py | 2 +- .../survey/wizard/survey_send_invitation.py | 81 +++++++++---------- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 82e6abf7b63..46fcd9af626 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -68,7 +68,7 @@ class Overdue(report_sxw.rml_parse): adr=res_partner_address.read(self.cr, self.uid, [adr_id])[0] return adr['phone'] else: - return partner.address and partner.address[0].phone or False + return partner.phone or False return False def _lines_get(self, partner): diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py index 721f4bc86e2..bdbc5560537 100644 --- a/addons/point_of_sale/report/pos_receipt.py +++ b/addons/point_of_sale/report/pos_receipt.py @@ -42,7 +42,7 @@ class order(report_sxw.rml_parse): 'disc': self.discount, 'net': self.netamount, 'get_journal_amt': self._get_journal_amt, - 'address': partner.address and partner.address[0] or False, + 'address': partner or False, 'titlize': titlize }) diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py index d4334ecfa9e..3a36d7912ad 100644 --- a/addons/survey/wizard/survey_send_invitation.py +++ b/addons/survey/wizard/survey_send_invitation.py @@ -138,48 +138,47 @@ class survey_send_invitation(osv.osv_memory): os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf") for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids): - for addr in partner.address: - if not addr.email: - skipped+= 1 - continue - user = user_ref.search(cr, uid, [('login', "=", addr.email)]) - if user: - if user[0] not in new_user: - new_user.append(user[0]) - user = user_ref.browse(cr, uid, user[0]) - user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]}) - mail = record['mail']%{'login':addr.email, 'passwd':user.password, \ - 'name' : addr.name} - if record['send_mail_existing']: - mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email] , \ - record['mail_subject_existing'] , mail, context=context) - existing+= "- %s (Login: %s, Password: %s)\n" % (user.name, addr.email, \ - user.password) - continue + if not partner.email: + skipped+= 1 + continue + user = user_ref.search(cr, uid, [('login', "=", partner.email)]) + if user: + if user[0] not in new_user: + new_user.append(user[0]) + user = user_ref.browse(cr, uid, user[0]) + user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]}) + mail = record['mail']%{'login':partner.email, 'passwd':user.password, \ + 'name' : partner.name} + if record['send_mail_existing']: + mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email] , \ + record['mail_subject_existing'] , mail, context=context) + existing+= "- %s (Login: %s, Password: %s)\n" % (user.name, partner.email, \ + user.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 = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [addr.email], \ - record['mail_subject'], mail, attachments=attachments, context=context) - if ans: - res_data = {'name': addr.name or 'Unknown', - 'login': addr.email, - 'password': passwd, - 'address_id': addr.id, - 'groups_id': [[6, 0, [group_id]]], - 'action_id': act_id[0], - 'survey_id': [[6, 0, survey_ids]] - } - user = user_ref.create(cr, uid, res_data) - if user not in new_user: - new_user.append(user) - created+= "- %s (Login: %s, Password: %s)\n" % (addr.name or 'Unknown',\ - addr.email, passwd) - else: - error+= "- %s (Login: %s, Password: %s)\n" % (addr.name or 'Unknown',\ - addr.email, passwd) + passwd= self.genpasswd() + out+= partner.email + ',' + passwd + '\n' + mail= record['mail'] % {'login' : partner.email, 'passwd' : passwd, 'name' : partner.name} + if record['send_mail']: + ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email], \ + record['mail_subject'], mail, attachments=attachments, context=context) + if ans: + res_data = {'name': partner.name or 'Unknown', + 'login': partner.email, + 'password': passwd, + 'address_id': partner.id, + 'groups_id': [[6, 0, [group_id]]], + 'action_id': act_id[0], + 'survey_id': [[6, 0, survey_ids]] + } + user = user_ref.create(cr, uid, res_data) + if user not in new_user: + new_user.append(user) + created+= "- %s (Login: %s, Password: %s)\n" % (partner.name or 'Unknown',\ + partner.email, passwd) + else: + error+= "- %s (Login: %s, Password: %s)\n" % (partner.name or 'Unknown',\ + partner.email, passwd) new_vals = {} new_vals.update({'invited_user_ids':[[6,0,new_user]]})