diff --git a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/__openerp__.py b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/__openerp__.py
index 9eeff46c0..9245152c6 100644
--- a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/__openerp__.py
+++ b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Yannick Vaucher (Camptocamp)
-#    Copyright 2012 Camptocamp SA
+#    Author: Yannick Vaucher, Matthieu Dietrich (Camptocamp)
+#    Copyright 2012-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,22 +22,19 @@
 {'name': 'Configuration of order point in mass',
  'version': '1.0',
  'author': 'Camptocamp',
- 'maintainer': 'Camptocamp',
  'category': 'Warehouse',
+ 'license': 'AGPL-3',
  'complexity': 'easy', #easy, normal, expert
+ 'website': "http://www.camptocamp.com",
  'depends': ['procurement'],
  'description': """
 Add a wizard to configure massively order points for multiple product""",
  'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': ["wizard/orderpoint_creator_view.xml", "security/ir.model.access.csv"],
- 'demo_xml': [],
+ 'demo': [],
+ 'data': ["wizard/orderpoint_creator_view.xml", "security/ir.model.access.csv"],
  'test': [],
- 'installable': False,
- 'images': [],
+ 'installable': True,
  'auto_install': False,
- 'license': 'AGPL-3',
- 'active': False,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/orderpoint_template.py b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/orderpoint_template.py
index 2de2e6e76..5259668e4 100644
--- a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/orderpoint_template.py
+++ b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/orderpoint_template.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Yannick Vaucher (Camptocamp)
-#    Copyright 2012 Camptocamp SA
+#    Author: Yannick Vaucher, Matthieu Dietrich (Camptocamp)
+#    Copyright 2012-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -32,15 +32,6 @@ class OrderpointTemplate(BaseProductConfigTemplate, Model):
     _table = 'stock_warehouse_orderpoint_template'
     _clean_mode = 'deactivate'
 
-
-    _columns = {
-        'product_id': fields.many2one('product.product',
-                                      'Product',
-                                      required=False,
-                                      ondelete='cascade',
-                                      domain=[('type','=','product')]),
-    }
-
     def _get_ids_2_clean(self, cursor, uid, template_br, product_ids, context=None):
         """ hook to select model specific objects to clean
         return must return a list of id"""
diff --git a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/wizard/orderpoint_creator_view.xml b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/wizard/orderpoint_creator_view.xml
index efa42ece6..8ca225b33 100644
--- a/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/wizard/orderpoint_creator_view.xml
+++ b/__unported__/stock_orderpoint_creator/stock_orderpoint_creator/wizard/orderpoint_creator_view.xml
@@ -7,7 +7,7 @@
             <field name="model">stock.warehouse.orderpoint.creator</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form string="Product warehouse config">
                     <group string="templates" colspan="4">
                         <field name="orderpoint_template_id" colspan="4"/>
                     </group>