diff --git a/base_delivery_carrier_label/__init__.py b/base_delivery_carrier_label/__init__.py
index 9b4296142f..408a6001bd 100644
--- a/base_delivery_carrier_label/__init__.py
+++ b/base_delivery_carrier_label/__init__.py
@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 from . import models
 from . import wizard
diff --git a/base_delivery_carrier_label/models/__init__.py b/base_delivery_carrier_label/models/__init__.py
index 5e9adce6c7..c27b39fa5d 100644
--- a/base_delivery_carrier_label/models/__init__.py
+++ b/base_delivery_carrier_label/models/__init__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from . import delivery_carrier
 from . import delivery_carrier_template_option
 from . import delivery_carrier_option
diff --git a/base_delivery_carrier_label/wizard/__init__.py b/base_delivery_carrier_label/wizard/__init__.py
index 08ad3fbaae..4ef403717e 100644
--- a/base_delivery_carrier_label/wizard/__init__.py
+++ b/base_delivery_carrier_label/wizard/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 from . import manifest_wizard
diff --git a/base_delivery_carrier_label/wizard/manifest_wizard.py b/base_delivery_carrier_label/wizard/manifest_wizard.py
index c9c11999c2..a0f969a7b5 100644
--- a/base_delivery_carrier_label/wizard/manifest_wizard.py
+++ b/base_delivery_carrier_label/wizard/manifest_wizard.py
@@ -1,23 +1,7 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2015 FactorLibre (http://www.factorlibre.com)
-#                  Ismael Calvo <ismael.calvo@factorlibre.com>
-#
-#    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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# © 2015 FactorLibre (http://www.factorlibre.com)
+#        Ismael Calvo <ismael.calvo@factorlibre.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from openerp import models, fields, api, exceptions, _
 
 
diff --git a/base_delivery_carrier_label/wizard/manifest_wizard_view.xml b/base_delivery_carrier_label/wizard/manifest_wizard_view.xml
index 401e3bc86d..0fefba2694 100644
--- a/base_delivery_carrier_label/wizard/manifest_wizard_view.xml
+++ b/base_delivery_carrier_label/wizard/manifest_wizard_view.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
         <record id="manifest_wizard_form" model="ir.ui.view">
             <field name="name">manifest.wizard.form</field>
             <field name="model">manifest.wizard</field>
@@ -46,5 +44,4 @@
             action="manifest_wizard_action" string="Manifest"
             parent="stock.menu_stock_warehouse_mgmt"/>
 
-    </data>
-</openerp>
\ No newline at end of file
+</odoo>