diff --git a/__unported__/base_optional_quick_create/AUTHORS.txt b/base_optional_quick_create/AUTHORS.txt
similarity index 100%
rename from __unported__/base_optional_quick_create/AUTHORS.txt
rename to base_optional_quick_create/AUTHORS.txt
diff --git a/__unported__/base_optional_quick_create/__init__.py b/base_optional_quick_create/__init__.py
similarity index 97%
rename from __unported__/base_optional_quick_create/__init__.py
rename to base_optional_quick_create/__init__.py
index 44563ef86..ed667c0f2 100644
--- a/__unported__/base_optional_quick_create/__init__.py
+++ b/base_optional_quick_create/__init__.py
@@ -17,4 +17,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import model
+
+from . import model
diff --git a/__unported__/base_optional_quick_create/__openerp__.py b/base_optional_quick_create/__openerp__.py
similarity index 86%
rename from __unported__/base_optional_quick_create/__openerp__.py
rename to base_optional_quick_create/__openerp__.py
index 81c33ab24..db86a4fc4 100644
--- a/__unported__/base_optional_quick_create/__openerp__.py
+++ b/base_optional_quick_create/__openerp__.py
@@ -24,10 +24,10 @@
     'category': 'Tools',
     'summary': "Avoid 'quick create' on m2o fields, on a 'by model' basis",
     'description': """
-This module allows to avoid to 'quick create' new records, through many2one
+This module allows to avoid to *quick create* new records, through many2one
 fields, for a specific model.
-You can configure which models should allow 'quick create'.
-When specified, the 'quick create' option will always open the standard create
+You can configure which models should allow *quick create*.
+When specified, the *quick create* option will always open the standard create
 form.
 
 Got the idea from https://twitter.com/nbessi/status/337869826028605441
@@ -40,8 +40,6 @@ Got the idea from https://twitter.com/nbessi/status/337869826028605441
         'model_view.xml',
     ],
     "demo": [],
-    'test': [
-    ],
-    "active": False,
+    'test': [],
     "installable": True
 }
diff --git a/__unported__/base_optional_quick_create/i18n/base_optional_quick_create.pot b/base_optional_quick_create/i18n/base_optional_quick_create.pot
similarity index 100%
rename from __unported__/base_optional_quick_create/i18n/base_optional_quick_create.pot
rename to base_optional_quick_create/i18n/base_optional_quick_create.pot
diff --git a/__unported__/base_optional_quick_create/i18n/fr.po b/base_optional_quick_create/i18n/fr.po
similarity index 100%
rename from __unported__/base_optional_quick_create/i18n/fr.po
rename to base_optional_quick_create/i18n/fr.po
diff --git a/__unported__/base_optional_quick_create/model.py b/base_optional_quick_create/model.py
similarity index 88%
rename from __unported__/base_optional_quick_create/model.py
rename to base_optional_quick_create/model.py
index 470659443..20345dadb 100644
--- a/__unported__/base_optional_quick_create/model.py
+++ b/base_optional_quick_create/model.py
@@ -24,7 +24,6 @@ from openerp.tools.translate import _
 
 
 class ir_model(orm.Model):
-
     _inherit = 'ir.model'
 
     _columns = {
@@ -33,7 +32,9 @@ class ir_model(orm.Model):
 
     def _wrap_name_create(self, old_create, model):
         def wrapper(cr, uid, name, context=None):
-            raise orm.except_orm(_('Error'), _("Can't create quickly. Opening create form"))
+            raise orm.except_orm(
+                _('Error'),
+                _("Can't create quickly. Opening create form"))
         return wrapper
 
     def _register_hook(self, cr, ids=None):
@@ -44,7 +45,8 @@ class ir_model(orm.Model):
                 model_name = model.model
                 model_obj = self.pool.get(model_name)
                 if not hasattr(model_obj, 'check_quick_create'):
-                    model_obj.name_create = self._wrap_name_create(model_obj.name_create, model_name)
+                    model_obj.name_create = self._wrap_name_create(
+                        model_obj.name_create, model_name)
                     model_obj.check_quick_create = True
         return True
 
@@ -56,6 +58,6 @@ class ir_model(orm.Model):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        super(ir_model, self).write(cr, uid, ids, vals, context=context)
+        res = super(ir_model, self).write(cr, uid, ids, vals, context=context)
         self._register_hook(cr, ids)
-        return True
+        return res
diff --git a/__unported__/base_optional_quick_create/model_view.xml b/base_optional_quick_create/model_view.xml
similarity index 87%
rename from __unported__/base_optional_quick_create/model_view.xml
rename to base_optional_quick_create/model_view.xml
index e1d11126b..f36877fed 100644
--- a/__unported__/base_optional_quick_create/model_view.xml
+++ b/base_optional_quick_create/model_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="base.view_model_form"></field>
             <field name="arch" type="xml">
                 <field name="osv_memory" position="after">
-                    <field name="avoid_quick_create"></field>
+                    <field name="avoid_quick_create"/>
                 </field>
             </field>
         </record>