From 11a1c91c5593f7ce89f6965affcd021158f303ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Mar 2014 15:32:31 +0100
Subject: [PATCH] [REF] mass_mailing: moved files in models/data/views
 directories.

bzr revid: tde@openerp.com-20140317143231-4jp3egoqvolenwxs
---
 addons/mass_mailing/__init__.py               | 27 ++-----------------
 addons/mass_mailing/__openerp__.py            | 12 ++++-----
 addons/mass_mailing/{ => data}/mail_data.xml  |  0
 .../{ => data}/mass_mailing_data.xml          |  0
 .../{ => data}/mass_mailing_demo.xml          |  0
 .../{ => models}/email_template.py            |  0
 addons/mass_mailing/{ => models}/mail_mail.py |  0
 .../mass_mailing/{ => models}/mail_thread.py  |  0
 .../mass_mailing/{ => models}/mass_mailing.py |  0
 .../mass_mailing/{ => models}/res_config.py   |  0
 .../{ => views}/email_template.xml            |  0
 .../mass_mailing.xml}                         |  0
 .../res_config.xml}                           |  2 +-
 13 files changed, 9 insertions(+), 32 deletions(-)
 rename addons/mass_mailing/{ => data}/mail_data.xml (100%)
 rename addons/mass_mailing/{ => data}/mass_mailing_data.xml (100%)
 rename addons/mass_mailing/{ => data}/mass_mailing_demo.xml (100%)
 rename addons/mass_mailing/{ => models}/email_template.py (100%)
 rename addons/mass_mailing/{ => models}/mail_mail.py (100%)
 rename addons/mass_mailing/{ => models}/mail_thread.py (100%)
 rename addons/mass_mailing/{ => models}/mass_mailing.py (100%)
 rename addons/mass_mailing/{ => models}/res_config.py (100%)
 rename addons/mass_mailing/{ => views}/email_template.xml (100%)
 rename addons/mass_mailing/{mass_mailing_view.xml => views/mass_mailing.xml} (100%)
 rename addons/mass_mailing/{res_config_view.xml => views/res_config.xml} (89%)

diff --git a/addons/mass_mailing/__init__.py b/addons/mass_mailing/__init__.py
index b71d26831ac..175383c6644 100644
--- a/addons/mass_mailing/__init__.py
+++ b/addons/mass_mailing/__init__.py
@@ -1,28 +1,5 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-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 mass_mailing
-import mail_mail
-import mail_thread
-import email_template
-import res_config
+import models
 import wizard
-import controllers
\ No newline at end of file
+import controllers
diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index b21e25bc8ba..c311e846e69 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -38,13 +38,13 @@ professional emails and reuse templates in a few clicks.
         'web_kanban_sparkline',
     ],
     'data': [
-        'mail_data.xml',
-        'mass_mailing_data.xml',
+        'data/mail_data.xml',
+        'data/mass_mailing_data.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
-        'mass_mailing_view.xml',
-        'res_config_view.xml',
-        'email_template.xml',
+        'views/mass_mailing.xml',
+        'views/res_config.xml',
+        'views/email_template.xml',
         'security/ir.model.access.csv',
     ],
     'js': [
@@ -56,7 +56,7 @@ professional emails and reuse templates in a few clicks.
         'static/src/css/email_template.css'
     ],
     'demo': [
-        'mass_mailing_demo.xml',
+        'data/mass_mailing_demo.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mass_mailing/mail_data.xml b/addons/mass_mailing/data/mail_data.xml
similarity index 100%
rename from addons/mass_mailing/mail_data.xml
rename to addons/mass_mailing/data/mail_data.xml
diff --git a/addons/mass_mailing/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml
similarity index 100%
rename from addons/mass_mailing/mass_mailing_data.xml
rename to addons/mass_mailing/data/mass_mailing_data.xml
diff --git a/addons/mass_mailing/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
similarity index 100%
rename from addons/mass_mailing/mass_mailing_demo.xml
rename to addons/mass_mailing/data/mass_mailing_demo.xml
diff --git a/addons/mass_mailing/email_template.py b/addons/mass_mailing/models/email_template.py
similarity index 100%
rename from addons/mass_mailing/email_template.py
rename to addons/mass_mailing/models/email_template.py
diff --git a/addons/mass_mailing/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
similarity index 100%
rename from addons/mass_mailing/mail_mail.py
rename to addons/mass_mailing/models/mail_mail.py
diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/models/mail_thread.py
similarity index 100%
rename from addons/mass_mailing/mail_thread.py
rename to addons/mass_mailing/models/mail_thread.py
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
similarity index 100%
rename from addons/mass_mailing/mass_mailing.py
rename to addons/mass_mailing/models/mass_mailing.py
diff --git a/addons/mass_mailing/res_config.py b/addons/mass_mailing/models/res_config.py
similarity index 100%
rename from addons/mass_mailing/res_config.py
rename to addons/mass_mailing/models/res_config.py
diff --git a/addons/mass_mailing/email_template.xml b/addons/mass_mailing/views/email_template.xml
similarity index 100%
rename from addons/mass_mailing/email_template.xml
rename to addons/mass_mailing/views/email_template.xml
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/views/mass_mailing.xml
similarity index 100%
rename from addons/mass_mailing/mass_mailing_view.xml
rename to addons/mass_mailing/views/mass_mailing.xml
diff --git a/addons/mass_mailing/res_config_view.xml b/addons/mass_mailing/views/res_config.xml
similarity index 89%
rename from addons/mass_mailing/res_config_view.xml
rename to addons/mass_mailing/views/res_config.xml
index 5ebcdb1b3e2..0f61086e2cc 100644
--- a/addons/mass_mailing/res_config_view.xml
+++ b/addons/mass_mailing/views/res_config.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <record id="view_marketing_settings_mass_mailing" model="ir.ui.view">
+        <record id="view_marketing_configuration_mass_mailing" model="ir.ui.view">
             <field name="name">marketing.config.settings.mass.mailing</field>
             <field name="model">marketing.config.settings</field>
             <field name="inherit_id" ref="marketing.view_marketing_configuration"/>