[MERGE] stock: fix upstream/downstream traceability actions on stock.tracking form

bzr revid: rco@openerp.com-20120111150942-1n1uvga1mcenlmhw

diff --cc addons/stock/stock.py
index 36f024e,cd9242c..6acde78
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -529,9 -529,9 +529,8 @@@ class stock_tracking(osv.osv)
          @param context: A standard dictionary
          @return: A dictionary of values
          """
--        value={}
--        value=self.pool.get('action.traceability').action_traceability(cr,uid,ids,context)
--        return value
++        return self.pool.get('action.traceability').action_traceability(cr,uid,ids,context)
++
  stock_tracking()
  
  #----------------------------------------------------------

diff --cc addons/stock/stock_view.xml
Simple merge