From e1379636fd0dcf7ccda1e51919cedc42d472b5ae Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 18 Jun 2010 15:43:01 +0530
Subject: [PATCH] [IMP] stock: Improve the view of stock and
 stock_inventory_merge

bzr revid: sbh@tinyerp.com-20100618101301-jc2csyxcp5y9tmmh
---
 addons/stock/stock_view.xml                        |  5 +----
 addons/stock/wizard/stock_inventory_merge_view.xml | 13 ++++++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e8ffe0a577a..8995d67fb33 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1254,12 +1254,9 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                 <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index e8af34c0c71..5ae2987b59a 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -7,11 +7,14 @@
 		        <field name="model">stock.inventory.merge</field>
 		        <field name="type">form</field>
 		        <field name="arch" type="xml">
-		              <form string="Merge inventories">
-				    <separator colspan="4" string="Merge inventories" />
-				    <label string="Do you want to merge theses inventories ?"/>
-				<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-				<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>				
+					<form string="Merge inventories">
+				    	<separator colspan="4" string="Merge inventories" />
+				    	<label string="Do you want to merge theses inventories ?"/>
+				 <separator colspan="4"/>
+    				<group colspan="4" col="6">
+					<button special="cancel" string="Cancel" icon='gtk-cancel'/>
+					<button name="do_merge" string="Yes" type="object" icon="gtk-apply"/>
+					</group>			
 				</form>
 			</field>
 		</record>