Merge lp:kmsistemas-openerp-addons into lp:ocb-addons/6.1

[Jordi Llinares - KM Sistemas]

[FIX] Fix of bug lp:1268654, where generate_email threw an exception when an email with user signature was generated from a template with no plain text body.

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jordi, thank you very much for pointing out the problem and its solution.

For the next time, please make the MP with an specific branch for solving the bug, because in this way, you get all the bugs that you have declared as related, as you can see here with "Bug #1256619: [6.1] report_stock_inventory wrongly declared column & SQL", that was previously reported and solved, but with the same branch.

BTW, I think it's safer to put 'if values.get('body_text')' and 'if values.get('body_html')' to avoid errors when a value is not present in the dictionary.

Regards.

review: Needs Fixing (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Setting to work in progress after months without a response from the submitter

Unmerged revisions

6827. By Jordi Llinares - KM Sistemas on 2014-01-13

Fixes signature addition bug when there's no plain text body in generate_email.

=== modified file 'email_template/email_template.py'
--- email_template/email_template.py	2012-08-20 08:30:47 +0000
+++ email_template/email_template.py	2014-01-13 17:06:05 +0000
@@ -336,7 +336,10 @@
 
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_text'] += '\n\n' + signature
+            if values['body_text']:
+                values['body_text'] += '\n\n' + signature
+            if values['body_html']:
+                values['body_html'] += '<br/><br/>' + signature
 
         values.update(mail_server_id = template.mail_server_id.id or False,
                       auto_delete = template.auto_delete,