From 4c2a3f49698f74804fc240bd13956d49a4831a0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Aug 2012 12:24:31 +0200
Subject: [PATCH 1/2] [FIX] purchase_requisition: fixed mail.message
 inheritance, where behavior specific to this module was executed for every
 composed message.

bzr revid: tde@openerp.com-20120806102431-2vw87hw656kss0q0
---
 .../purchase_requisition.py                   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 1b0c36b114b..85ce92ad7ac 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -201,17 +201,18 @@ class mail_message(osv.osv):
                              email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
                              res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
                              context=None):
-        purchase_order_obj = self.pool.get('purchase.order')
-        requisition_id = purchase_order_obj.browse(cr, uid, res_id, context=context).requisition_id.id
         result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
-                     email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                     res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                     context=context)
-        if requisition_id:
-            result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
-                             email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                             res_id=requisition_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                             context=context)
+            email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+            res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+            context=context)
+        # check model is purchase.order
+        if model and model == 'purchase.order' and res_id:
+            requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
+            if requisition_id:
+                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
+                    email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+                    res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                    context=context)
         return result
 
 class purchase_requisition_line(osv.osv):

From b0d95be9685fe774c06602dea87f3929e937d73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Aug 2012 12:51:38 +0200
Subject: [PATCH 2/2] [FIX] subtype -> content_subtype.

bzr revid: tde@openerp.com-20120806105138-ipcsz8yscof5eg0f
---
 addons/purchase_requisition/purchase_requisition.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 85ce92ad7ac..8ba12657405 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -199,19 +199,19 @@ class mail_message(osv.osv):
     
     def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
                              email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
+                             res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
                              context=None):
         result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
             email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-            res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+            res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
             context=context)
         # check model is purchase.order
         if model and model == 'purchase.order' and res_id:
             requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
             if requisition_id:
-                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, 'purchase.requisition', email_cc=email_cc,
+                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc,
                     email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                    res_id=requisition_id.id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+                    res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
                     context=context)
         return result