pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] crm, project, hr_recruitment: star (priority) management: less possible values, too much stars are too much tears !

Browse Source
This commit is contained in:
Ronak Baxi
2014-10-01 09:41:44 +02:00
committed by Thibault Delavallée
parent bee0335699
commit d83a6c69ac
7 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm.py
+3 -4
View File
@@ -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'),
]
addons/crm/crm_lead.py
+1 -1
View File
@@ -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,
}
addons/hr_recruitment/hr_recruitment.py
+4 -5
View File
@@ -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):
addons/hr_recruitment/hr_recruitment_demo.xml
+4 -4
View File
@@ -8,7 +8,7 @@
<field name="type_id" ref="degree_graduate"/>
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="partner_name">Enrique Jones</field>
<field name="partner_mobile">9963214587</field>
<field name="stage_id" ref="stage_job1"/>
@@ -22,7 +22,7 @@
<field name="type_id" ref="degree_licenced"/>
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">3</field>
<field name="priority">2</field>
<field name="partner_name">Marie Justine</field>
<field name="partner_mobile">9988774455</field>
<field name="stage_id" ref="stage_job4"/>
@@ -37,7 +37,7 @@
<field name="type_id" ref="degree_bachelor"/>
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">1</field>
<field name="priority">0</field>
<field name="partner_name">Jose</field>
<field name="stage_id" ref="stage_job3"/>
<field name="partner_phone">999666735</field>
@@ -75,7 +75,7 @@
<field name="type_id" ref="degree_licenced"/>
<field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="partner_name">David Armstrong</field>
<field name="stage_id" ref="stage_job2"/>
<field name="partner_phone">33968745</field>
addons/project/project.py
+1 -1
View File
@@ -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),
addons/project/project_demo.xml
+15 -15
View File
@@ -154,7 +154,7 @@
<field name="planned_hours" eval="76.0"/>
<field name="remaining_hours" eval="76.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_1"/>
<field name="name">Develop module for Warehouse</field>
<field name="kanban_state">done</field>
@@ -168,7 +168,7 @@
<field name="planned_hours" eval="24.0"/>
<field name="remaining_hours" eval="24.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_1"/>
<field name="name">Integrate Modules</field>
<field name="stage_id" ref="project_stage_1"/>
@@ -177,7 +177,7 @@
<field name="planned_hours" eval="15.0"/>
<field name="remaining_hours" eval="5.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_1"/>
<field name="name">Internal testing + Software Install</field>
<field name="stage_id" ref="project_stage_1"/>
@@ -186,7 +186,7 @@
<field name="planned_hours" eval="22.0"/>
<field name="remaining_hours" eval="22.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_2"/>
<field name="name">New portal system</field>
<field name="priority">0</field>
@@ -198,7 +198,7 @@
<field name="planned_hours" eval="18.0"/>
<field name="remaining_hours" eval="18.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_2"/>
<field name="name">Document history management</field>
<field name="stage_id" ref="project_stage_0"/>
@@ -207,7 +207,7 @@
<field name="planned_hours" eval="38.0"/>
<field name="remaining_hours" eval="38.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_2"/>
<field name="name">Social network integration</field>
<field name="kanban_state">blocked</field>
@@ -217,7 +217,7 @@
<field name="planned_hours" eval="16.0"/>
<field name="remaining_hours" eval="16.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_2"/>
<field name="name">User interface improvements</field>
<field name="categ_ids" eval="[(6, 0, [
@@ -230,7 +230,7 @@
<field name="planned_hours" eval="40.0"/>
<field name="remaining_hours" eval="40.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_2"/>
<field name="name">Improve+clean code and functionality</field>
<field name="stage_id" ref="project_stage_0"/>
@@ -241,7 +241,7 @@
<field name="planned_hours" eval="12.0"/>
<field name="remaining_hours" eval="12.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">Design Use Cases</field>
<field name="stage_id" ref="project_stage_1"/>
@@ -251,7 +251,7 @@
<field name="planned_hours" eval="12.0"/>
<field name="remaining_hours" eval="12.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">Dataflow Design</field>
<field name="stage_id" ref="project_stage_1"/>
@@ -260,7 +260,7 @@
<field name="planned_hours" eval="55.0"/>
<field name="remaining_hours" eval="55.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">User Interface design</field>
<field name="stage_id" ref="project_stage_2"/>
@@ -274,7 +274,7 @@
<field name="planned_hours" eval="80.0"/>
<field name="remaining_hours" eval="80.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">Set target for all deparments</field>
<field name="stage_id" ref="project_stage_3"/>
@@ -284,7 +284,7 @@
<field name="planned_hours" eval="34.0"/>
<field name="remaining_hours" eval="34.0"/>
<field name="user_id" ref="base.user_demo"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">Integration of core components</field>
<field name="stage_id" ref="project_stage_1"/>
@@ -294,7 +294,7 @@
<field name="planned_hours" eval="16.0"/>
<field name="remaining_hours" eval="16.0"/>
<field name="user_id" ref="base.user_root"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_3"/>
<field name="name">Deploy and review on live system</field>
<field name="stage_id" ref="project_stage_2"/>
@@ -357,7 +357,7 @@
<field name="remaining_hours">8.0</field>
<field name="stage_id" ref="project_stage_2"/>
<field name="user_id" eval="False"/>
<field name="priority">2</field>
<field name="priority">1</field>
<field name="project_id" ref="project.project_project_5"/>
<field name="name">Modifications asked by the customer</field>
<field name="categ_ids" eval="[(6, 0, [
addons/project/project_view.xml
+1 -1
View File
@@ -394,6 +394,7 @@
<sheet string="Task">
<div class="row">
<h1 class="col-xs-11">
<field class="oe_inline oe_left" name="priority" widget="priority"/>
<field name="name" placeholder="Task summary..." class="oe_inline"/>
</h1>
<div class="col-xs-1 text-right">
@@ -460,7 +461,6 @@
</page>
<page string="Extra Info">
<group col="4">
<field name="priority" groups="base.group_user" widget="priority"/>
<field name="sequence" groups="base.group_no_one"/>
<field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>