From d83a6c69acd14de874a3ff24623973722ff63a09 Mon Sep 17 00:00:00 2001 From: Ronak Baxi Date: Mon, 8 Sep 2014 15:01:30 +0530 Subject: [PATCH] [IMP] crm, project, hr_recruitment: star (priority) management: less possible values, too much stars are too much tears ! --- addons/crm/crm.py | 7 ++--- addons/crm/crm_lead.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 9 +++--- addons/hr_recruitment/hr_recruitment_demo.xml | 8 ++--- addons/project/project.py | 2 +- addons/project/project_demo.xml | 30 +++++++++---------- addons/project/project_view.xml | 2 +- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index f694f527957..c3108c44e8f 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -23,11 +23,10 @@ from openerp.osv import osv, fields from openerp.http import request AVAILABLE_PRIORITIES = [ - ('0', 'Very Low'), + ('0', 'Normal'), ('1', 'Low'), - ('2', 'Normal'), - ('3', 'High'), - ('4', 'Very High'), + ('2', 'High'), + ('3', 'Very High'), ] diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 9b4975ab557..dd89d424376 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -281,7 +281,7 @@ class crm_lead(format_address, osv.osv): 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), 'section_id': lambda s, cr, uid, c: s._get_default_section_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[2][0], + 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[0][0], 'color': 0, 'date_last_stage_update': fields.datetime.now, } diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 05bc2c81821..d429ea447a8 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -28,11 +28,10 @@ from openerp.tools.translate import _ AVAILABLE_PRIORITIES = [ - ('0', 'Bad'), - ('1', 'Below Average'), - ('2', 'Average'), - ('3', 'Good'), - ('4', 'Excellent') + ('0', 'Normal'), + ('1', 'Good'), + ('2', 'Very Good'), + ('3', 'Excellent') ] class hr_recruitment_source(osv.osv): diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index 0d00efd3f84..03d31d0851d 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -8,7 +8,7 @@ - 2 + 1 Enrique Jones 9963214587 @@ -22,7 +22,7 @@ - 3 + 2 Marie Justine 9988774455 @@ -37,7 +37,7 @@ - 1 + 0 Jose 999666735 @@ -75,7 +75,7 @@ - 2 + 1 David Armstrong 33968745 diff --git a/addons/project/project.py b/addons/project/project.py index 27eb688c0b4..db3e281a20d 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -784,7 +784,7 @@ class task(osv.osv): 'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."), 'name': fields.char('Task Summary', track_visibility='onchange', size=128, required=True, select=True), 'description': fields.html('Description'), - 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), + 'priority': fields.selection([('0','Normal'), ('1','High')], 'Priority', select=True), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), 'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True, domain="[('project_ids', '=', project_id)]", copy=False), diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index e15586dc420..74c35b97bb5 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -154,7 +154,7 @@ - 2 + 1 Develop module for Warehouse done @@ -168,7 +168,7 @@ - 2 + 1 Integrate Modules @@ -177,7 +177,7 @@ - 2 + 1 Internal testing + Software Install @@ -186,7 +186,7 @@ - 2 + 1 New portal system 0 @@ -198,7 +198,7 @@ - 2 + 1 Document history management @@ -207,7 +207,7 @@ - 2 + 1 Social network integration blocked @@ -217,7 +217,7 @@ - 2 + 1 User interface improvements - 2 + 1 Improve+clean code and functionality @@ -241,7 +241,7 @@ - 2 + 1 Design Use Cases @@ -251,7 +251,7 @@ - 2 + 1 Dataflow Design @@ -260,7 +260,7 @@ - 2 + 1 User Interface design @@ -274,7 +274,7 @@ - 2 + 1 Set target for all deparments @@ -284,7 +284,7 @@ - 2 + 1 Integration of core components @@ -294,7 +294,7 @@ - 2 + 1 Deploy and review on live system @@ -357,7 +357,7 @@ 8.0 - 2 + 1 Modifications asked by the customer

+

@@ -460,7 +461,6 @@ -