From 2b4eeb908f10b9045a5d11eec956ee2c6bae4af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Wed, 8 Feb 2017 16:03:00 +0100
Subject: [PATCH] [MOV] portal,website_portal: move wizard and tests into
 website_portal

The goal is to prepare the removal of
'portal' module.

Converting a partner into a portal user,
though the wizard is moved in website_portal.

'base' will manage portal user and group, but if
website_portal is not installed, there is nothing
to display for portal user.
---
 addons/portal/__init__.py                                   | 1 -
 addons/portal/__manifest__.py                               | 1 -
 addons/portal/tests/__init__.py                             | 4 ----
 addons/website_portal/__init__.py                           | 1 +
 addons/website_portal/__manifest__.py                       | 1 +
 addons/website_portal/tests/__init__.py                     | 6 +++++-
 addons/{portal => website_portal}/tests/test_portal.py      | 0
 addons/{portal => website_portal}/wizard/__init__.py        | 0
 addons/{portal => website_portal}/wizard/portal_wizard.py   | 0
 .../wizard/portal_wizard_views.xml                          | 0
 10 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 addons/portal/tests/__init__.py
 rename addons/{portal => website_portal}/tests/test_portal.py (100%)
 rename addons/{portal => website_portal}/wizard/__init__.py (100%)
 rename addons/{portal => website_portal}/wizard/portal_wizard.py (100%)
 rename addons/{portal => website_portal}/wizard/portal_wizard_views.xml (100%)

diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 11529f98733..81fc81d29c9 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import models
-import wizard
diff --git a/addons/portal/__manifest__.py b/addons/portal/__manifest__.py
index 54ebe066a34..04627a30aea 100644
--- a/addons/portal/__manifest__.py
+++ b/addons/portal/__manifest__.py
@@ -24,7 +24,6 @@ very handy when used in combination with the module 'share'.
     'data': [
         'data/portal_data.xml',
         'views/portal_views.xml',
-        'wizard/portal_wizard_views.xml',
         'security/ir.model.access.csv',
     ],
     'demo': ['data/portal_demo.xml'],
diff --git a/addons/portal/tests/__init__.py b/addons/portal/tests/__init__.py
deleted file mode 100644
index 3cc7401124d..00000000000
--- a/addons/portal/tests/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import test_portal
diff --git a/addons/website_portal/__init__.py b/addons/website_portal/__init__.py
index bf7fb7b45c1..dd6445ec471 100644
--- a/addons/website_portal/__init__.py
+++ b/addons/website_portal/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import controllers
+import wizard
diff --git a/addons/website_portal/__manifest__.py b/addons/website_portal/__manifest__.py
index 421def25ac0..e8a3f4f310c 100644
--- a/addons/website_portal/__manifest__.py
+++ b/addons/website_portal/__manifest__.py
@@ -14,5 +14,6 @@ Allows your customers to manage their account from a beautiful web interface.
     ],
     'data': [
         'views/website_portal_templates.xml',
+        'wizard/portal_wizard_views.xml',
     ],
 }
diff --git a/addons/website_portal/tests/__init__.py b/addons/website_portal/tests/__init__.py
index a2e745ce861..a2fdc8ff2cf 100644
--- a/addons/website_portal/tests/__init__.py
+++ b/addons/website_portal/tests/__init__.py
@@ -1 +1,5 @@
-import test_load_process
\ No newline at end of file
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import test_load_process
+import test_portal
diff --git a/addons/portal/tests/test_portal.py b/addons/website_portal/tests/test_portal.py
similarity index 100%
rename from addons/portal/tests/test_portal.py
rename to addons/website_portal/tests/test_portal.py
diff --git a/addons/portal/wizard/__init__.py b/addons/website_portal/wizard/__init__.py
similarity index 100%
rename from addons/portal/wizard/__init__.py
rename to addons/website_portal/wizard/__init__.py
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/website_portal/wizard/portal_wizard.py
similarity index 100%
rename from addons/portal/wizard/portal_wizard.py
rename to addons/website_portal/wizard/portal_wizard.py
diff --git a/addons/portal/wizard/portal_wizard_views.xml b/addons/website_portal/wizard/portal_wizard_views.xml
similarity index 100%
rename from addons/portal/wizard/portal_wizard_views.xml
rename to addons/website_portal/wizard/portal_wizard_views.xml