From a056a5d8908db0096573fe044bd79b5af8cf51d6 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 14 Jul 2015 12:40:38 +0200 Subject: [PATCH] [MOVE] crm: crm.stage code moved from crm to crm_stage.py file; moved its views in its own file. Just reorganizing things before cleaning a bit. --- addons/crm/__init__.py | 2 +- addons/crm/__openerp__.py | 1 + addons/crm/crm_lead.py | 10 ++-- addons/crm/{crm.py => crm_stage.py} | 0 addons/crm/crm_stage_views.xml | 54 +++++++++++++++++++ addons/crm/crm_view.xml | 53 ------------------ addons/crm/report/crm_lead_report.py | 4 +- addons/crm/report/crm_opportunity_report.py | 4 +- addons/crm_claim/crm_claim.py | 1 - .../report/project_issue_report.py | 2 +- 10 files changed, 66 insertions(+), 65 deletions(-) rename addons/crm/{crm.py => crm_stage.py} (100%) create mode 100644 addons/crm/crm_stage_views.xml diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 41d2950249f..e9a8b62b2da 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import crm +import crm_stage import crm_lead import sales_team import models diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 11794a9158c..6104ce3697c 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -56,6 +56,7 @@ Dashboard for CRM will include: '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', diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 5f3caf239b8..dab3577e4fa 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -5,11 +5,11 @@ from datetime import datetime, timedelta import logging from operator import itemgetter -import crm import openerp from openerp import SUPERUSER_ID from openerp import tools, api from openerp.addons.base.res.res_partner import format_address +from openerp.addons.crm import crm_stage from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools import email_re, email_split @@ -183,7 +183,7 @@ class crm_lead(format_address, osv.osv): [('lead', 'Lead'), ('opportunity', 'Opportunity')], string='Type', select=True, required=True, help="Type is used to separate Leads and Opportunities"), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), + 'priority': fields.selection(crm_stage.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True, copy=False), 'stage_id': fields.many2one('crm.stage', 'Stage', track_visibility='onchange', select=True, domain="['&', ('team_ids', '=', team_id), '|', ('type', '=', type), ('type', '=', 'both')]"), @@ -248,7 +248,7 @@ class crm_lead(format_address, osv.osv): 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), 'team_id': lambda s, cr, uid, c: s.pool['crm.team']._get_default_team_id(cr, uid, context=c), 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), - 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[0][0], + 'priority': lambda *a: crm_stage.AVAILABLE_PRIORITIES[0][0], 'color': 0, 'date_last_stage_update': fields.datetime.now, } @@ -996,7 +996,7 @@ class crm_lead(format_address, osv.osv): } if msg.get('author_id'): defaults.update(self.on_change_partner_id(cr, uid, None, msg.get('author_id'), context=context)['value']) - if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES): + if msg.get('priority') in dict(crm_stage.AVAILABLE_PRIORITIES): defaults['priority'] = msg.get('priority') defaults.update(custom_values) return super(crm_lead, self).message_new(cr, uid, msg, custom_values=defaults, context=context) @@ -1010,7 +1010,7 @@ class crm_lead(format_address, osv.osv): ids = [ids] if update_vals is None: update_vals = {} - if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES): + if msg.get('priority') in dict(crm_stage.AVAILABLE_PRIORITIES): update_vals['priority'] = msg.get('priority') maps = { 'cost':'planned_cost', diff --git a/addons/crm/crm.py b/addons/crm/crm_stage.py similarity index 100% rename from addons/crm/crm.py rename to addons/crm/crm_stage.py diff --git a/addons/crm/crm_stage_views.xml b/addons/crm/crm_stage_views.xml new file mode 100644 index 00000000000..7fd72666491 --- /dev/null +++ b/addons/crm/crm_stage_views.xml @@ -0,0 +1,54 @@ + + + + crm.stage.tree + crm.stage + + + + + + + + + + + + crm.stage.form + crm.stage + + +
+ + + + + + + + + + + + + + + +
+ + + + Stages + crm.stage + form + + + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 4335003c8fd..4316c153b30 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -52,58 +52,5 @@ - - - - crm.stage.tree - crm.stage - - - - - - - - - - - - crm.stage.form - crm.stage - - -
- - - - - - - - - - - - - - - -
- - - - Stages - crm.stage - form - - diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index e44666665f4..831d0aea812 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.crm import crm +from openerp.addons.crm import crm_stage from openerp.osv import fields, osv from openerp import tools @@ -36,7 +36,7 @@ class crm_lead_report(osv.Model): 'stage_id': fields.many2one ('crm.stage', 'Stage', readonly=True, domain="[('team_ids', '=', team_id)]"), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection(crm_stage.AVAILABLE_PRIORITIES, 'Priority'), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py index 00e62d628ce..afe9374f63c 100644 --- a/addons/crm/report/crm_opportunity_report.py +++ b/addons/crm/report/crm_opportunity_report.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from openerp.addons.crm import crm +from openerp.addons.crm import crm_stage from openerp.osv import fields, osv from openerp import tools @@ -38,7 +38,7 @@ class crm_opportunity_report(osv.Model): 'stage_id': fields.many2one ('crm.stage', 'Stage', readonly=True, domain="[('team_ids', '=', team_id)]"), 'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection(crm_stage.AVAILABLE_PRIORITIES, 'Priority'), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index b430bb28f5a..b5f875a796d 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -2,7 +2,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. import openerp -from openerp.addons.crm import crm from openerp.osv import fields, osv from openerp import tools from openerp.tools.translate import _ diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index a275d32b1fc..bd0bdf4346b 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -4,7 +4,7 @@ from openerp.osv import fields, osv from openerp import tools -from openerp.addons.crm import crm + class project_issue_report(osv.osv): _name = "project.issue.report"