From ca22d79a2107d943f1484728cdda7b6d37f43826 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 14:42:06 +0530
Subject: [PATCH 1/3] [IMP] Add data of subtype in procurement

bzr revid: fka@tinyerp.com-20120831091206-196wzqlatj7lryi0
---
 addons/procurement/procurement.py       | 12 ++++-----
 addons/procurement/procurement_data.xml | 34 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index db50ebd94fd..4c60316ffb6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -496,22 +496,22 @@ class procurement_order(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>created</b>."), subtype="new", context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), subtype="confirmed", context=context)
 
     def running_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), subtype="running", context=context)
 
     def ready_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), subtype="ready", context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), subtype="cancel", context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), subtype="close", context=context)
 
 procurement_order()
 
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
index 6a83d525c68..bbcaa33d2a1 100644
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -28,5 +28,39 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
+        
+            <!--
+    Mail: mail.message.subtype
+    -->
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_confirmed" model="mail.message.subtype">
+            <field name="name">confirmed</field>
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_ready" model="mail.message.subtype">
+            <field name="name">ready</field>
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_ready" model="mail.message.subtype">
+            <field name="name">running</field>
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_close" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

From 5ec28dcd8933cb8ef42d3349d7651e66b02d46f5 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 16:41:15 +0530
Subject: [PATCH 2/3] [IMP] improve code

bzr revid: fka@tinyerp.com-20120831111115-fqoapz8uroxsdddm
---
 addons/procurement/procurement.py       | 2 +-
 addons/procurement/procurement_data.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 4c60316ffb6..d59a894bc2b 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -508,7 +508,7 @@ class procurement_order(osv.osv):
         self.message_post(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), subtype="ready", context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), subtype="cancel", context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), subtype="cancelled", context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
         self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), subtype="close", context=context)
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
index bbcaa33d2a1..8f4e945a7de 100644
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -47,7 +47,7 @@
             <field name="name">running</field>
             <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
         </record>
-        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+        <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
         </record>
         <record id="mail.mail_subtype_close" model="mail.message.subtype">

From e5b99dca25aea687272e0e09d73d9ac034acd14c Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 18:11:23 +0530
Subject: [PATCH 3/3] [IMP] change close

bzr revid: fka@tinyerp.com-20120831124123-3fq363k7b5bcnuix
---
 addons/procurement/procurement.py       | 2 +-
 addons/procurement/procurement_data.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d59a894bc2b..94d83675df1 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -511,7 +511,7 @@ class procurement_order(osv.osv):
         self.message_post(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), subtype="cancelled", context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), subtype="close", context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement has been <b>done</b>."), subtype="closed", context=context)
 
 procurement_order()
 
diff --git a/addons/procurement/procurement_data.xml b/addons/procurement/procurement_data.xml
index 8f4e945a7de..bd44f0caee5 100644
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -50,7 +50,7 @@
         <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
         </record>
-        <record id="mail.mail_subtype_close" model="mail.message.subtype">
+        <record id="mail.mail_subtype_closed" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('procurement.model_procurement_order'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">