From fa7fdc525acce8a3b9b70b4068aba946cd87b4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Tue, 26 Apr 2016 09:41:55 +0200 Subject: [PATCH] [MOV] crm : reoganize module directory and files --- addons/crm/__init__.py | 9 --- addons/crm/__openerp__.py | 58 +++++++++---------- .../base_action_rule_demo.xml} | 0 ..._action_data.xml => crm_activity_data.xml} | 0 ..._action_demo.xml => crm_activity_demo.xml} | 0 addons/crm/{ => data}/crm_data.xml | 0 addons/crm/{ => data}/crm_demo.xml | 0 addons/crm/{ => data}/crm_lead_data.xml | 0 addons/crm/{ => data}/crm_lead_demo.xml | 0 .../mail_template_data.xml} | 0 .../crm/{tour_view.xml => data/tour_data.xml} | 0 addons/crm/{ => data}/web_planner_data.xml | 0 addons/crm/models/__init__.py | 9 +++ .../{calendar_event.py => models/calendar.py} | 0 addons/crm/{ => models}/crm_lead.py | 0 addons/crm/{ => models}/crm_stage.py | 0 .../crm/{sales_team.py => models/crm_team.py} | 0 addons/crm/{ => models}/res_config.py | 0 addons/crm/{ => models}/res_partner.py | 0 addons/crm/{ => models}/res_users.py | 0 addons/crm/{ => models}/web_planner.py | 0 ...view.xml => crm_activity_report_views.xml} | 0 ...w.xml => crm_opportunity_report_views.xml} | 0 .../calendar_views.xml} | 0 ...ction_views.xml => crm_activity_views.xml} | 0 .../crm_lead_views.xml} | 0 addons/crm/{ => views}/crm_stage_views.xml | 0 .../crm_team_views.xml} | 0 .../crm/views/{crm.xml => crm_templates.xml} | 0 .../crm/{crm_view.xml => views/crm_views.xml} | 0 .../res_config_views.xml} | 0 .../res_partner_views.xml} | 0 addons/crm/wizard/__init__.py | 1 + addons/crm/{ => wizard}/base_partner_merge.py | 0 .../base_partner_merge_views.xml} | 0 ..._lost_view.xml => crm_lead_lost_views.xml} | 0 ....xml => crm_lead_to_opportunity_views.xml} | 0 ....xml => crm_merge_opportunities_views.xml} | 0 addons/crm/{ => wizard}/validate_email.py | 0 39 files changed, 38 insertions(+), 39 deletions(-) rename addons/crm/{crm_action_rule_demo.xml => data/base_action_rule_demo.xml} (100%) rename addons/crm/data/{crm_action_data.xml => crm_activity_data.xml} (100%) rename addons/crm/data/{crm_action_demo.xml => crm_activity_demo.xml} (100%) rename addons/crm/{ => data}/crm_data.xml (100%) rename addons/crm/{ => data}/crm_demo.xml (100%) rename addons/crm/{ => data}/crm_lead_data.xml (100%) rename addons/crm/{ => data}/crm_lead_demo.xml (100%) rename addons/crm/{crm_mail_template_data.xml => data/mail_template_data.xml} (100%) rename addons/crm/{tour_view.xml => data/tour_data.xml} (100%) rename addons/crm/{ => data}/web_planner_data.xml (100%) rename addons/crm/{calendar_event.py => models/calendar.py} (100%) rename addons/crm/{ => models}/crm_lead.py (100%) rename addons/crm/{ => models}/crm_stage.py (100%) rename addons/crm/{sales_team.py => models/crm_team.py} (100%) rename addons/crm/{ => models}/res_config.py (100%) rename addons/crm/{ => models}/res_partner.py (100%) rename addons/crm/{ => models}/res_users.py (100%) rename addons/crm/{ => models}/web_planner.py (100%) rename addons/crm/report/{crm_activity_report_view.xml => crm_activity_report_views.xml} (100%) rename addons/crm/report/{crm_opportunity_report_view.xml => crm_opportunity_report_views.xml} (100%) rename addons/crm/{calendar_event_menu.xml => views/calendar_views.xml} (100%) rename addons/crm/views/{crm_action_views.xml => crm_activity_views.xml} (100%) rename addons/crm/{crm_lead_view.xml => views/crm_lead_views.xml} (100%) rename addons/crm/{ => views}/crm_stage_views.xml (100%) rename addons/crm/{sales_team_view.xml => views/crm_team_views.xml} (100%) rename addons/crm/views/{crm.xml => crm_templates.xml} (100%) rename addons/crm/{crm_view.xml => views/crm_views.xml} (100%) rename addons/crm/{res_config_view.xml => views/res_config_views.xml} (100%) rename addons/crm/{res_partner_view.xml => views/res_partner_views.xml} (100%) rename addons/crm/{ => wizard}/base_partner_merge.py (100%) rename addons/crm/{base_partner_merge_view.xml => wizard/base_partner_merge_views.xml} (100%) rename addons/crm/wizard/{crm_lead_lost_view.xml => crm_lead_lost_views.xml} (100%) rename addons/crm/wizard/{crm_lead_to_opportunity_view.xml => crm_lead_to_opportunity_views.xml} (100%) rename addons/crm/wizard/{crm_merge_opportunities_view.xml => crm_merge_opportunities_views.xml} (100%) rename addons/crm/{ => wizard}/validate_email.py (100%) 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', + 'wizard/crm_lead_lost_views.xml', + 'wizard/crm_lead_to_opportunity_views.xml', + 'wizard/crm_merge_opportunities_views.xml', - 'crm_view.xml', - 'crm_stage_views.xml', - 'crm_lead_view.xml', - 'crm_lead_menu.xml', - 'views/crm_action_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', - 'calendar_event_menu.xml', + 'wizard/base_partner_merge_views.xml', - 'report/crm_activity_report_view.xml', - 'report/crm_opportunity_report_view.xml', + 'report/crm_activity_report_views.xml', + 'report/crm_opportunity_report_views.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' + '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 similarity index 100% rename from addons/crm/crm_action_rule_demo.xml rename to 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 similarity index 100% rename from addons/crm/data/crm_action_data.xml rename to 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 similarity index 100% rename from addons/crm/data/crm_action_demo.xml rename to addons/crm/data/crm_activity_demo.xml diff --git a/addons/crm/crm_data.xml b/addons/crm/data/crm_data.xml similarity index 100% rename from addons/crm/crm_data.xml rename to addons/crm/data/crm_data.xml diff --git a/addons/crm/crm_demo.xml b/addons/crm/data/crm_demo.xml similarity index 100% rename from addons/crm/crm_demo.xml rename to addons/crm/data/crm_demo.xml diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/data/crm_lead_data.xml similarity index 100% rename from addons/crm/crm_lead_data.xml rename to addons/crm/data/crm_lead_data.xml diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml similarity index 100% rename from addons/crm/crm_lead_demo.xml rename to 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 similarity index 100% rename from addons/crm/crm_mail_template_data.xml rename to addons/crm/data/mail_template_data.xml diff --git a/addons/crm/tour_view.xml b/addons/crm/data/tour_data.xml similarity index 100% rename from addons/crm/tour_view.xml rename to addons/crm/data/tour_data.xml diff --git a/addons/crm/web_planner_data.xml b/addons/crm/data/web_planner_data.xml similarity index 100% rename from addons/crm/web_planner_data.xml rename to 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 similarity index 100% rename from addons/crm/calendar_event.py rename to addons/crm/models/calendar.py diff --git a/addons/crm/crm_lead.py b/addons/crm/models/crm_lead.py similarity index 100% rename from addons/crm/crm_lead.py rename to addons/crm/models/crm_lead.py diff --git a/addons/crm/crm_stage.py b/addons/crm/models/crm_stage.py similarity index 100% rename from addons/crm/crm_stage.py rename to addons/crm/models/crm_stage.py diff --git a/addons/crm/sales_team.py b/addons/crm/models/crm_team.py similarity index 100% rename from addons/crm/sales_team.py rename to addons/crm/models/crm_team.py diff --git a/addons/crm/res_config.py b/addons/crm/models/res_config.py similarity index 100% rename from addons/crm/res_config.py rename to addons/crm/models/res_config.py diff --git a/addons/crm/res_partner.py b/addons/crm/models/res_partner.py similarity index 100% rename from addons/crm/res_partner.py rename to addons/crm/models/res_partner.py diff --git a/addons/crm/res_users.py b/addons/crm/models/res_users.py similarity index 100% rename from addons/crm/res_users.py rename to addons/crm/models/res_users.py diff --git a/addons/crm/web_planner.py b/addons/crm/models/web_planner.py similarity index 100% rename from addons/crm/web_planner.py rename to 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 similarity index 100% rename from addons/crm/report/crm_activity_report_view.xml rename to 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 similarity index 100% rename from addons/crm/report/crm_opportunity_report_view.xml rename to addons/crm/report/crm_opportunity_report_views.xml diff --git a/addons/crm/calendar_event_menu.xml b/addons/crm/views/calendar_views.xml similarity index 100% rename from addons/crm/calendar_event_menu.xml rename to addons/crm/views/calendar_views.xml diff --git a/addons/crm/views/crm_action_views.xml b/addons/crm/views/crm_activity_views.xml similarity index 100% rename from addons/crm/views/crm_action_views.xml rename to addons/crm/views/crm_activity_views.xml diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/views/crm_lead_views.xml similarity index 100% rename from addons/crm/crm_lead_view.xml rename to addons/crm/views/crm_lead_views.xml diff --git a/addons/crm/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml similarity index 100% rename from addons/crm/crm_stage_views.xml rename to addons/crm/views/crm_stage_views.xml diff --git a/addons/crm/sales_team_view.xml b/addons/crm/views/crm_team_views.xml similarity index 100% rename from addons/crm/sales_team_view.xml rename to addons/crm/views/crm_team_views.xml diff --git a/addons/crm/views/crm.xml b/addons/crm/views/crm_templates.xml similarity index 100% rename from addons/crm/views/crm.xml rename to addons/crm/views/crm_templates.xml diff --git a/addons/crm/crm_view.xml b/addons/crm/views/crm_views.xml similarity index 100% rename from addons/crm/crm_view.xml rename to addons/crm/views/crm_views.xml diff --git a/addons/crm/res_config_view.xml b/addons/crm/views/res_config_views.xml similarity index 100% rename from addons/crm/res_config_view.xml rename to addons/crm/views/res_config_views.xml diff --git a/addons/crm/res_partner_view.xml b/addons/crm/views/res_partner_views.xml similarity index 100% rename from addons/crm/res_partner_view.xml rename to 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 similarity index 100% rename from addons/crm/base_partner_merge.py rename to 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 similarity index 100% rename from addons/crm/base_partner_merge_view.xml rename to 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 similarity index 100% rename from addons/crm/wizard/crm_lead_lost_view.xml rename to 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 similarity index 100% rename from addons/crm/wizard/crm_lead_to_opportunity_view.xml rename to 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 similarity index 100% rename from addons/crm/wizard/crm_merge_opportunities_view.xml rename to addons/crm/wizard/crm_merge_opportunities_views.xml diff --git a/addons/crm/validate_email.py b/addons/crm/wizard/validate_email.py similarity index 100% rename from addons/crm/validate_email.py rename to addons/crm/wizard/validate_email.py