[MERGE] 574785: stock: fix 'Upstream Traceability' shown as 'Downstream...'

bzr revid: xal@openerp.com-20130227125920-fv9fi0s7tm6tkj11

diff --cc addons/stock/stock_view.xml
index 8a0424b,7567cab..d9cc452
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -331,8 -331,8 +331,8 @@@
                      <group col="2" colspan="2">
                          <separator string="Traceability" colspan="2"/>
                          <field name="stock_available" colspan="2"/>
-                         <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
 -                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
 -                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
++                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}" icon="gtk-go-up" colspan="2"/>
 +                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down" colspan="2"/>
                      </group>
                      <notebook colspan="4">
                          <page string="Revisions">