[REF] mass_mailing: moved files in models/data/views directories.

bzr revid: tde@openerp.com-20140317143231-4jp3egoqvolenwxs

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
+import controllers

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,

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"/>