diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index c409ce2aef2..d09e0bf8ba5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -186,6 +186,12 @@ class crm_lead(crm_case, osv.osv): 'date_action': fields.date('Next Action Date'), 'title_action': fields.char('Next Action', size=64), 'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), + 'color': fields.integer('Color Index'), + 'partner_address_name': fields.related('partner_address_id', 'name', type='char', string='Partner Contact Name', readonly=True), + 'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True), + 'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True), + 'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True), + } _defaults = { @@ -197,6 +203,7 @@ class crm_lead(crm_case, osv.osv): 'section_id': crm_case._get_section, '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], + 'color': 0, #'stage_id': _get_stage_id, } @@ -312,6 +319,21 @@ class crm_lead(crm_case, osv.osv): self.log(cr, uid, l.id, message) return res + def set_priority(self, cr, uid, ids, priority): + """Set lead priority + """ + 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 convert_opportunity(self, cr, uid, ids, context=None): """ Precomputation for converting lead to opportunity """ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index f76d32b1710..c00b1f3ce68 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -298,60 +298,63 @@ crm.lead kanban - + + + + + -
-
-
-
- - -
-
-
+ +
+
+ + + + + + +
+ + + + + +
-
-
- +
+
+ +
+
+ +
+
+ +
+
+ : +
-
-
-
- : -
- -
-
- - - - - - - - +
+
+ + + + + + + +
+
+ + + +
+
-
- - - - - - - -
-
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index a84423a4703..0f0c4a9ca0b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -297,7 +297,7 @@ - + @@ -312,6 +312,63 @@ + + + + project.task.kanban + project.task + kanban + + + + + + #fff + #dfd + lightcyan + red +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Title :
Progress :
Project name:
Phase
Remain Time :
Spent Time :
Remain Time :
+
+ + + + + + project.task.tree project.task @@ -437,7 +494,7 @@ Tasks project.task form - tree,form,calendar,gantt,graph + tree,form,calendar,gantt,graph,kanban {"search_default_user_id":uid, "search_default_current": 1} @@ -450,7 +507,7 @@ Overpassed Tasks project.task form - tree,form,calendar,graph + tree,form,calendar,graph,kanban [('date_deadline','<',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))] @@ -461,7 +518,7 @@ project.task Project's tasks form - tree,form,calendar,graph,gantt + tree,form,calendar,graph,gantt,kanban [('project_id', 'child_of', [active_id])] {'project_id':active_id, 'active_test':False}