diff --git a/base_partner_merge/__init__.py b/base_partner_merge/__init__.py
index c5e9160c3..65c9179ec 100644
--- a/base_partner_merge/__init__.py
+++ b/base_partner_merge/__init__.py
@@ -1,2 +1 @@
import base_partner_merge
-import wizard
diff --git a/base_partner_merge/__openerp__.py b/base_partner_merge/__openerp__.py
index e583c9aa1..d310b8976 100644
--- a/base_partner_merge/__openerp__.py
+++ b/base_partner_merge/__openerp__.py
@@ -6,7 +6,6 @@
'description': """backport module, to be removed when we switch to saas2 on the private servers""",
'depends': [
'base',
- 'portal',
],
'data': [
'security/ir.model.access.csv',
diff --git a/portal_partner_merge/__init__.py b/portal_partner_merge/__init__.py
new file mode 100644
index 000000000..ba6a8ecaf
--- /dev/null
+++ b/portal_partner_merge/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Author: Yannick Vaucher
+# Copyright 2013 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 .
+#
+##############################################################################
+from . import wizard
diff --git a/portal_partner_merge/__openerp__.py b/portal_partner_merge/__openerp__.py
new file mode 100644
index 000000000..dad38863a
--- /dev/null
+++ b/portal_partner_merge/__openerp__.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Author: Yannick Vaucher
+# Copyright 2013 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 .
+#
+##############################################################################
+{'name' : 'Portal Partner Merge',
+ 'version' : '1.0',
+ 'category': 'Hidden',
+ 'description': """
+Link module for base_partner_merge which extract portal dependency
+ """,
+ 'author' : 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'website': 'http://www.camptocamp.com/',
+ 'depends' : ['portal', 'base_partner_merge'],
+ 'data': [],
+ 'test': [],
+ 'installable': True,
+ 'auto_install': True,
+ 'application': False,
+ }
diff --git a/base_partner_merge/wizard/__init__.py b/portal_partner_merge/wizard/__init__.py
similarity index 97%
rename from base_partner_merge/wizard/__init__.py
rename to portal_partner_merge/wizard/__init__.py
index ce2abe2d0..4345b14d9 100644
--- a/base_partner_merge/wizard/__init__.py
+++ b/portal_partner_merge/wizard/__init__.py
@@ -20,7 +20,7 @@
##############################################################################
-import portal_wizard
+from . import portal_wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/base_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py
similarity index 76%
rename from base_partner_merge/wizard/portal_wizard.py
rename to portal_partner_merge/wizard/portal_wizard.py
index 319affc45..fceb42e4f 100644
--- a/base_partner_merge/wizard/portal_wizard.py
+++ b/portal_partner_merge/wizard/portal_wizard.py
@@ -26,10 +26,14 @@ class wizard_user(osv.TransientModel):
_inherit = 'portal.wizard.user'
def get_error_messages(self, cr, uid, ids, context=None):
- error_msg = super(wizard_user, self).get_error_messages(cr, uid, ids, context)
+ error_msg = super(wizard_user, self
+ ).get_error_messages(cr, uid, ids, context=context)
if error_msg:
- error_msg[-1] = '%s\n%s' % (error_msg[-1], _("- Merge existing contacts together using the Automatic Merge wizard, "
- "available in the More menu after selecting several contacts in the Customers list"))
+ error_msg[-1] = '%s\n%s' % (
+ error_msg[-1],
+ _("- Merge existing contacts together using the Automatic "
+ "Merge wizard, available in the More menu after selecting "
+ "several contacts in the Customers list"))
return error_msg
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: