Merge lp:~camptocamp/openobject-addons/7.0-bug-1089004-hip into lp:openobject-addons/7.0

Proposed by Alexandre Fayolle - camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-bug-1089004-hip
Merge into: lp:openobject-addons/7.0
Diff against target: 34 lines (+14/-10)
1 file modified
stock/stock_view.xml (+14/-10)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-bug-1089004-hip
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, test Approve
OpenERP Core Team Pending
Review via email: mp+150302@code.launchpad.net

Description of the change

propose merging the fix for lp:1089004 on the 7.0 branch

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

I tested the fix and it works fine on 7.0

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

tested and approved

review: Approve (code review, test)

Unmerged revisions

8374. By Hiral Patel (OpenERP) on 2012-12-18

[FIX][trunk] Add serial number popup layout broken in Firefox

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock/stock_view.xml'
2--- stock/stock_view.xml 2012-12-14 16:07:36 +0000
3+++ stock/stock_view.xml 2013-02-25 11:55:35 +0000
4@@ -337,16 +337,20 @@
5 <field name="model">stock.production.lot</field>
6 <field name="arch" type="xml">
7 <form string="Serial Number" version="7.0">
8- <div class="oe_button_box oe_right">
9- <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
10- <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
11- </div>
12- <div class="oe_title">
13- <label for="name" class="oe_edit_only"/>
14- <h1>
15- <field name="name"/>
16- </h1>
17- </div>
18+ <group>
19+ <div>
20+ <div class="oe_button_box oe_right">
21+ <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
22+ <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
23+ </div>
24+ <div class="oe_title">
25+ <label for="name" class="oe_edit_only"/>
26+ <h1>
27+ <field name="name"/>
28+ </h1>
29+ </div>
30+ </div>
31+ </group>
32 <group>
33 <group>
34 <field name="product_id"/>