From 1e6099d7136739d3ba415968e5cc6461c6179961 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Thu, 30 Aug 2012 17:00:37 +0530
Subject: [PATCH 1/4] [IMP] Add data of subtype in purchase &
 purchase_requisition

bzr revid: fka@tinyerp.com-20120830113037-7t4raly1gf4a3uoh
---
 addons/purchase/purchase.py                   | 10 +++---
 addons/purchase/purchase_data.xml             | 32 +++++++++++++++++++
 .../purchase_requisition.py                   |  8 ++---
 .../purchase_requisition_data.xml             | 19 +++++++++++
 4 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 756016d39e2..1dfcc8a3f46 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -744,7 +744,7 @@ class purchase_order(osv.osv):
         return res + ['validator']
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
+        return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), subtype="new", context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
@@ -762,20 +762,20 @@ class purchase_order(osv.osv):
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), subtype="pending", context=context)
 
     def shipment_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
+        self.message_append_note(cr, uid, ids, body=_("""Shipment <b>received</b>."""), subtype="received", context=context)
 
     def invoice_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), subtype="paid", context=context)
 
     def draft_send_note(self, cr, uid, ids, context=None):
         return self.message_append_note(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_append_note(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), subtype="cancel", context=context)
 
 purchase_order()
 
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 75074d4cedf..41ff7dd59ac 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -48,5 +48,37 @@ You can also manage purchase requisitions, see the Purchase Settings.</value>
             model="ir.values"
             name="set"/>
         
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="name">new</field>
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_paid" model="mail.message.subtype">
+            <field name="name">paid</field>
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_pending" model="mail.message.subtype">
+            <field name="name">pending</field>
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_received" model="mail.message.subtype">
+            <field name="name">received</field>
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="name">cancel</field>
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..084701ff52e 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -94,13 +94,13 @@ class purchase_requisition(osv.osv):
         self.message_append_note(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
     
     def reset_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), subtype="new", context=context)
      
     def done_to_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), subtype="close", context=context)
         
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
+        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), subtype="cancel", context=context)
 
     def _planned_date(self, requisition, delay=0.0):
         company = requisition.company_id
@@ -184,7 +184,7 @@ class purchase_requisition(osv.osv):
         return res
     
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
+        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), subtype="new", context=context)  
 
     def create(self, cr, uid, vals, context=None):
         requisition =  super(purchase_requisition, self).create(cr, uid, vals, context=context)
diff --git a/addons/purchase_requisition/purchase_requisition_data.xml b/addons/purchase_requisition/purchase_requisition_data.xml
index 98591535f91..211f51374dd 100644
--- a/addons/purchase_requisition/purchase_requisition_data.xml
+++ b/addons/purchase_requisition/purchase_requisition_data.xml
@@ -6,5 +6,24 @@
             id="purchase_default_set"
             model="ir.values"
             name="set"/>
+    <record id="mail.mail_subtype_close" model="mail.message.subtype">
+            <field name="name">close</field>
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
+    <record id="mail.mail_subtype_new" model="mail.message.subtype">
+        <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+    </record>
+    <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+        <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+    </record>
+    <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

From a6a3d4eda6427fc1470e1bfd8408ba90581ad9e9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 16:10:32 +0530
Subject: [PATCH 2/4] [IMP] set indentation in purchase_requisition.xml

bzr revid: fka@tinyerp.com-20120831104032-yfuugotohlgfvz75
---
 .../purchase_requisition_data.xml               | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_data.xml b/addons/purchase_requisition/purchase_requisition_data.xml
index 211f51374dd..11ac73a6dd2 100644
--- a/addons/purchase_requisition/purchase_requisition_data.xml
+++ b/addons/purchase_requisition/purchase_requisition_data.xml
@@ -6,17 +6,18 @@
             id="purchase_default_set"
             model="ir.values"
             name="set"/>
-    <record id="mail.mail_subtype_close" model="mail.message.subtype">
+        <!-- SUBTYPE -->
+        <record id="mail.mail_subtype_close" model="mail.message.subtype">
             <field name="name">close</field>
             <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
         </record>
-    <record id="mail.mail_subtype_new" model="mail.message.subtype">
-        <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
-    </record>
-    <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
-        <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
-    </record>
-    <record id="mail.mail_subtype_email" model="mail.message.subtype">
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
             <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
         </record>
         <record id="mail.mail_subtype_comment" model="mail.message.subtype">

From 6c04925c0f3521a5a99586f688727f2be5f6340b Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 16:28:55 +0530
Subject: [PATCH 3/4] [IMP] improve code

bzr revid: fka@tinyerp.com-20120831105855-crs13rnqi2uztgha
---
 addons/purchase/purchase.py       | 2 +-
 addons/purchase/purchase_data.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 81b851eb2a2..16b827c1323 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -766,7 +766,7 @@ class purchase_order(osv.osv):
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), subtype="cancel", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), subtype="cancelled", context=context)
 
 purchase_order()
 
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 1cc3b3b014b..a84564b2360 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -67,8 +67,8 @@ You can also manage purchase requisitions, see also the Purchase Settings.</fiel
             <field name="name">received</field>
             <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
         </record>
-        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
-            <field name="name">cancel</field>
+        <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
+            <field name="name">cancelled</field>
             <field name="model_ids" eval="[(4,ref('purchase.model_purchase_order'))]"/>
             <field name="default" eval="False"/>
         </record>

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

bzr revid: fka@tinyerp.com-20120831124744-uup75dwshj5nmf2n
---
 addons/purchase_requisition/purchase_requisition.py       | 2 +-
 addons/purchase_requisition/purchase_requisition_data.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 67905f35922..5a5f669b1a1 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -97,7 +97,7 @@ class purchase_requisition(osv.osv):
         self.message_post(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), subtype="new", context=context)
      
     def done_to_send_note(self, cr, uid, ids, context=None):
-        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), subtype="close", context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), subtype="closed", context=context)
         
     def cancel_send_note(self, cr, uid, ids, context=None):
         self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), subtype="cancel", context=context)
diff --git a/addons/purchase_requisition/purchase_requisition_data.xml b/addons/purchase_requisition/purchase_requisition_data.xml
index 11ac73a6dd2..11dd5f45170 100644
--- a/addons/purchase_requisition/purchase_requisition_data.xml
+++ b/addons/purchase_requisition/purchase_requisition_data.xml
@@ -7,8 +7,8 @@
             model="ir.values"
             name="set"/>
         <!-- SUBTYPE -->
-        <record id="mail.mail_subtype_close" model="mail.message.subtype">
-            <field name="name">close</field>
+        <record id="mail.mail_subtype_closed" model="mail.message.subtype">
+            <field name="name">closed</field>
             <field name="model_ids" eval="[(4,ref('purchase_requisition.model_purchase_requisition'))]"/>
         </record>
         <record id="mail.mail_subtype_new" model="mail.message.subtype">