Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-commiter/openobject-addons/6.0-bug-737258-jvo into lp:openobject-addons/6.0

  1. 6.0-bug-737258-jvo
  2. Merge into 6.0
Proposed by Jay Vora (Serpent Consulting Services)
Status: Merged
Merged at revision: 4503
Proposed branch: lp:~openerp-commiter/openobject-addons/6.0-bug-737258-jvo
Merge into: lp:openobject-addons/6.0
Diff against target: 33 lines (+3/-6)
1 file modified
stock/stock_view.xml (+3/-6)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/6.0-bug-737258-jvo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56124@code.launchpad.net
To post a comment you must log in.

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 2011-03-29 15:45:24 +0000
3+++ stock/stock_view.xml 2011-04-04 10:21:33 +0000
4@@ -933,8 +933,7 @@
5 <field name="location_id"/>
6 <field name="date"/>
7 <field name="state"/>
8- <button name="%(action_partial_move_server)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
9- <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
10+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
11 </tree>
12 <form string="Stock Moves">
13 <group colspan="2" col="4">
14@@ -1583,8 +1582,7 @@
15 <field name="date"/>
16 <field name="state"/>
17 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
18- <button name="%(action_partial_move_server)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
19- <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
20+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
21 </tree>
22 </field>
23 </record>
24@@ -1672,8 +1670,7 @@
25 <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
26 <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
27 <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
28- <button name="%(action_partial_move_server)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
29- <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
30+ <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
31 </group>
32 </form>
33 </field>