From ba3eaa61ba9d8a1d60e1a1f5bea614a9c9a762d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Thu, 7 Jul 2016 16:22:01 +0200
Subject: [MOV] survey_crm: module directory organization

---
 addons/survey_crm/__init__.py                |  2 +-
 addons/survey_crm/__openerp__.py             |  4 +---
 addons/survey_crm/crm_view.xml               | 18 ------------------
 addons/survey_crm/models/__init__.py         |  4 ++++
 addons/survey_crm/models/survey.py           | 25 +++++++++++++++++++++++++
 addons/survey_crm/survey.py                  | 25 -------------------------
 addons/survey_crm/views/survey_crm_views.xml | 18 ++++++++++++++++++
 7 files changed, 49 insertions(+), 47 deletions(-)
 delete mode 100644 addons/survey_crm/crm_view.xml
 create mode 100644 addons/survey_crm/models/__init__.py
 create mode 100644 addons/survey_crm/models/survey.py
 delete mode 100644 addons/survey_crm/survey.py
 create mode 100644 addons/survey_crm/views/survey_crm_views.xml

diff --git a/addons/survey_crm/__init__.py b/addons/survey_crm/__init__.py
index 0a274c37955..81fc81d29c9 100644
--- a/addons/survey_crm/__init__.py
+++ b/addons/survey_crm/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import survey
+import models
diff --git a/addons/survey_crm/__openerp__.py b/addons/survey_crm/__openerp__.py
index 62938fd0e2e..845bb9e3c33 100644
--- a/addons/survey_crm/__openerp__.py
+++ b/addons/survey_crm/__openerp__.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-
 {
     'name': 'Survey CRM',
     'version': '2.0',
@@ -15,7 +13,7 @@ This module adds a Survey mass mailing button inside the more option of lead/cus
 """,
     'depends': ['crm', 'survey'],
     'data': [
-        'crm_view.xml',
+        'views/survey_crm_views.xml',
     ],
     'installable': True,
     'auto_install': True
diff --git a/addons/survey_crm/crm_view.xml b/addons/survey_crm/crm_view.xml
deleted file mode 100644
index d28840643f6..00000000000
--- a/addons/survey_crm/crm_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Partner Survey Mailing"
-                res_model="survey.mail.compose.message"
-                src_model="crm.lead"
-                view_mode="form"
-                multi="True"
-                target="new"
-                key2="client_action_multi"
-                id="survey.action_partner_survey_mail_crm"
-                context="{
-                            'default_use_template': True,
-                            'default_template_id': ref('survey.email_template_survey'),
-                        }" />
-    </data>
-</openerp>
diff --git a/addons/survey_crm/models/__init__.py b/addons/survey_crm/models/__init__.py
new file mode 100644
index 00000000000..0a274c37955
--- /dev/null
+++ b/addons/survey_crm/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import survey
diff --git a/addons/survey_crm/models/survey.py b/addons/survey_crm/models/survey.py
new file mode 100644
index 00000000000..4ee163098ea
--- /dev/null
+++ b/addons/survey_crm/models/survey.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from openerp.osv import osv
+
+
+class survey_mail_compose_message(osv.TransientModel):
+    _inherit = 'survey.mail.compose.message'
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(survey_mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
+            partner_ids = []
+            emails_list = []
+            for lead in self.pool.get('crm.lead').browse(cr, uid, context.get('active_ids'), context=context):
+                if lead.partner_id:
+                    partner_ids.append(lead.partner_id.id)
+                else:
+                    email = lead.contact_name and "%s <%s>" % (lead.contact_name, lead.email_from or "") or lead.email_from or None
+                    if email and email not in emails_list:
+                        emails_list.append(email)
+            multi_email = "\n".join(emails_list)
+
+            res.update({'partner_ids': list(set(partner_ids)), 'multi_email': multi_email})
+        return res
diff --git a/addons/survey_crm/survey.py b/addons/survey_crm/survey.py
deleted file mode 100644
index 4ee163098ea..00000000000
--- a/addons/survey_crm/survey.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from openerp.osv import osv
-
-
-class survey_mail_compose_message(osv.TransientModel):
-    _inherit = 'survey.mail.compose.message'
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(survey_mail_compose_message, self).default_get(cr, uid, fields, context=context)
-        if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
-            partner_ids = []
-            emails_list = []
-            for lead in self.pool.get('crm.lead').browse(cr, uid, context.get('active_ids'), context=context):
-                if lead.partner_id:
-                    partner_ids.append(lead.partner_id.id)
-                else:
-                    email = lead.contact_name and "%s <%s>" % (lead.contact_name, lead.email_from or "") or lead.email_from or None
-                    if email and email not in emails_list:
-                        emails_list.append(email)
-            multi_email = "\n".join(emails_list)
-
-            res.update({'partner_ids': list(set(partner_ids)), 'multi_email': multi_email})
-        return res
diff --git a/addons/survey_crm/views/survey_crm_views.xml b/addons/survey_crm/views/survey_crm_views.xml
new file mode 100644
index 00000000000..d28840643f6
--- /dev/null
+++ b/addons/survey_crm/views/survey_crm_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
+        <act_window name="Partner Survey Mailing"
+                res_model="survey.mail.compose.message"
+                src_model="crm.lead"
+                view_mode="form"
+                multi="True"
+                target="new"
+                key2="client_action_multi"
+                id="survey.action_partner_survey_mail_crm"
+                context="{
+                            'default_use_template': True,
+                            'default_template_id': ref('survey.email_template_survey'),
+                        }" />
+    </data>
+</openerp>
-- 
cgit v1.2.3