From 46c47e232414263d4697cb0f79424bd560f0ddc5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Wed, 31 Mar 2010 12:40:27 +0530
Subject: [PATCH] [FIX] stock: put proper action in make picking button

bzr revid: hmo@tinyerp.com-20100331071027-yccy49aga6y8f6yb
---
 addons/stock/stock_view.xml   |  8 ++++----
 addons/stock/stock_wizard.xml | 32 ++++++++------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 877ea313d1b..2335b66cbad 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -585,7 +585,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                             states="confirmed,assigned" 
                             string="Make Picking" 
                             type="action" 
@@ -752,7 +752,7 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="assigned" 
                                 string="Make Picking" 
                                 type="action" 
@@ -946,7 +946,7 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="assigned" 
                                 string="Make Picking" 
                                 type="action" 
@@ -1141,7 +1141,7 @@
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(make_picking)d" 
+                        <button name="%(act_stock_make_picking_wizard)d" 
                                 states="confirmed,assigned" 
                                 string="Make Picking" 
                                 type="action" 
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index f9a2dfc93b0..4ead149d2b0 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -12,16 +12,9 @@
             model="stock.picking"
             multi="True"
             name="stock.move.split"
-            string="Split move line"/>
-        
+            string="Split move line"/>       
 
-		<wizard 
-			id="make_picking" 
-			model="stock.picking"
-			menu="False"
-			keyword="client_action_multi"
-			name="stock.picking.make" 
-			string="Make Picking"/>
+		
 
 	    <wizard
 	        id="return_picking"
@@ -31,20 +24,11 @@
 	        name="stock.return.picking"
 	        string="Return picking"/>	
 
-    <wizard
-        id="split_inventory_lots"
-        model="stock.inventory.line"
-        multi="True"
-        name="stock.inventory.line.split"
-        string="Split inventory lines"/>
-
-    <!--wizard
-        string="Merge inventories"
-        model="stock.inventory"
-        name="inventory.merge"
-        keyword="client_action_multi"
-        multi="True"
-        id="wizard_merge_inventory"/-->
-
+        <wizard
+            id="split_inventory_lots"
+            model="stock.inventory.line"
+            multi="True"
+            name="stock.inventory.line.split"
+            string="Split inventory lines"/>    
    </data>
 </openerp>