OCA · leNeo · Aug 24, 2016 · Aug 24, 2016 · Aug 24, 2016 · Aug 24, 2016
diff --git a/base_comment_template/README.rst b/base_comment_template/README.rst
@@ -1,11 +1,15 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=======================
 Base Comments Templates
 =======================
 
 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
 
@@ -15,9 +19,32 @@ This module is the base module for following modules:
 * purchase_comment_template
 * invoice_comment_template
 
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
 Contributors
 ------------
 
 * Nicolas Bessi <nicolas.bessi@camptocamp.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
 * Guewen Baconnier <guewen.baconnier@camptocamp.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/base_comment_template/__init__.py b/base_comment_template/__init__.py
@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
-from . import comment
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import models
diff --git a/base_comment_template/__openerp__.py b/base_comment_template/__openerp__.py
@@ -1,31 +1,14 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi
-#    Copyright 2013-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
-#    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/>.
-#
-#
-{"name": "Base Comments Templates",
- "summary": "Comments templates on documents",
- "version": "8.0.1.0.0",
- "depends": ["base"],
- "author": "Camptocamp,Odoo Community Association (OCA)",
- "data": ["comment_view.xml",
+# © 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': ['data/comment_view.xml',
           'security/ir.model.access.csv',
           ],
- "category": "Sale",
- 'installable': False,
- "active": False, }
+ 'category': 'Sale',
+ 'installable': True, }
diff --git a/base_comment_template/comment_view.xml → base_comment_template/data/comment_view.xml b/base_comment_template/comment_view.xml → base_comment_template/data/comment_view.xml
diff --git a/base_comment_template/models/__init__.py b/base_comment_template/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import comment
diff --git a/base_comment_template/comment.py → base_comment_template/models/comment.py b/base_comment_template/comment.py → base_comment_template/models/comment.py
@@ -1,23 +1,6 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi
-#    Copyright 2013-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
-#    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/>.
-#
-#
+# © 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
 
 

diff --git a/invoice_comment_template/__openerp__.py b/invoice_comment_template/__openerp__.py
@@ -1,37 +1,19 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 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
-#    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/>.
-#
-##############################################################################
-
+# © 2014 Guewen Baconnier (Camptocamp SA)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {'name': 'Invoice Comments',
  'summary': 'Comments templates on invoice documents',
- 'version': '8.0.1.0.0',
+ 'version': '9.0.1.0.0',
+ 'license': 'AGPL-3',
  'depends': ['account',
              'base_comment_template',
              ],
  'author': "Camptocamp,Odoo Community Association (OCA)",
- 'data': ['account_invoice_view.xml',
-          'base_comment_template_view.xml',
+ 'data': ['data/account_invoice_view.xml',
+          'data/base_comment_template_view.xml',
           'security/ir.model.access.csv',
           'views/report_invoice.xml',
           ],
  'category': 'Sale',
- 'installable': False,
- 'active': False,
+ 'installable': True,
  }
diff --git a/...comment_template/account_invoice_view.xml → ...nt_template/data/account_invoice_view.xml b/...comment_template/account_invoice_view.xml → ...nt_template/data/account_invoice_view.xml
@@ -6,7 +6,7 @@
       <field name="inherit_id" ref="account.invoice_form"/>
       <field name="arch" type="xml">
 
-        <xpath expr="/form/sheet/notebook/page[3]" position="after">
+        <xpath expr="/form/sheet[1]/notebook[1]/page[2]" position="after">
           <page string="Comments" name="comments">
             <label string="The comments will be displayed on the printed document. You can load a predefined template, write your own text or load a template and then modify it only for this document." colspan="2"/>
             <group string="Top Comments">

diff --git a/...t_template/base_comment_template_view.xml → ...plate/data/base_comment_template_view.xml b/...t_template/base_comment_template_view.xml → ...plate/data/base_comment_template_view.xml
@@ -4,6 +4,6 @@
     <menuitem name="Document Comments"
       id="menu_base_comment_template_invoice"
       action="base_comment_template.action_base_comment_template"
-      parent="account.menu_configuration_misc"/>
+      parent="account.menu_finance_configuration"/>
   </data>
 </openerp>