[MOV] mail: moved files according to the new module organization

36 files changed, 39 insertions, 95 deletions

diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 8ba5c95fd4e..175383c6644 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -1,40 +1,5 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009-Today OpenERP SA (<http://www.openerp.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/>.
-#
-##############################################################################
 
-import ir_attachment
-import mail_message_subtype
-import mail_alias
-import mail_followers
-import mail_message
-import mail_mail
-import mail_thread
-import mail_group
-import mail_template
-import res_partner
-import res_users
-import report
+import models
 import wizard
-import res_config
-import mail_group_menu
-import update
 import controllers
-import ir_actions
-import html2text
\ No newline at end of file
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 02167ff87c5..ba1a7bc7a51 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -1,23 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP S.A. (<http://www.openerp.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/>.
-#
-##############################################################################
 
 {
     'name': 'Social Network',
@@ -35,7 +16,7 @@ It enables the users to read and send messages as well as emails. It also provid
 
 Main Features
 -------------
-* Clean and renewed communication history for any OpenERP document that can act as a discussion topic
+* Clean and renewed communication history for any Odoo document that can act as a discussion topic
 * Subscription mechanism to be updated about new messages on interesting documents
 * Unified feeds page to see recent messages and activity on followed documents
 * User communication through the feeds page
@@ -43,35 +24,35 @@ Main Features
 * Relies on the global outgoing mail server - an integrated email management system - allowing to send emails with a configurable scheduler-based processing engine
 * Includes an extensible generic email composition assistant, that can turn into a mass-mailing assistant and is capable of interpreting simple *placeholder expressions* that will be replaced with dynamic data when each email is actually sent.
     """,
-    'author': 'OpenERP SA',
+    'author': 'Odoo SA',
     'website': 'https://www.odoo.com/page/enterprise-social-network',
     'depends': ['base', 'base_setup'],
     'data': [
         'wizard/invite_view.xml',
         'wizard/mail_compose_message_view.xml',
-        'mail_message_subtype.xml',
-        'mail_message_view.xml',
-        'mail_mail_view.xml',
-        'mail_followers_view.xml',
-        'mail_thread_view.xml',
-        'mail_group_view.xml',
-        'res_config_view.xml',
+        'views/mail_message_subtype_views.xml',
+        'views/mail_message_views.xml',
+        'views/mail_mail_views.xml',
+        'views/mail_followers_views.xml',
+        'views/mail_thread_views.xml',
+        'views/mail_group_views.xml',
+        'views/res_config_views.xml',
         'data/mail_data.xml',
         'data/mail_group_data.xml',
         'security/mail_security.xml',
         'security/ir.model.access.csv',
-        'mail_alias_view.xml',
-        'res_users_view.xml',
-        'views/mail.xml',
+        'views/mail_alias_views.xml',
+        'views/res_users_views.xml',
+        'views/mail_templates.xml',
         'wizard/email_template_preview_view.xml',
-        'views/email_template_view.xml',
-        'views/ir_actions_view.xml',
-        'views/res_partner_view.xml',
-        'contacts_view.xml',
+        'views/mail_template_views.xml',
+        'views/ir_actions_views.xml',
+        'views/res_partner_views.xml',
+        'views/contact_views.xml',
     ],
     'demo': [
         'data/mail_demo.xml',
-        'data/mail_group_demo_data.xml',
+        'data/mail_group_demo.xml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo.xml
index 1237fcaea4f..1237fcaea4f 100644
--- a/addons/mail/data/mail_group_demo_data.xml
+++ b/addons/mail/data/mail_group_demo.xml
diff --git a/addons/mail/models/__init__.py b/addons/mail/models/__init__.py
new file mode 100644
index 00000000000..92048d992ed
--- /dev/null
+++ b/addons/mail/models/__init__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+import ir_attachment
+import mail_message_subtype
+import mail_alias
+import mail_followers
+import mail_message
+import mail_mail
+import mail_thread
+import mail_group
+import mail_template
+import res_partner
+import res_users
+import res_config
+import ir_ui_menu
+import update
+import ir_actions
+import html2text
\ No newline at end of file
diff --git a/addons/mail/html2text.py b/addons/mail/models/html2text.py
index c4c8fdb21fa..c4c8fdb21fa 100755
--- a/addons/mail/html2text.py
+++ b/addons/mail/models/html2text.py
diff --git a/addons/mail/ir_actions.py b/addons/mail/models/ir_actions.py
index a4b78fec42a..a4b78fec42a 100644
--- a/addons/mail/ir_actions.py
+++ b/addons/mail/models/ir_actions.py
diff --git a/addons/mail/ir_attachment.py b/addons/mail/models/ir_attachment.py
index e40f94c9974..e40f94c9974 100644
--- a/addons/mail/ir_attachment.py
+++ b/addons/mail/models/ir_attachment.py
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/models/ir_ui_menu.py
index 68a4e644c87..68a4e644c87 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/models/ir_ui_menu.py
diff --git a/addons/mail/mail_alias.py b/addons/mail/models/mail_alias.py
index 3136174a657..3136174a657 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/models/mail_alias.py
diff --git a/addons/mail/mail_followers.py b/addons/mail/models/mail_followers.py
index 441caadbccc..441caadbccc 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/models/mail_followers.py
diff --git a/addons/mail/mail_group.py b/addons/mail/models/mail_group.py
index f337aa97c37..f337aa97c37 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/models/mail_group.py
diff --git a/addons/mail/mail_mail.py b/addons/mail/models/mail_mail.py
index c7576252f3f..c7576252f3f 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/models/mail_mail.py
diff --git a/addons/mail/mail_message.py b/addons/mail/models/mail_message.py
index 14c23e78862..14c23e78862 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/models/mail_message.py
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/models/mail_message_subtype.py
index 26faa0a3e12..26faa0a3e12 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/models/mail_message_subtype.py
diff --git a/addons/mail/mail_template.py b/addons/mail/models/mail_template.py
index 3b654d6ec5c..3b654d6ec5c 100644
--- a/addons/mail/mail_template.py
+++ b/addons/mail/models/mail_template.py
diff --git a/addons/mail/mail_thread.py b/addons/mail/models/mail_thread.py
index 99bc1f41bcc..f3ca4ba4ad7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -23,7 +23,7 @@ from urllib import urlencode
 from openerp import _, api, fields, models, SUPERUSER_ID
 from openerp import exceptions
 from openerp import tools
-from openerp.addons.mail.mail_message import decode
+from openerp.addons.mail.models.mail_message import decode
 from openerp.tools.safe_eval import safe_eval as eval
 
 
diff --git a/addons/mail/res_config.py b/addons/mail/models/res_config.py
index 4a608fd1aef..4a608fd1aef 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/models/res_config.py
diff --git a/addons/mail/res_partner.py b/addons/mail/models/res_partner.py
index 3d2e5ad6886..3d2e5ad6886 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/models/res_partner.py
diff --git a/addons/mail/res_users.py b/addons/mail/models/res_users.py
index 4d979162534..4d979162534 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/models/res_users.py
diff --git a/addons/mail/update.py b/addons/mail/models/update.py
index 92ea8440fde..92ea8440fde 100644
--- a/addons/mail/update.py
+++ b/addons/mail/models/update.py
diff --git a/addons/mail/report/__init__.py b/addons/mail/report/__init__.py
deleted file mode 100644
index d69f04e2253..00000000000
--- a/addons/mail/report/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2009-Today OpenERP SA (<http://www.openerp.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/>.
-#
-##############################################################################
diff --git a/addons/mail/contacts_view.xml b/addons/mail/views/contact_views.xml
index 17f866d054f..17f866d054f 100644
--- a/addons/mail/contacts_view.xml
+++ b/addons/mail/views/contact_views.xml
diff --git a/addons/mail/views/ir_actions_view.xml b/addons/mail/views/ir_actions_views.xml
index 8f5875257aa..8f5875257aa 100644
--- a/addons/mail/views/ir_actions_view.xml
+++ b/addons/mail/views/ir_actions_views.xml
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/views/mail_alias_views.xml
index c4d1e67dd37..c4d1e67dd37 100644
--- a/addons/mail/mail_alias_view.xml
+++ b/addons/mail/views/mail_alias_views.xml
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/views/mail_followers_views.xml
index a222dad374b..a222dad374b 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/views/mail_followers_views.xml
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/views/mail_group_views.xml
index edd008e52d0..edd008e52d0 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/views/mail_group_views.xml
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/views/mail_mail_views.xml
index 9151d916319..9151d916319 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/views/mail_mail_views.xml
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/views/mail_message_subtype_views.xml
index 8b7856bea22..8b7856bea22 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/views/mail_message_subtype_views.xml
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/views/mail_message_views.xml
index ec19d622553..ec19d622553 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/views/mail_message_views.xml
diff --git a/addons/mail/views/email_template_view.xml b/addons/mail/views/mail_template_views.xml
index 4eada82f810..4eada82f810 100644
--- a/addons/mail/views/email_template_view.xml
+++ b/addons/mail/views/mail_template_views.xml
diff --git a/addons/mail/views/mail.xml b/addons/mail/views/mail_templates.xml
index a8ddba4c93a..a8ddba4c93a 100644
--- a/addons/mail/views/mail.xml
+++ b/addons/mail/views/mail_templates.xml
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/views/mail_thread_views.xml
index f4a3e3815d6..f4a3e3815d6 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/views/mail_thread_views.xml
diff --git a/addons/mail/res_config_view.xml b/addons/mail/views/res_config_views.xml
index 441f42b5a43..441f42b5a43 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/views/res_config_views.xml
diff --git a/addons/mail/views/res_partner_view.xml b/addons/mail/views/res_partner_views.xml
index 97942b5561a..97942b5561a 100644
--- a/addons/mail/views/res_partner_view.xml
+++ b/addons/mail/views/res_partner_views.xml
diff --git a/addons/mail/res_users_view.xml b/addons/mail/views/res_users_views.xml
index 7bbe369c4d7..7bbe369c4d7 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/views/res_users_views.xml
diff --git a/addons/mass_mailing/models/mail_thread.py b/addons/mass_mailing/models/mail_thread.py
index e4732527f2d..78d608e9bed 100644
--- a/addons/mass_mailing/models/mail_thread.py
+++ b/addons/mass_mailing/models/mail_thread.py
@@ -22,8 +22,8 @@
 import logging
 import re
 
-from openerp.addons.mail.mail_message import decode
-from openerp.addons.mail.mail_thread import decode_header
+from openerp.addons.mail.models.mail_message import decode
+from openerp.addons.mail.models.mail_thread import decode_header
 from openerp.osv import osv
 
 _logger = logging.getLogger(__name__)