Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-737258-ksa into lp:openobject-addons

  1. trunk-bug-737258-ksa
  2. Merge into trunk
Proposed by Kirti Savalia(OpenERP)
Status: Merged
Merged at revision: 4592
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-737258-ksa
Merge into: lp:openobject-addons
Diff against target: 33 lines (+3/-6)
1 file modified
stock/stock_view.xml (+3/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-737258-ksa
Reviewer Review Type Date Requested Status
Rucha (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+54863@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rucha (Open ERP) (rpa-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2011-01-31 04:55:23 +0000
+++ stock/stock_view.xml 2011-03-25 13:36:52 +0000
@@ -933,8 +933,7 @@
933 <field name="location_id"/>933 <field name="location_id"/>
934 <field name="date"/>934 <field name="date"/>
935 <field name="state"/>935 <field name="state"/>
936 <button name="%(action_partial_move_server)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>936 <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
937 <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
938 </tree>937 </tree>
939 <form string="Stock Moves">938 <form string="Stock Moves">
940 <group colspan="2" col="4">939 <group colspan="2" col="4">
@@ -1583,8 +1582,7 @@
1583 <field name="date"/>1582 <field name="date"/>
1584 <field name="state"/>1583 <field name="state"/>
1585 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>1584 <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
1586 <button name="%(action_partial_move_server)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>1585 <button name="%(action_partial_move_server)d" string="Process" type="action" states="confirmed,assigned" icon="gtk-go-forward"/>
1587 <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
1588 </tree>1586 </tree>
1589 </field>1587 </field>
1590 </record>1588 </record>
@@ -1672,8 +1670,7 @@
1672 <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>1670 <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
1673 <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>1671 <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
1674 <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>1672 <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
1675 <button name="%(action_partial_move_server)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>1673 <button name="%(action_partial_move_server)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
1676 <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
1677 </group>1674 </group>
1678 </form>1675 </form>
1679 </field>1676 </field>

Subscribers

People subscribed via source and target branches

to all changes: