diff --git a/base_optional_quick_create/__init__.py b/base_optional_quick_create/__init__.py
index 44563ef..ed667c0 100644
--- a/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/base_optional_quick_create/__openerp__.py b/base_optional_quick_create/__openerp__.py
index 24c08b0..5693ee1 100644
--- a/base_optional_quick_create/__openerp__.py
+++ b/base_optional_quick_create/__openerp__.py
@@ -20,16 +20,19 @@
 
 {
     'name': "Optional quick create",
-    'version': '0.1',
+    'version': '8.0.0.1.0',
     '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 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 form.
+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
+form.
 
 Got the idea from https://twitter.com/nbessi/status/337869826028605441
 """,
-    'author': 'Agile Business Group',
+    'author': "Agile Business Group,Odoo Community Association (OCA)",
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
     "depends": ['base'],
@@ -37,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/base_optional_quick_create/i18n/base_optional_quick_create.pot b/base_optional_quick_create/i18n/base_optional_quick_create.pot
new file mode 100644
index 0000000..222dc31
--- /dev/null
+++ b/base_optional_quick_create/i18n/base_optional_quick_create.pot
@@ -0,0 +1,40 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_optional_quick_create
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-14 17:41+0000\n"
+"PO-Revision-Date: 2014-03-14 17:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_optional_quick_create
+#: model:_description:0
+#: model:ir.model,name:base_optional_quick_create.model_ir_model
+msgid "Models"
+msgstr ""
+
+#. module: base_optional_quick_create
+#: code:addons/base_optional_quick_create/model.py:35
+#, python-format
+msgid "Can't create quickly. Opening create form"
+msgstr ""
+
+#. module: base_optional_quick_create
+#: field:ir.model,avoid_quick_create:0
+msgid "Avoid quick create"
+msgstr ""
+
+#. module: base_optional_quick_create
+#: code:addons/base_optional_quick_create/model.py:35
+#, python-format
+msgid "Error"
+msgstr ""
+
diff --git a/base_optional_quick_create/model.py b/base_optional_quick_create/model.py
index fc15593..20345da 100644
--- a/base_optional_quick_create/model.py
+++ b/base_optional_quick_create/model.py
@@ -22,17 +22,19 @@ from openerp.osv import orm, fields
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
 
-class ir_model(orm.Model):
 
+class ir_model(orm.Model):
     _inherit = 'ir.model'
-    
+
     _columns = {
         'avoid_quick_create': fields.boolean('Avoid quick create'),
         }
 
     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):
@@ -43,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
 
@@ -55,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/base_optional_quick_create/model_view.xml b/base_optional_quick_create/model_view.xml
index e1d1112..f36877f 100644
--- a/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>
diff --git a/base_optional_quick_create/static/description/icon.png b/base_optional_quick_create/static/description/icon.png
new file mode 100644
index 0000000..3a0328b
Binary files /dev/null and b/base_optional_quick_create/static/description/icon.png differ