diff --git a/addons/crm/crm_report.py b/addons/crm/crm_report.py deleted file mode 100644 index c5a73c27124..00000000000 --- a/addons/crm/crm_report.py +++ /dev/null @@ -1,187 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -from osv import fields,osv - -import tools.sql - -AVAILABLE_STATES = [ - ('draft','Draft'), - ('open','Open'), - ('cancel', 'Cancelled'), - ('done', 'Closed'), - ('pending','Pending') -] - -class report_crm_case_section_categ2(osv.osv): - _name = "report.crm.case.section.categ2" - _description = "Cases by section and category2" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), - } - _order = 'category2_id, section_id' - - def init(self, cr): - tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ2") - cr.execute(""" - create view report_crm_case_section_categ2 as ( - select - min(c.id) as id, - to_char(c.create_date,'YYYY-MM')||'-01' as name, - c.user_id, - c.state, - c.category2_id, - c.stage_id, - c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close - from - crm_case c - where c.category2_id is not null - group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.category2_id, c.section_id)""") - -report_crm_case_section_categ2() - -class report_crm_case_section_stage(osv.osv): - _name = "report.crm.case.section.stage" - _description = "Cases by section and stage" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), - } - _order = 'stage_id, section_id' - - def init(self, cr): - tools.sql.drop_view_if_exists(cr, "report_crm_case_section_stage") - cr.execute(""" - create view report_crm_case_section_stage as ( - select - min(c.id) as id, - to_char(c.create_date,'YYYY-MM')||'-01' as name, - c.user_id, - c.state, - c.stage_id, - c.section_id, - count(*) as nbr, - sum(planned_revenue) as amount_revenue, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close - from - crm_case c - where c.stage_id is not null - group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.state, c.stage_id, c.section_id)""") - -report_crm_case_section_stage() - -class report_crm_case_section_categ_stage(osv.osv): - _name = "report.crm.case.section.categ.stage" - _description = "Cases by section, Category and stage" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True), - 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), - } - _order = 'stage_id, section_id, categ_id' - - def init(self, cr): - tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ_stage") - cr.execute(""" - create view report_crm_case_section_categ_stage as ( - select - min(c.id) as id, - to_char(c.create_date,'YYYY-MM')||'-01' as name, - c.user_id, - c.categ_id, - c.state, - c.stage_id, - c.section_id, - count(*) as nbr, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close - from - crm_case c - where c.categ_id is not null AND c.stage_id is not null - group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.state, c.stage_id, c.section_id)""") - -report_crm_case_section_categ_stage() - -class report_crm_case_section_categ_categ2(osv.osv): - _name = "report.crm.case.section.categ.categ2" - _description = "Cases by section, Category and Category2" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'User', readonly=True), - 'categ_id':fields.many2one('crm.case.categ', 'Category', readonly=True), - 'category2_id':fields.many2one('crm.case.category2', 'Type', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'stage_id':fields.many2one('crm.case.stage', 'Stage', readonly=True), - 'nbr': fields.integer('# of Cases', readonly=True), - 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), - 'delay_close': fields.char('Delay Close', size=20, readonly=True), - } - _order = 'section_id, categ_id, category2_id' - - def init(self, cr): - tools.sql.drop_view_if_exists(cr, "report_crm_case_section_categ_categ2") - cr.execute(""" - create view report_crm_case_section_categ_categ2 as ( - select - min(c.id) as id, - to_char(c.create_date, 'YYYY-MM')||'-01' as name, - c.user_id, - c.categ_id, - c.category2_id, - c.state, - c.stage_id, - c.section_id, - count(*) as nbr, - to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close - from - crm_case c - where c.categ_id is not null AND c.category2_id is not null - group by to_char(c.create_date,'YYYY-MM'), c.user_id, c.categ_id, c.category2_id, c.state, c.stage_id, c.section_id)""") - -report_crm_case_section_categ_categ2() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/crm_project/crm_project_bug.py b/addons/crm_project/crm_project_bug.py index 066739cc8d3..5897f702e00 100644 --- a/addons/crm_project/crm_project_bug.py +++ b/addons/crm_project/crm_project_bug.py @@ -103,7 +103,7 @@ class crm_project_bug(osv.osv): "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."), 'categ_id': fields.many2one('crm.bug.categ','Category', domain="[('section_id','=',section_id)]"), 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'), - 'type_id': fields.many2one('crm.project.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"), + 'type_id': fields.many2one('crm.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"), 'partner_name': fields.char("Employee's Name", size=64), 'partner_mobile': fields.char('Mobile', size=32), diff --git a/addons/crm_project/crm_project_feature.py b/addons/crm_project/crm_project_feature.py index d935ffb94fa..f0a9cd6513e 100644 --- a/addons/crm_project/crm_project_feature.py +++ b/addons/crm_project/crm_project_feature.py @@ -32,6 +32,20 @@ import tools from osv import fields,osv,orm from osv.orm import except_orm +AVAILABLE_PRIORITIES = [ + ('5','Lowest'), + ('4','Low'), + ('3','Normal'), + ('2','High'), + ('1','Highest') +] + +def _links_get(self, cr, uid, context={}): + obj = self.pool.get('res.request.link') + ids = obj.search(cr, uid, []) + res = obj.read(cr, uid, ids, ['object', 'name'], context) + return [(r['object'], r['name']) for r in res] + class crm_project_future_request(osv.osv): _name = "crm.project.future" _description = "Project Future Request" @@ -50,7 +64,7 @@ class crm_project_future_request(osv.osv): "to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."), 'categ_id': fields.many2one('crm.bug.categ','Category', domain="[('section_id','=',section_id)]"), 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'), - 'type_id': fields.many2one('crm.project.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"), + 'type_id': fields.many2one('crm.bug.type', 'Bug Type', domain="[('section_id','=',section_id)]"), 'partner_name': fields.char("Employee's Name", size=64), 'partner_mobile': fields.char('Mobile', size=32),