diff --git a/base_comment_template/README.rst b/base_comment_template/README.rst
index 5ca2bad4..05c00bba 100644
--- a/base_comment_template/README.rst
+++ b/base_comment_template/README.rst
@@ -1,5 +1,5 @@
 .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :target: https://www.gnu.org/licenses/agpl
    :alt: License: AGPL-3
 
 =======================
@@ -10,8 +10,8 @@ Add a new model to define templates of comments to print on
 documents.
 
 Two positions are available for the comments:
-- above document lines
-- below document lines
+* above document lines
+* below document lines
 
 This module is the base module for following modules:
 
@@ -19,13 +19,20 @@ This module is the base module for following modules:
 * purchase_comment_template
 * invoice_comment_template
 
-Credits
-=======
+Usage
+=====
 
-Images
-------
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/94/10.0
 
-* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/account-invoice-reporting/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
 
 Contributors
 ------------
@@ -33,6 +40,9 @@ Contributors
 * Nicolas Bessi <nicolas.bessi@camptocamp.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * Guewen Baconnier <guewen.baconnier@camptocamp.com>
+* Simone Rubino <simone.rubino@agilebg.com>
+
+Do not contact contributors directly about support or help with technical issues.
 
 Maintainer
 ----------
diff --git a/base_comment_template/__init__.py b/base_comment_template/__init__.py
index 9dd1c5c2..a77a6fcb 100644
--- a/base_comment_template/__init__.py
+++ b/base_comment_template/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 from . import models
diff --git a/base_comment_template/__manifest__.py b/base_comment_template/__manifest__.py
new file mode 100644
index 00000000..010b7fb8
--- /dev/null
+++ b/base_comment_template/__manifest__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# © 2013-2014 Nicolas Bessi (Camptocamp SA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{"name": "Base Comments Templates",
+ "summary": "Comments templates on documents",
+ "version": "10.0.1.0.0",
+ "depends": ["base"],
+ "author": "Camptocamp,Odoo Community Association (OCA)",
+ "license": "AGPL-3",
+ "data": ["views/comment_view.xml",
+          'security/ir.model.access.csv',
+          ],
+ "category": "Sale",
+ 'installable': True,
+ }
diff --git a/base_comment_template/__openerp__.py b/base_comment_template/__openerp__.py
deleted file mode 100644
index 8cf47bc0..00000000
--- a/base_comment_template/__openerp__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-# © 2013-2014 Nicolas Bessi (Camptocamp SA)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-{'name': 'Base Comments Templates',
- 'summary': 'Comments templates on documents',
- 'version': '9.0.1.0.0',
- 'license': 'AGPL-3',
- 'depends': ['base', ],
- 'author': 'Camptocamp,Odoo Community Association (OCA)',
- 'data': ['views/comment.xml',
-          'security/ir.model.access.csv',
-          ],
- 'category': 'Sale',
- 'installable': True, }
diff --git a/base_comment_template/models/__init__.py b/base_comment_template/models/__init__.py
index 72bf49f6..5cfb0332 100644
--- a/base_comment_template/models/__init__.py
+++ b/base_comment_template/models/__init__.py
@@ -1,2 +1,6 @@
 # -*- coding: utf-8 -*-
+# Copyright 2014 Guewen Baconnier (Camptocamp SA)
+# Copyright 2013-2014 Nicolas Bessi (Camptocamp SA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 from . import comment
diff --git a/base_comment_template/models/comment.py b/base_comment_template/models/comment.py
index 79032e12..3b4ae986 100644
--- a/base_comment_template/models/comment.py
+++ b/base_comment_template/models/comment.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
-# © 2013-2014 Nicolas Bessi (Camptocamp SA)
+# Copyright 2014 Guewen Baconnier (Camptocamp SA)
+# Copyright 2013-2014 Nicolas Bessi (Camptocamp SA)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-from openerp import models, fields, api
+
+from odoo import models, fields, api
 
 
 class BaseCommentTemplate(models.Model):
diff --git a/base_comment_template/views/comment.xml b/base_comment_template/views/comment_view.xml
similarity index 97%
rename from base_comment_template/views/comment.xml
rename to base_comment_template/views/comment_view.xml
index 5a6cbd6c..febb9abb 100644
--- a/base_comment_template/views/comment.xml
+++ b/base_comment_template/views/comment_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-  <data>
+<odoo>
+
     <record model="ir.ui.view" id="view_base_comment_template_search">
       <field name="name">base.comment.template.search</field>
       <field name="model">base.comment.template</field>
@@ -47,5 +47,4 @@
       <field name="view_id" ref="view_base_comment_template_tree"/>
     </record>
 
-  </data>
-</openerp>
+</odoo>