diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 004c1aba2f2..bb0c1854276 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -522,7 +522,35 @@ class stock_tracking(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error'), _('You can not remove a lot line !'))
-
+    
+    def action_traceability(self, cr, uid, ids, context={}):
+        """ It traces the information of a product
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
+        @return: A dictionary of values
+        """
+        # Refactor Need
+        type1 = context['type'] or 'move_history_ids'
+        field = context['field'] or 'tracking_id'
+        obj = self.pool.get('stock.move')
+        ids = obj.search(cr, uid, [(field, 'in',context['active_ids'])])
+        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type1, 'tree'))
+        view_id = cr.fetchone()[0]
+        value = {
+            'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
+            'name': ((type1=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
+            'view_type': 'tree',
+            'res_model': 'stock.move',
+            'field_parent': type1,
+            'view_id': (view_id,'View'),
+            'type': 'ir.actions.act_window',
+            'nodestroy':True,
+        
+        }
+        return value
 stock_tracking()
 
 #----------------------------------------------------------
@@ -1347,7 +1375,33 @@ class stock_production_lot(osv.osv):
     _sql_constraints = [
         ('name_ref_uniq', 'unique (name, ref)', 'The serial/ref must be unique !'),
     ]
-
+    def action_traceability(self, cr, uid, ids, context={}):
+        """ It traces the information of a product
+        @param self: The object pointer.
+        @param cr: A database cursor
+        @param uid: ID of the user currently logged in
+        @param ids: List of IDs selected 
+        @param context: A standard dictionary 
+        @return: A dictionary of values
+        """
+        type1 = context['type'] or 'move_history_ids'
+        field = context['field'] or 'tracking_id'
+        obj = self.pool.get('stock.move')
+        ids = obj.search(cr, uid, [(field, 'in',context['active_ids'])])
+        cr.execute('select id from ir_ui_view where model=%s and field_parent=%s and type=%s', ('stock.move', type1, 'tree'))
+        view_id = cr.fetchone()[0]
+        value = {
+            'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
+            'name': ((type1=='move_history_ids') and 'Upstream Traceability') or 'Downstream Traceability',
+            'view_type': 'tree',
+            'res_model': 'stock.move',
+            'field_parent': type1,
+            'view_id': (view_id,'View'),
+            'type': 'ir.actions.act_window',
+            'nodestroy':True,
+        
+        }
+        return value
 stock_production_lot()
 
 class stock_production_lot_revision(osv.osv):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7f3dfaa58dc..6c4252e75b7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -163,8 +163,8 @@
                     <field name="active" select="1"/>
                     <separator string="" colspan="4" />
 					<group col="4" colspan="4">
-						<button name="%(action_view_stock_traceability_lot_upstream)d" string="Upstream Traceability"  icon="gtk-go-back" type="action"/>
-						<button name="%(action_view_stock_traceability_upstream)d" string="Downstream Traceability" icon="gtk-jump-to" type="action"/>		                         
+						<button name="action_traceability"  icon="gtk-go-back" string="Downstream traceability" type="object" context="{'type': 'move_history_ids2','field': ''}"/>
+						<button name="action_traceability"  icon="gtk-jump-to"  string="Upstream traceability" type="object" context="{'type': '','field': ''}"/>
 					</group>                    
                 </form>
             </field>
@@ -254,9 +254,9 @@
 				<page string="General Information">                            
 					<field colspan="4" name="revisions" nolabel="1"/>
 					<group col="4" colspan="4">
-						<button name="%(action_view_stock_traceability_lot_upstream)d" string="Upstream Traceability"  icon="gtk-go-back" type="action"/>
-						<button name="%(action_view_stock_traceability_lot_downstream)d" string="Downstream Traceability" icon="gtk-jump-to" type="action"/>		                         
-			</group>
+						<button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-back"/>
+						<button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}" icon="gtk-jump-to"/>		                         
+					</group>
 			</page>
 			</notebook>
                 </form>