From 82f0465b30d5be8089867789372b8721f62b9864 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 10:33:58 +0530
Subject: [PATCH 1/6] [IMP] Add data of subtype in stock

bzr revid: fka@tinyerp.com-20120831050358-fg7r75e0og1myke6
---
 addons/stock/stock.py       | 10 +++++-----
 addons/stock/stock_data.xml | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 006af587c1f..5e8b5dfaf5d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1379,13 +1379,13 @@ class stock_picking(osv.osv):
 
     def create_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=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), subtype="new", context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
-        return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
+        return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), subtype="moved", context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
-        return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), subtype="new", context=context)
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
         type_dict = {
@@ -1394,11 +1394,11 @@ class stock_picking(osv.osv):
                 'internal': 'moved',
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), subtype="close", context=context)
 
     def ship_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=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype="cancel", context=context)
 
 
 stock_picking()
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 282929ea6fb..f8fd499e311 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -164,5 +164,32 @@
             <field name="lot_stock_id" ref="stock_location_stock"/>
             <field name="lot_output_id" ref="stock_location_output"/>
         </record>
+
+        <!--
+    Mail: mail.message.subtype
+    -->
+        <record id="mail.mail_subtype_new" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_moved" model="mail.message.subtype">
+            <field name="name">moved</field>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_close" model="mail.message.subtype">
+            <field name="name">close</field>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_email" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_comment" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
+        <record id="mail.mail_subtype_other" model="mail.message.subtype">
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+        </record>
     </data>
 </openerp>

From d25ac32d1bb102a918044bee433751a161de44e9 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Fri, 31 Aug 2012 11:16:14 +0530
Subject: [PATCH 2/6] [IMP] improve code: add stock.move object

bzr revid: fka@tinyerp.com-20120831054614-41w4jus1rjki1tg6
---
 addons/stock/stock_data.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index f8fd499e311..72c9be96b16 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -183,13 +183,13 @@
             <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
         </record>
         <record id="mail.mail_subtype_comment" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
         </record>
         <record id="mail.mail_subtype_other" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
         </record>
     </data>
 </openerp>

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

bzr revid: fka@tinyerp.com-20120831105422-m2unzh8mezt4oan4
---
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_data.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5e8b5dfaf5d..3011fc6c6c2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1398,7 +1398,7 @@ class stock_picking(osv.osv):
 
     def ship_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=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype="cancel", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), subtype="cancelled", context=context)
 
 
 stock_picking()
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index a24502ab361..976c89ad06f 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -181,7 +181,7 @@ watch your stock valuation, and track production lots upstream and downstream (b
             <field name="name">close</field>
             <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
         </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('stock.model_stock_picking'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">

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

bzr revid: fka@tinyerp.com-20120831125201-gomz1f0hy8wid1rh
---
 addons/stock/stock.py       | 2 +-
 addons/stock/stock_data.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3011fc6c6c2..0bc455a149c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1394,7 +1394,7 @@ class stock_picking(osv.osv):
                 'internal': 'moved',
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), subtype="close", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), subtype="closed", context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 976c89ad06f..a7e2ffdd562 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -177,8 +177,8 @@ watch your stock valuation, and track production lots upstream and downstream (b
             <field name="name">moved</field>
             <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
         </record>
-        <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('stock.model_stock_picking'))]"/>
         </record>
         <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">

From 23007e8aebbd269abfbf3f62f27e8cbbcecafb33 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 3 Sep 2012 14:27:28 +0530
Subject: [PATCH 5/6] [IMP] Add picking_in & picking_out object in stock

bzr revid: fka@tinyerp.com-20120903085728-vx5hbkug5527nolo
---
 addons/stock/stock_data.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index a7e2ffdd562..3539d5b5056 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -171,27 +171,27 @@ watch your stock valuation, and track production lots upstream and downstream (b
     Mail: mail.message.subtype
     -->
         <record id="mail.mail_subtype_new" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_moved" model="mail.message.subtype">
             <field name="name">moved</field>
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_closed" model="mail.message.subtype">
             <field name="name">closed</field>
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_comment" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_other" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_move'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
     </data>
 </openerp>

From 49722c77c05375ad2f04c716cda3599f1c5bd5e8 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 3 Sep 2012 18:04:05 +0530
Subject: [PATCH 6/6] [IMP] add received & delivered subtype in stock

bzr revid: fka@tinyerp.com-20120903123405-7rmte2src1xtdghp
---
 addons/stock/stock.py       |  2 +-
 addons/stock/stock_data.xml | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 0bc455a149c..ed20bbec2c5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1394,7 +1394,7 @@ class stock_picking(osv.osv):
                 'internal': 'moved',
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), subtype="closed", context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), subtype=type_dict.get(obj.type), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 3539d5b5056..f83b0ada388 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -171,27 +171,29 @@ watch your stock valuation, and track production lots upstream and downstream (b
     Mail: mail.message.subtype
     -->
         <record id="mail.mail_subtype_new" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
-        <record id="mail.mail_subtype_moved" model="mail.message.subtype">
-            <field name="name">moved</field>
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+        <record id="mail.mail_subtype_delivered" model="mail.message.subtype">
+            <field name="name">delivered</field>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="default" eval="False"/>
         </record>
-        <record id="mail.mail_subtype_closed" model="mail.message.subtype">
-            <field name="name">closed</field>
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+        <record id="mail.mail_subtype_received" model="mail.message.subtype">
+            <field name="name">received</field>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in'))]"/>
+            <field name="default" eval="False"/>
         </record>
         <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_email" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_comment" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')),(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
         <record id="mail.mail_subtype_other" model="mail.message.subtype">
-            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking')), (4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
+            <field name="model_ids" eval="[(4,ref('stock.model_stock_picking_in')),(4,ref('stock.model_stock_picking_out'))]"/>
         </record>
     </data>
 </openerp>