diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 20e2a6e8aff..29aa900c16d 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -28,11 +28,11 @@ from openerp.osv import fields from openerp.osv import osv AVAILABLE_PRIORITIES = [ - ('1', 'Highest'), - ('2', 'High'), - ('3', 'Normal'), - ('4', 'Low'), - ('5', 'Lowest'), + ('0', 'Very Low'), + ('1', 'Low'), + ('2', 'Normal'), + ('3', 'High'), + ('4', 'Very High'), ] class crm_case_channel(osv.osv): diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index a9311c3be6a..cfec1a3d931 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -455,21 +455,6 @@ class crm_lead(format_address, osv.osv): self.write(cr, uid, [case.id], data, context=context) return True - def set_priority(self, cr, uid, ids, priority, context=None): - """ Set lead priority - """ - return self.write(cr, uid, ids, {'priority': priority}, context=context) - - def set_high_priority(self, cr, uid, ids, context=None): - """ Set lead priority to high - """ - return self.set_priority(cr, uid, ids, '1', context=context) - - def set_normal_priority(self, cr, uid, ids, context=None): - """ Set lead priority to normal - """ - return self.set_priority(cr, uid, ids, '3', context=context) - def _merge_get_result_type(self, cr, uid, opps, context=None): """ Define the type of the result of the merge. If at least one of the diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index dab17888d7a..50a5a369850 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 + 1 @@ -104,7 +104,7 @@ Could you please send me the details ? - 3 + 2 @@ -129,7 +129,7 @@ Could you please send me the details ? - 3 + 2 @@ -156,7 +156,7 @@ Contact: +1 813 494 5005 - 3 + 2 @@ -174,7 +174,7 @@ Contact: +1 813 494 5005 - 5 + 0 @@ -193,7 +193,7 @@ Contact: +1 813 494 5005 - 4 + 1 @@ -253,7 +253,7 @@ Andrew - 3 + 2 @@ -331,7 +331,7 @@ Andrew - 3 + 2 Send Catalogue by Email @@ -404,7 +404,7 @@ Andrew - 4 + 1 Send price list regarding our interventions @@ -431,7 +431,7 @@ Andrew - 4 + 1 Call to define real needs about training @@ -492,7 +492,7 @@ Andrew - 3 + 2 @@ -510,7 +510,7 @@ Andrew - 3 + 1 @@ -525,7 +525,7 @@ Andrew - 5 + 0 @@ -543,7 +543,7 @@ Andrew - 5 + 0 @@ -588,7 +588,7 @@ Andrew - 3 + 2 Send Catalogue by Email diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index dc297492020..2441e4197c4 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -158,7 +158,7 @@ - +
- 7 - 7 - + +
+ +
- +
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 5b06493c60e..89a1f799b2b 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -62,7 +62,7 @@ class crm_phonecall(osv.osv): ('object_id.model', '=', 'crm.phonecall')]"), 'partner_phone': fields.char('Phone', size=32), 'partner_mobile': fields.char('Mobile', size=32), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), 'date_closed': fields.datetime('Closed', readonly=True), 'date': fields.datetime('Date'), 'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), @@ -75,7 +75,7 @@ class crm_phonecall(osv.osv): _defaults = { 'date': fields.datetime.now, - 'priority': crm.AVAILABLE_PRIORITIES[2][0], + 'priority': '1', 'state': _get_default_state, 'user_id': lambda self, cr, uid, ctx: uid, 'active': 1 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/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index bd611ff7da7..f51cd847c6b 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -103,7 +103,7 @@ - + diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 6a3e3bf208b..7365e224b22 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -42,7 +42,7 @@ class crm_phonecall_report(osv.osv): _columns = { 'user_id':fields.many2one('res.users', 'User', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), 'nbr': fields.integer('# of Cases', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), 'create_date': fields.datetime('Create Date', readonly=True, select=True), diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 4d44b90c2f2..641c490cabb 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -88,7 +88,7 @@ class crm_claim(osv.osv): 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.claim')]"), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), 'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'), 'user_id': fields.many2one('res.users', 'Responsible'), 'user_fault': fields.char('Trouble Responsible', size=64), @@ -111,7 +111,7 @@ class crm_claim(osv.osv): 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), 'date': fields.datetime.now, 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), - 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], + 'priority': '1', 'active': lambda *a: 1, 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c) } diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml index 2448fe5d0c5..9dd6638ffd6 100644 --- a/addons/crm_claim/crm_claim_demo.xml +++ b/addons/crm_claim/crm_claim_demo.xml @@ -9,7 +9,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index e7724cb3b6d..b6d43c4b140 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -107,7 +107,7 @@ - + diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index d389f690fb4..9628165d27f 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -23,11 +23,9 @@ from openerp.osv import fields,osv from openerp import tools AVAILABLE_PRIORITIES = [ - ('5', 'Lowest'), - ('4', 'Low'), - ('3', 'Normal'), - ('2', 'High'), - ('1', 'Highest') + ('0', 'Low'), + ('1', 'Normal'), + ('2', 'High') ] diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index c1cd6d2ff91..faa3ae01041 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -59,7 +59,7 @@ class crm_helpdesk(osv.osv): 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'planned_revenue': fields.float('Planned Revenue'), 'planned_cost': fields.float('Planned Costs'), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), 'probability': fields.float('Probability (%)'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="['|',('section_id','=',False),('section_id','=',section_id),\ @@ -83,7 +83,7 @@ class crm_helpdesk(osv.osv): 'state': lambda *a: 'draft', 'date': fields.datetime.now, 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), - 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], + 'priority': '1', } def on_change_partner_id(self, cr, uid, ids, partner_id, context=None): diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml index 1370bf6d906..a0933fbb0be 100644 --- a/addons/crm_helpdesk/crm_helpdesk_demo.xml +++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml @@ -5,7 +5,7 @@ - 3 + 1 draft @@ -17,7 +17,7 @@ - 3 + 1 draft @@ -42,7 +42,7 @@ - 3 + 1 draft How to create a new module diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 79615715f5f..464e33973b6 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -51,7 +51,7 @@ - + diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index ef48b6005e9..9c69f5db94b 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -25,12 +25,11 @@ from openerp.tools.translate import _ AVAILABLE_PRIORITIES = [ - ('', ''), - ('5', 'Not Good'), - ('4', 'On Average'), + ('0', 'Bad'), + ('1', 'Below Average'), + ('2', 'Average'), ('3', 'Good'), - ('2', 'Very Good'), - ('1', 'Excellent') + ('4', 'Excellent') ] class hr_recruitment_source(osv.osv): @@ -489,21 +488,6 @@ class hr_applicant(osv.Model): dict_act_window['view_mode'] = 'form,tree' return dict_act_window - def set_priority(self, cr, uid, ids, priority, *args): - """Set applicant priority - """ - return self.write(cr, uid, ids, {'priority': priority}) - - def set_high_priority(self, cr, uid, ids, *args): - """Set applicant priority to high - """ - return self.set_priority(cr, uid, ids, '1') - - def set_normal_priority(self, cr, uid, ids, *args): - """Set applicant priority to normal - """ - return self.set_priority(cr, uid, ids, '3') - def get_empty_list_help(self, cr, uid, help, context=None): context['empty_list_help_model'] = 'hr.job' context['empty_list_help_id'] = context.get('default_job_id', None) diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml index 3d6c05c1489..0d00efd3f84 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.xml +++ b/addons/hr_recruitment/hr_recruitment_demo.xml @@ -75,7 +75,7 @@ - 4 + 2 David Armstrong 33968745 diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 9530bb2b62f..b71e61d5c9c 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -130,7 +130,7 @@ - + @@ -293,22 +293,11 @@
-
- - - - - - - - - - - - - - - +
+ +
+ +
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 5a473469b2d..e3f2cd6668b 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -48,7 +48,7 @@ class report_project_task_user(osv.osv): help="Number of Days to Open the task"), 'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True), 'nbr': fields.integer('# of tasks', readonly=True), - 'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')], + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], string='Priority', readonly=True), 'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index e07d4dbe957..6c06f14d5fa 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -57,6 +57,7 @@ class project_issue(osv.Model): }, 'kanban_state': { 'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked', + 'project_issue.mt_issue_ready': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done', }, } @@ -250,7 +251,7 @@ class project_issue(osv.Model): " * Normal is the default situation\n" " * Blocked indicates something is preventing the progress of this issue\n" " * Ready for next stage indicates the issue is ready to be pulled to the next stage", - readonly=True, required=False), + required=False), 'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1), 'email_cc': fields.char('Watchers Emails', size=256, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 'date_open': fields.datetime('Opened', readonly=True,select=True), @@ -260,7 +261,7 @@ class project_issue(osv.Model): 'date_last_stage_update': fields.datetime('Last Stage Update', select=True), 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), 'categ_ids': fields.many2many('project.category', string='Tags'), - 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), + 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True), 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', track_visibility='onchange', select=True, @@ -295,7 +296,7 @@ class project_issue(osv.Model): 'active': 1, 'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c), 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), - 'priority': crm.AVAILABLE_PRIORITIES[2][0], + 'priority': '1', 'kanban_state': 'normal', 'date_last_stage_update': fields.datetime.now, 'user_id': lambda obj, cr, uid, context: uid, @@ -305,19 +306,6 @@ class project_issue(osv.Model): 'stage_id': _read_group_stage_ids } - def set_priority(self, cr, uid, ids, priority, *args): - return self.write(cr, uid, ids, {'priority' : priority}) - - def set_high_priority(self, cr, uid, ids, *args): - """Set lead priority to high - """ - return self.set_priority(cr, uid, ids, '1') - - def set_normal_priority(self, cr, uid, ids, *args): - """Set lead priority to normal - """ - return self.set_priority(cr, uid, ids, '3') - def copy(self, cr, uid, id, default=None, context=None): issue = self.read(cr, uid, id, ['name'], context=context) if not default: @@ -375,15 +363,6 @@ class project_issue(osv.Model): # Stage management # ------------------------------------------------------- - def set_kanban_state_blocked(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context) - - def set_kanban_state_normal(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context) - - def set_kanban_state_done(self, cr, uid, ids, context=None): - return self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) - def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None): """ Override of the base.stage method Parameter of the stage search taken from the issue: diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index d60106dffd2..fced1bd8c72 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -48,6 +48,12 @@ Access all issues from the top Project menu, and access the issues of a specific Issue blocked
+ + Issue Ready for Next Stage + project.issue + + Issue Ready for Next Stage + Stage Changed project.issue diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index 63fa37c84c3..4ed2f090e24 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -35,7 +35,7 @@ - 5 + 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 diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 247acbb696f..4e53c056772 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -52,13 +52,12 @@ options="{'fold_field': 'fold'}"/> +
+ +