diff --git a/addons/mrp/__init__.py b/addons/mrp/__init__.py
index b219d932141..3283ec11b99 100644
--- a/addons/mrp/__init__.py
+++ b/addons/mrp/__init__.py
@@ -26,4 +26,7 @@ import wizard
 import report
 import company
 import schedulers
+
+import make_procurement
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 1d5eb98da2e..6497dc3933a 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -69,6 +69,7 @@
         'process/service_product_process.xml',
         'process/procurement_process.xml',
         'mrp_installer.xml',
+        'make_procurement.xml',
     ],
     'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
     'installable': True,
diff --git a/addons/mrp/make_procurement.py b/addons/mrp/make_procurement.py
new file mode 100644
index 00000000000..29b0f58ccf0
--- /dev/null
+++ b/addons/mrp/make_procurement.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import pooler
+import netsvc
+from osv import fields, osv
+
+import time
+
+class make_procurement(osv.osv_memory):
+    '''Wizard that create a procurement from a product form'''
+    
+    _name = 'make.procurement'
+    _description = 'Make Procurements'
+    
+    def onchange_product_id(self, cr, uid, ids, prod_id):
+        product = self.pool.get('product.product').browse(cr, uid, prod_id)
+        return {'value': {'uom_id': product.uom_id.id}}
+    
+    _columns = {
+        'qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=1),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+        'date_planned': fields.date('Planned Date', required=True),
+    }
+    
+    _defaults = {
+            'date_planned': lambda *args: time.strftime('%Y-%m-%d'),
+            'qty': lambda *args: 1.0,
+    }
+    
+    def make_procurement(self, cr, uid, ids, context=None):
+        '''Create procurement'''
+        for proc in self.browse(cr, uid, ids):
+            wh = self.pool.get('stock.warehouse').browse(cr, uid, proc.id, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            procure_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                'name':'INT:'+str(user.login),
+                'date_planned': proc.date_planned,
+                'product_id': proc.product_id.id,
+                'product_qty': proc.qty,
+                'product_uom': proc.uom_id.id,
+                'location_id': wh.lot_stock_id.id,
+                'procure_method':'make_to_order',
+            })
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
+        
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        
+        return {
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'mrp.procurement',
+                'res_id' : procure_id,
+                'views': [(id3,'form'),(id2,'tree')],
+                'type': 'ir.actions.act_window',
+        }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+
+        res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            product_id = self.pool.get('product.product').browse(cr, uid, record_id, context=context).id
+            res['product_id'] = product_id
+
+        return res
+
+make_procurement()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp/make_procurement.xml b/addons/mrp/make_procurement.xml
new file mode 100644
index 00000000000..fae3eab6f42
--- /dev/null
+++ b/addons/mrp/make_procurement.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!--  Make Procurement -->
+        
+		<record id="view_make_procurment_wizard" model="ir.ui.view">
+            <field name="name">Requisition Request</field>
+            <field name="model">make.procurement</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Requisition Request">
+				    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
+				    <field name="product_id" on_change="onchange_product_id(product_id)"/>
+				    <field name="qty"/>
+				    <field name="uom_id"/>
+				    <field name="date_planned"/>
+				    <field name="warehouse_id" colspan="4"/>
+				    <newline/>
+				    <group col="2" colspan="4">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="make_procurement" string="Ask New Products"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_make_procurement" model="ir.actions.act_window">
+            <field name="name">Requisition Request</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">make.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record model="ir.values" id="make_procurement_products">
+            <field name="model_id" ref="product.model_product_product" />
+            <field name="object" eval="1" />
+            <field name="name">Requisition Request</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_make_procurement'))" />
+            <field name="key">action</field>
+            <field name="model">product.product</field>
+        </record>
+		
+	</data>
+</openerp>	
\ No newline at end of file
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index cc9e4aa7114..852bc57bac9 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -24,12 +24,12 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard
-            string="Requisition Request"
-            model="product.product"
-            name="product.product.procurement"
-            keyword="client_action_multi"
-            id="product_procurement_wizard"/>
+<!--        <wizard-->
+<!--            string="Requisition Request"-->
+<!--            model="product.product"-->
+<!--            name="product.product.procurement"-->
+<!--            keyword="client_action_multi"-->
+<!--            id="product_procurement_wizard"/>-->
 
     </data>
 </openerp>
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 240f25daa9d..5ec6eae958a 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -26,7 +26,6 @@ import wizard_price
 import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
-import make_procurement
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
deleted file mode 100644
index 0cf12107181..00000000000
--- a/addons/mrp/wizard/make_procurement.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-import netsvc
-
-import time
-
-def _get_default(obj, cr, uid, data, context=None):
-    pool = pooler.get_pool(cr.dbname)
-    product = pool.get('product.product').browse(cr, uid, data['id'], context)
-    return {'product_id': product.id, 'uom_id':product.uom_id.id, 'qty':1.0}
-
-def make_procurement(obj, cr, uid, data, context=None):
-    '''Create procurement'''
-    pool = pooler.get_pool(cr.dbname)
-    wh = pool.get('stock.warehouse').browse(cr, uid, data['form']['warehouse_id'], context)
-    user = pool.get('res.users').browse(cr, uid, uid, context)
-    procure_id = pool.get('mrp.procurement').create(cr, uid, {
-        'name':'INT:'+str(user.login),
-        'date_planned':data['form']['date_planned'],
-        'product_id':data['form']['product_id'],
-        'product_qty':data['form']['qty'],
-        'product_uom':data['form']['uom_id'],
-        'location_id':wh.lot_stock_id.id,
-        'procure_method':'make_to_order',
-    }, context=context)
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
-    return {}
-
-
-class MakeProcurement(wizard.interface):
-    '''Wizard that create a procurement from a product form'''
-
-    done_form = """<?xml version="1.0"?>
-<form string="Make Requisition">
-    <label string="Your procurement request has been sent !"/>
-</form>"""
-    procurement_form = """<?xml version="1.0"?>
-<form string="Internal Requisition Request">
-    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
-    <field name="product_id"/>
-    <field name="warehouse_id"/>
-    <field name="qty"/>
-    <field name="uom_id"/>
-    <field name="date_planned"/>
-</form>"""
-    procurement_fields = {
-        'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
-        'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
-        'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
-        'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
-        'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
-    }
-
-    states = {
-        'init': {
-            'actions': [_get_default],
-            'result': {'type': 'form', 'arch': procurement_form, 'fields': procurement_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('create', 'Ask New Products')
-                ]
-            }
-        },
-        'done': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': done_form, 'fields': {},
-                'state': [
-                    ('end', 'Close'),
-                ]
-            }
-        },
-        'create': {
-            'actions': [],
-            'result': {'type': 'action', 'action': make_procurement, 'state': 'done'}
-        }
-    }
-
-MakeProcurement('product.product.procurement')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-