diff --git a/base_optional_quick_create/__init__.py b/base_optional_quick_create/__init__.py
index 44563ef86..f1abe793c 100644
--- a/base_optional_quick_create/__init__.py
+++ b/base_optional_quick_create/__init__.py
@@ -17,4 +17,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import model
+from . import model
diff --git a/cron_run_manually/__init__.py b/cron_run_manually/__init__.py
index 16e8b082f..9186ee3ad 100644
--- a/cron_run_manually/__init__.py
+++ b/cron_run_manually/__init__.py
@@ -1 +1 @@
-import model
+from . import model
diff --git a/cron_run_manually/model/__init__.py b/cron_run_manually/model/__init__.py
index 452b62ec4..911559262 100644
--- a/cron_run_manually/model/__init__.py
+++ b/cron_run_manually/model/__init__.py
@@ -1 +1 @@
-import ir_cron
+from . import ir_cron
diff --git a/disable_openerp_online/__init__.py b/disable_openerp_online/__init__.py
index 755cda011..991a0f0b3 100644
--- a/disable_openerp_online/__init__.py
+++ b/disable_openerp_online/__init__.py
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import model
+from . import model
 
 from openerp.tools.misc import upload_data_thread
 upload_data_thread.run = lambda x: None
diff --git a/email_template_template/__init__.py b/email_template_template/__init__.py
index 16e8b082f..9186ee3ad 100644
--- a/email_template_template/__init__.py
+++ b/email_template_template/__init__.py
@@ -1 +1 @@
-import model
+from . import model
diff --git a/email_template_template/model/__init__.py b/email_template_template/model/__init__.py
index 90f325845..8b0f2d803 100644
--- a/email_template_template/model/__init__.py
+++ b/email_template_template/model/__init__.py
@@ -18,4 +18,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import email_template
+from . import email_template
diff --git a/fetchmail_attach_from_folder/__init__.py b/fetchmail_attach_from_folder/__init__.py
index 1c91fe478..2567300b5 100644
--- a/fetchmail_attach_from_folder/__init__.py
+++ b/fetchmail_attach_from_folder/__init__.py
@@ -20,6 +20,6 @@
 #
 ##############################################################################
 
-import match_algorithm
-import model
-import wizard
+from . import match_algorithm
+from . import model
+from . import wizard
diff --git a/fetchmail_attach_from_folder/match_algorithm/__init__.py b/fetchmail_attach_from_folder/match_algorithm/__init__.py
index ff3610863..baa099c37 100644
--- a/fetchmail_attach_from_folder/match_algorithm/__init__.py
+++ b/fetchmail_attach_from_folder/match_algorithm/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import base
-import email_exact
-import email_domain
-import openerp_standard
+from . import base
+from . import email_exact
+from . import email_domain
+from . import openerp_standard
diff --git a/fetchmail_attach_from_folder/match_algorithm/email_domain.py b/fetchmail_attach_from_folder/match_algorithm/email_domain.py
index 11bbea64c..5c2e7bc3e 100644
--- a/fetchmail_attach_from_folder/match_algorithm/email_domain.py
+++ b/fetchmail_attach_from_folder/match_algorithm/email_domain.py
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-from email_exact import email_exact
+from . import email_exact
 
 
-class email_domain(email_exact):
+class email_domain(email_exact.email_exact):
     '''Search objects by domain name of email address.
     Beware of match_first here, this is most likely to get it wrong (gmail)'''
     name = 'Domain of email address'
diff --git a/fetchmail_attach_from_folder/match_algorithm/email_exact.py b/fetchmail_attach_from_folder/match_algorithm/email_exact.py
index b5686a183..56fd5bde2 100644
--- a/fetchmail_attach_from_folder/match_algorithm/email_exact.py
+++ b/fetchmail_attach_from_folder/match_algorithm/email_exact.py
@@ -20,12 +20,12 @@
 #
 ##############################################################################
 
-from base import base
+from . import base
 from openerp.tools.safe_eval import safe_eval
 from openerp.tools.mail import email_split
 
 
-class email_exact(base):
+class email_exact(base.base):
     '''Search for exactly the mailadress as noted in the email'''
 
     name = 'Exact mailadress'
diff --git a/fetchmail_attach_from_folder/match_algorithm/openerp_standard.py b/fetchmail_attach_from_folder/match_algorithm/openerp_standard.py
index 2fee96c34..d28a81e2f 100644
--- a/fetchmail_attach_from_folder/match_algorithm/openerp_standard.py
+++ b/fetchmail_attach_from_folder/match_algorithm/openerp_standard.py
@@ -20,10 +20,10 @@
 #
 ##############################################################################
 
-from base import base
+from . import base
 
 
-class openerp_standard(base):
+class openerp_standard(base.base):
     '''No search at all. Use OpenERP's standard mechanism to attach mails to
     mail.thread objects. Note that this algorithm always matches.'''
 
diff --git a/fetchmail_attach_from_folder/model/__init__.py b/fetchmail_attach_from_folder/model/__init__.py
index d7e030949..1073e5e38 100644
--- a/fetchmail_attach_from_folder/model/__init__.py
+++ b/fetchmail_attach_from_folder/model/__init__.py
@@ -20,5 +20,5 @@
 #
 ##############################################################################
 
-import fetchmail_server
-import fetchmail_server_folder
+from . import fetchmail_server
+from . import fetchmail_server_folder
diff --git a/mass_editing/__init__.py b/mass_editing/__init__.py
index aeb6c8ab5..720717c96 100644
--- a/mass_editing/__init__.py
+++ b/mass_editing/__init__.py
@@ -19,5 +19,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-import mass_editing
-import wizard
+from . import mass_editing
+from . import wizard
diff --git a/mass_editing/wizard/__init__.py b/mass_editing/wizard/__init__.py
index e7d7ce2dd..1ba984871 100644
--- a/mass_editing/wizard/__init__.py
+++ b/mass_editing/wizard/__init__.py
@@ -19,4 +19,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>
 #
 ##############################################################################
-import mass_editing_wizard
+from . import mass_editing_wizard
diff --git a/mass_editing/wizard/mass_editing_wizard.py b/mass_editing/wizard/mass_editing_wizard.py
index 64c668334..e45cc9ec4 100644
--- a/mass_editing/wizard/mass_editing_wizard.py
+++ b/mass_editing/wizard/mass_editing_wizard.py
@@ -111,7 +111,6 @@ class mass_editing_wizard(orm.TransientModel):
                         'size': field.size or 256}
                     etree.SubElement(xml_group, 'field', {
                         'name': "selection__" + field.name,
-                        'colspan': '2',
                         'colspan': '2'})
                     etree.SubElement(xml_group, 'field', {
                         'name': field.name, 'nolabel': '1',
diff --git a/super_calendar/__init__.py b/super_calendar/__init__.py
index 90402ead4..59f41d42f 100644
--- a/super_calendar/__init__.py
+++ b/super_calendar/__init__.py
@@ -18,4 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import super_calendar
+
+from . import super_calendar
diff --git a/tree_view_record_id/__init__.py b/tree_view_record_id/__init__.py
index f306fa695..ca3d0ce02 100644
--- a/tree_view_record_id/__init__.py
+++ b/tree_view_record_id/__init__.py
@@ -8,4 +8,4 @@
 #
 ##############################################################################
 
-import orm
+from . import orm
diff --git a/tree_view_record_id/orm.py b/tree_view_record_id/orm.py
index 66d34eae8..de24dd058 100644
--- a/tree_view_record_id/orm.py
+++ b/tree_view_record_id/orm.py
@@ -12,12 +12,9 @@ from openerp.osv import orm
 from lxml import etree
 import os
 
-""" procedural code is executed even if the module is not installed
-
-    TRY TO SWITCH to _register_hook() in the model to avoid
-    execution when not installed in V 8.0 version
-
-"""
+# procedural code is executed even if the module is not installed
+#    TRY TO SWITCH to _register_hook() in the model to avoid
+#    execution when not installed in V 8.0 version
 
 
 module_name = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
diff --git a/users_ldap_groups/__init__.py b/users_ldap_groups/__init__.py
index d359182a2..388abc2be 100644
--- a/users_ldap_groups/__init__.py
+++ b/users_ldap_groups/__init__.py
@@ -19,4 +19,5 @@
 #
 ##############################################################################
 
-import users_ldap_groups
+from . import users_ldap_groups
+from . import users_ldap_groups_operators
diff --git a/users_ldap_groups/users_ldap_groups.py b/users_ldap_groups/users_ldap_groups.py
index 3a30cec20..ff0ca32aa 100644
--- a/users_ldap_groups/users_ldap_groups.py
+++ b/users_ldap_groups/users_ldap_groups.py
@@ -19,11 +19,13 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, orm
 import logging
-import users_ldap_groups_operators
 import inspect
 
+from openerp.osv import fields, orm
+
+from . import users_ldap_groups_operators
+
 
 class CompanyLDAPGroupMapping(orm.Model):
     _name = 'res.company.ldap.group_mapping'
diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py
index a6d454183..1956c281a 100644
--- a/users_ldap_mail/__init__.py
+++ b/users_ldap_mail/__init__.py
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import users_ldap_model
+from . import users_ldap_model
diff --git a/users_ldap_populate/__init__.py b/users_ldap_populate/__init__.py
index 16e8b082f..9186ee3ad 100644
--- a/users_ldap_populate/__init__.py
+++ b/users_ldap_populate/__init__.py
@@ -1 +1 @@
-import model
+from . import model
diff --git a/users_ldap_populate/model/__init__.py b/users_ldap_populate/model/__init__.py
index 1fa6a8664..a925c6082 100644
--- a/users_ldap_populate/model/__init__.py
+++ b/users_ldap_populate/model/__init__.py
@@ -1,2 +1,2 @@
-import users_ldap
-import populate_wizard
+from . import users_ldap
+from . import populate_wizard