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/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py index 1e7757e3f17..e39949b7c51 100644 --- a/bin/report/printscreen/ps_form.py +++ b/bin/report/printscreen/ps_form.py @@ -141,6 +141,8 @@ class report_printscreen_list(report_int): line[f] = line[f][1] if fields[f]['type'] in ('one2many','many2many') and line[f]: line[f] = '( '+str(len(line[f])) + ' )' + if fields[f]['type'] in ('float','integer'): + line[f]=round(line[f],2) col = new_doc.createElement("col") col.setAttribute('tree','no') if line[f] != None: diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py index 29242a3119e..d0245828735 100644 --- a/bin/report/printscreen/ps_list.py +++ b/bin/report/printscreen/ps_list.py @@ -128,7 +128,6 @@ class report_printscreen_list(report_int): t += fields[f].get('size', 80) / 28 + 1 l.append(s) - for pos in range(len(l)): if not l[pos]: s = fields[fields_order[pos]].get('size', 80) / 28 + 1 @@ -152,7 +151,6 @@ class report_printscreen_list(report_int): count = len(fields_order) for i in range(0,count): tsum.append(0) - for line in results: node_line = new_doc.createElement("row") @@ -163,6 +161,8 @@ class report_printscreen_list(report_int): line[f] = line[f][1] if fields[f]['type'] in ('one2many','many2many') and line[f]: line[f] = '( '+str(len(line[f])) + ' )' + if fields[f]['type'] in ('float','integer'): + line[f]=round(line[f],2) col = new_doc.createElement("col") col.setAttribute('para','yes') col.setAttribute('tree','no') 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())