[MOV] crm : reoganize module directory and files

39 files changed, 42 insertions, 43 deletions

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 927f765e815..d84fb182e8f 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -1,15 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import res_users
-import crm_stage
-import crm_lead
-import sales_team
 import models
-import calendar_event
 import report
 import wizard
-import res_partner
-import res_config
-import base_partner_merge
-import web_planner
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 5bda2950b47..a0c01819a8e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-
 {
     'name': 'CRM',
     'version': '1.0',
@@ -42,48 +41,47 @@ Dashboard for CRM will include:
         'web_tour',
     ],
     'data': [
-        'data/crm_action_data.xml',
-        'crm_data.xml',
+        'data/tour_data.xml',
+        'data/crm_activity_data.xml',
+        'data/crm_data.xml',
         'data/crm_stage_data.xml',
         'data/sales_config_settings_data.xml',
-        'crm_lead_data.xml',
+        'data/crm_lead_data.xml',
+        'data/web_planner_data.xml',
+        'data/mail_template_data.xml',
 
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
         'wizard/crm_activity_log_views.xml',
-        'wizard/crm_lead_lost_view.xml',
-        'wizard/crm_lead_to_opportunity_view.xml',
-        'wizard/crm_merge_opportunities_view.xml',
-
-        'crm_view.xml',
-        'crm_stage_views.xml',
-        'crm_lead_view.xml',
-        'crm_lead_menu.xml',
-        'views/crm_action_views.xml',
-
-        'calendar_event_menu.xml',
-
-        'report/crm_activity_report_view.xml',
-        'report/crm_opportunity_report_view.xml',
-
-        'res_partner_view.xml',
-
-        'res_config_view.xml',
-        'base_partner_merge_view.xml',
-
-        'sales_team_view.xml',
-        'views/crm.xml',
-        'web_planner_data.xml',
-        'sales_team_dashboard.xml',
-        'crm_mail_template_data.xml',
-        'tour_view.xml'
+        'wizard/crm_lead_lost_views.xml',
+        'wizard/crm_lead_to_opportunity_views.xml',
+        'wizard/crm_merge_opportunities_views.xml',
+
+        'views/crm_templates.xml',
+        'views/crm_views.xml',
+        'views/crm_activity_views.xml',
+        'views/crm_stage_views.xml',
+        'views/crm_lead_views.xml',
+        'crm_lead_menu.xml',  # TODO : move into crm_lead_views.xml
+        'views/crm_activity_views.xml',
+        'views/calendar_views.xml',
+        'views/res_partner_views.xml',
+        'views/res_config_views.xml',
+
+        'wizard/base_partner_merge_views.xml',
+
+        'report/crm_activity_report_views.xml',
+        'report/crm_opportunity_report_views.xml',
+
+        'views/crm_team_views.xml',
+        'sales_team_dashboard.xml',  # TODO : merge with crm_Team_views
     ],
     'demo': [
-        'crm_demo.xml',
-        'crm_lead_demo.xml',
-        'data/crm_action_demo.xml',
-        'crm_action_rule_demo.xml',
+        'data/crm_demo.xml',
+        'data/crm_lead_demo.xml',
+        'data/crm_activity_demo.xml',
+        'data/base_action_rule_demo.xml',
     ],
     'test': [
         'test/crm_access_group_users.yml',
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/data/base_action_rule_demo.xml
index ff83639703a..ff83639703a 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/data/base_action_rule_demo.xml
diff --git a/addons/crm/data/crm_action_data.xml b/addons/crm/data/crm_activity_data.xml
index cb45e243e97..cb45e243e97 100644
--- a/addons/crm/data/crm_action_data.xml
+++ b/addons/crm/data/crm_activity_data.xml
diff --git a/addons/crm/data/crm_action_demo.xml b/addons/crm/data/crm_activity_demo.xml
index 6c1bb4a25ba..6c1bb4a25ba 100644
--- a/addons/crm/data/crm_action_demo.xml
+++ b/addons/crm/data/crm_activity_demo.xml
diff --git a/addons/crm/crm_data.xml b/addons/crm/data/crm_data.xml
index 683e1a6e285..683e1a6e285 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/data/crm_data.xml
diff --git a/addons/crm/crm_demo.xml b/addons/crm/data/crm_demo.xml
index 60834cbc311..60834cbc311 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/data/crm_demo.xml
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/data/crm_lead_data.xml
index 03f5086b7b5..03f5086b7b5 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/data/crm_lead_data.xml
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml
index 8958543a761..8958543a761 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/data/crm_lead_demo.xml
diff --git a/addons/crm/crm_mail_template_data.xml b/addons/crm/data/mail_template_data.xml
index 99b6e280fb4..99b6e280fb4 100644
--- a/addons/crm/crm_mail_template_data.xml
+++ b/addons/crm/data/mail_template_data.xml
diff --git a/addons/crm/tour_view.xml b/addons/crm/data/tour_data.xml
index 1af27969465..1af27969465 100644
--- a/addons/crm/tour_view.xml
+++ b/addons/crm/data/tour_data.xml
diff --git a/addons/crm/web_planner_data.xml b/addons/crm/data/web_planner_data.xml
index f9674ae5fab..f9674ae5fab 100644
--- a/addons/crm/web_planner_data.xml
+++ b/addons/crm/data/web_planner_data.xml
diff --git a/addons/crm/models/__init__.py b/addons/crm/models/__init__.py
index ce946fd5b13..6edf901680d 100644
--- a/addons/crm/models/__init__.py
+++ b/addons/crm/models/__init__.py
@@ -1,3 +1,12 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+import res_users
+import calendar
 import crm_activity
+import crm_lead
+import crm_stage
+import crm_team
+import res_config
+import res_partner
+import web_planner
diff --git a/addons/crm/calendar_event.py b/addons/crm/models/calendar.py
index 996f6681a51..996f6681a51 100644
--- a/addons/crm/calendar_event.py
+++ b/addons/crm/models/calendar.py
diff --git a/addons/crm/crm_lead.py b/addons/crm/models/crm_lead.py
index 8cfb7dddf64..8cfb7dddf64 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
diff --git a/addons/crm/crm_stage.py b/addons/crm/models/crm_stage.py
index ac453ddc2ff..ac453ddc2ff 100644
--- a/addons/crm/crm_stage.py
+++ b/addons/crm/models/crm_stage.py
diff --git a/addons/crm/sales_team.py b/addons/crm/models/crm_team.py
index bb048b66789..bb048b66789 100644
--- a/addons/crm/sales_team.py
+++ b/addons/crm/models/crm_team.py
diff --git a/addons/crm/res_config.py b/addons/crm/models/res_config.py
index fac463016a0..fac463016a0 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/models/res_config.py
diff --git a/addons/crm/res_partner.py b/addons/crm/models/res_partner.py
index eb1c3a65f1b..eb1c3a65f1b 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/models/res_partner.py
diff --git a/addons/crm/res_users.py b/addons/crm/models/res_users.py
index b4997d32424..b4997d32424 100644
--- a/addons/crm/res_users.py
+++ b/addons/crm/models/res_users.py
diff --git a/addons/crm/web_planner.py b/addons/crm/models/web_planner.py
index 2f0d539aa01..2f0d539aa01 100644
--- a/addons/crm/web_planner.py
+++ b/addons/crm/models/web_planner.py
diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_views.xml
index cc114dbbf15..cc114dbbf15 100644
--- a/addons/crm/report/crm_activity_report_view.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 19a018b9970..19a018b9970 100644
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
diff --git a/addons/crm/calendar_event_menu.xml b/addons/crm/views/calendar_views.xml
index c9d43050387..c9d43050387 100644
--- a/addons/crm/calendar_event_menu.xml
+++ b/addons/crm/views/calendar_views.xml
diff --git a/addons/crm/views/crm_action_views.xml b/addons/crm/views/crm_activity_views.xml
index cf3ade757ae..cf3ade757ae 100644
--- a/addons/crm/views/crm_action_views.xml
+++ b/addons/crm/views/crm_activity_views.xml
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/views/crm_lead_views.xml
index c3f2404ce68..c3f2404ce68 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/views/crm_lead_views.xml
diff --git a/addons/crm/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml
index 95d0535a0f1..95d0535a0f1 100644
--- a/addons/crm/crm_stage_views.xml
+++ b/addons/crm/views/crm_stage_views.xml
diff --git a/addons/crm/sales_team_view.xml b/addons/crm/views/crm_team_views.xml
index de8d4e77d0e..de8d4e77d0e 100644
--- a/addons/crm/sales_team_view.xml
+++ b/addons/crm/views/crm_team_views.xml
diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm_templates.xml
index 8d3a81a3a17..8d3a81a3a17 100644
--- a/addons/crm/views/crm.xml
+++ b/addons/crm/views/crm_templates.xml
diff --git a/addons/crm/crm_view.xml b/addons/crm/views/crm_views.xml
index be7ffcb5d40..be7ffcb5d40 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/views/crm_views.xml
diff --git a/addons/crm/res_config_view.xml b/addons/crm/views/res_config_views.xml
index 1e9cc22ae15..1e9cc22ae15 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/views/res_config_views.xml
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/views/res_partner_views.xml
index 73c04a4ea0a..73c04a4ea0a 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/views/res_partner_views.xml
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 7f3fa1754f1..35bc03a01f9 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+import base_partner_merge
 import crm_activity_log
 import crm_lead_lost
 import crm_partner_binding
diff --git a/addons/crm/base_partner_merge.py b/addons/crm/wizard/base_partner_merge.py
index 95ad18f044f..95ad18f044f 100644
--- a/addons/crm/base_partner_merge.py
+++ b/addons/crm/wizard/base_partner_merge.py
diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/wizard/base_partner_merge_views.xml
index 4585ec0be97..4585ec0be97 100644
--- a/addons/crm/base_partner_merge_view.xml
+++ b/addons/crm/wizard/base_partner_merge_views.xml
diff --git a/addons/crm/wizard/crm_lead_lost_view.xml b/addons/crm/wizard/crm_lead_lost_views.xml
index 512baa711a0..512baa711a0 100644
--- a/addons/crm/wizard/crm_lead_lost_view.xml
+++ b/addons/crm/wizard/crm_lead_lost_views.xml
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_views.xml
index 9d5d533db3d..9d5d533db3d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_views.xml
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_views.xml
index 964372a6b64..964372a6b64 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_views.xml
diff --git a/addons/crm/validate_email.py b/addons/crm/wizard/validate_email.py
index 38de5743fca..38de5743fca 100644
--- a/addons/crm/validate_email.py
+++ b/addons/crm/wizard/validate_email.py