From d189e17e71b2e9bc4ee238ca29c8047888493293 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Thu, 25 Sep 2008 21:40:50 +0200 Subject: [PATCH] bugfixes bzr revid: fp@tinyerp.com-20080925194050-enw8gayfgjm0b0jc --- bin/osv/fields.py | 1 - bin/report/interface.py | 10 +++++++--- bin/tools/misc.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index daee0e4e40a..6ddef4a5338 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -676,7 +676,6 @@ class related(function): return res def __init__(self,*arg,**args): - print arg self.arg = arg super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args) diff --git a/bin/report/interface.py b/bin/report/interface.py index 95e6ec31946..3e133310476 100644 --- a/bin/report/interface.py +++ b/bin/report/interface.py @@ -100,9 +100,13 @@ class report_rml(report_int): # file('/tmp/terp.rml','wb+').write(rml) pool = pooler.get_pool(cr.dbname) ir_actions_report_xml_obj = pool.get('ir.actions.report.xml') - report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, - [('report_name', '=', self.name[7:])], context=context) - self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name + try: + report_xml_ids = ir_actions_report_xml_obj.search(cr, uid, + [('report_name', '=', self.name[7:])], context=context) + self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name + except: + print 'Report not Found !' + self.title = 'Unknown' report_type = datas.get('report_type', 'pdf') create_doc = self.generators[report_type] pdf = create_doc(rml, title=self.title) diff --git a/bin/tools/misc.py b/bin/tools/misc.py index f29f1731ddb..d01fa4f293d 100644 --- a/bin/tools/misc.py +++ b/bin/tools/misc.py @@ -358,12 +358,12 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non if debug: s.debuglevel = 5 + s.connect(config['smtp_server'], config['smtp_port']) if ssl: s.ehlo() s.starttls() s.ehlo() - s.connect(config['smtp_server'], config['smtp_port']) if config['smtp_user'] or config['smtp_password']: s.login(config['smtp_user'], config['smtp_password']) s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string()) @@ -423,12 +423,12 @@ def email_send_attach(email_from, email_to, subject, body, email_cc=None, email_ if debug: s.debuglevel = 5 + s.connect(config['smtp_server'], config['smtp_port']) if ssl: s.ehlo() s.starttls() s.ehlo() - s.connect(config['smtp_server'], config['smtp_port']) if config['smtp_user'] or config['smtp_password']: s.login(config['smtp_user'], config['smtp_password']) s.sendmail(email_from, flatten([email_to, email_cc, email_bcc]), msg.as_string())