Merge lp:~camptocamp/openobject-addons/6.1-fix-1087311 into lp:openobject-addons/6.1

[Alexandre Fayolle - camptocamp]

[FIX] lp:1087311 lp:928233 (Production lot upstream traceability error)

the code of the server side does not expect context['type'] to be an empty string.

fix lp:1087311 by setting 'type' in the context of the Upstream traceability button to a non empty string.

Unmerged revisions

7106. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-18

[FIX] stock: fix nasty bug when clicking on "Upstream Traceability" button for production lots

The issue was created when stoc/wizard/stock_traceability.py had line

type1 = context['type'] or 'move_history_ids2'

rewritten as:

type1 = context.get('type', 'move_history_ids2')

which returned an empty string for that button which set context['type'] to an
empty string. This was introduced in rev. 6259, which introduced bug lp:920841,
fixed in rev. 6370.6.2 which fixed the symptom but not the second layer bug.

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2012-11-16 16:43:29 +0000
+++ stock/stock_view.xml	2012-12-18 09:21:22 +0000
@@ -331,7 +331,7 @@
                     <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_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">