diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 700047768ba..964479e0412 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -28,11 +28,9 @@ from openerp.osv import fields from openerp.osv import osv AVAILABLE_PRIORITIES = [ - ('0', 'Lowest'), - ('1', 'Low'), - ('2', 'Normal'), - ('3', 'High'), - ('4', 'Highest'), + ('0', 'Normal'), + ('1', 'High'), + ('2', 'Highest'), ] class crm_case_channel(osv.osv): diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index c3785081d4f..a76415f6561 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -54,7 +54,7 @@ Could you please send me the details ? - 4 + 0 @@ -104,7 +104,7 @@ Could you please send me the details ? - 3 + 1 @@ -129,7 +129,7 @@ Could you please send me the details ? - 3 + 1 @@ -156,7 +156,7 @@ Contact: +1 813 494 5005 - 3 + 1 @@ -174,7 +174,7 @@ Contact: +1 813 494 5005 - 4 + 0 @@ -193,7 +193,7 @@ Contact: +1 813 494 5005 - 4 + 0 @@ -253,7 +253,7 @@ Andrew - 3 + 1 @@ -331,7 +331,7 @@ Andrew - 3 + 1 Send Catalogue by Email @@ -404,7 +404,7 @@ Andrew - 4 + 0 Send price list regarding our interventions @@ -431,7 +431,7 @@ Andrew - 4 + 0 Call to define real needs about training @@ -492,7 +492,7 @@ Andrew - 3 + 1 @@ -510,7 +510,7 @@ Andrew - 3 + 1 @@ -525,7 +525,7 @@ Andrew - 4 + 0 @@ -543,7 +543,7 @@ Andrew - 4 + 0 @@ -588,7 +588,7 @@ Andrew - 3 + 1 Send Catalogue by Email diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml index 4002e18815e..90cda34cc01 100644 --- a/addons/crm/crm_phonecall_demo.xml +++ b/addons/crm/crm_phonecall_demo.xml @@ -6,7 +6,7 @@ - + Left the message done @@ -19,7 +19,7 @@ - + Need more information on the proposed deal done @@ -44,7 +44,7 @@ - + Wanted information about pricing of laptops done @@ -58,7 +58,7 @@ - + More information on the proposed deal pending @@ -69,7 +69,7 @@ - + Proposal for discount offer open diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 60f4ecafb4d..5b4567598a4 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -27,11 +27,10 @@ from openerp.tools.translate import _ from openerp.tools import html2plaintext AVAILABLE_PRIORITIES = [ - ('0', 'Not Good'), - ('1', 'On Average'), - ('2', 'Good'), - ('3', 'Very Good'), - ('4', 'Excellent') + ('0', 'On Average'), + ('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 8ba49a2beb8..6c862e34149 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -75,7 +75,7 @@ - 4 + 0 David Armstrong 33968745 diff --git a/addons/project/project.py b/addons/project/project.py index c28ace9a24a..29abeb2ea19 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -753,7 +753,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', size=128, required=True, select=True), 'description': fields.text('Description'), - 'priority': fields.selection([('0','Very Low'), ('1','Low'), ('2','Medium'), ('3','Important'), ('4','Very important')], 'Priority', select=True), + 'priority': fields.selection([('0','Medium'), ('1','Important'), ('2','Very important')], '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', domain="[('project_ids', '=', project_id)]"), diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index ff225c46e10..54f78ba8c8b 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -110,7 +110,7 @@ - 4 + 0 Prepare Requirements Document @@ -120,7 +120,7 @@ - 4 + 0 Make SRS @@ -129,7 +129,7 @@ - 4 + 0 Budget Planning @@ -140,7 +140,7 @@ - 4 + 0 Develop module for Sale Management Use the account_budget module diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index 29e5b05a1d1..4ed2f090e24 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -35,7 +35,7 @@ - 4 + 0 @@ -51,7 +51,7 @@ - 3 + 1 @@ -64,7 +64,7 @@ - 4 + 0 @@ -79,7 +79,7 @@ - 3 + 1 @@ -92,7 +92,7 @@ - 3 + 1 @@ -105,7 +105,7 @@ - 3 + 1 @@ -172,7 +172,7 @@ - 4 + 0 @@ -199,7 +199,7 @@ - 3 + 1 @@ -213,7 +213,7 @@ - 3 + 1 @@ -226,7 +226,7 @@ - 4 + 0