diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index fd6b95d81f9..9262b3138a0 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -8,106 +8,58 @@ tree + + - + + + - My Open Opportunities + My Opportunities crm.lead form tree,form - [('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')] + [('user_id','=',uid),('type', '=', 'opportunity')] {'default_user_id': uid, 'default_type': 'opportunity'} - - - tree - - - - - - form - - - - - - crm.lead.report.graph - crm.lead.report - graph + + + + Leads + crm.lead + tree - + + + + + + - - + + + - - Planned Revenue By Stage - crm.lead.report - form - graph,tree,form - - [('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&', ('state', '=', 'done'), ('date_closed','>=',datetime.date.today().strftime('%Y-%m-01'))] - {'search_default_Stage':1} - - - - Sales Dashboard Form - board.board - form - -
- - - - - - - - -
-
-
- - CRM - board.board - form - form - menu - + + + + New Lead + crm.lead + tree + - - Opportunities By Categories - Graph - crm.lead.report - graph - - - - - - - - - Opportunities By Categories - crm.lead.report - form - graph,tree,form - - [('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')] - {'search_default_Category':1} - - + Opportunities By Stage - Graph crm.lead.report @@ -118,7 +70,9 @@ - + + + Opportunities By Stage crm.lead.report @@ -128,29 +82,43 @@ [('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')] {'search_default_Stage':1} - + + Opportunities By Stage Per User - Graph crm.lead.report graph - + + + Planned Revenue By User and Stage crm.lead.report form graph,tree,form - [('state','!=','cancel')] + [('state','!=','cancel'),('opening_date','>',datetime.date.today().strftime("%Y-%m-%d"))] {'search_default_Stage':1} - + + + + Meetings + crm.meeting + calendar,tree,form,gantt + + {"calendar_default_user_id":uid} + [('state','=','open'),('date','>',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))] + + + CRM - Statistical Dashboard Form board.board @@ -159,29 +127,36 @@
- - + + + +
+ + - CRM Manager + CRM Dashboard board.board form form menu + + + diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 82bc50eafea..af65474ef4b 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -669,7 +669,7 @@ class crm_lead(base_stage, osv.osv): def _send_mail_to_salesman(self, cr, uid, lead, context=None): """ - Send mail to salesman with updated Lead details. + Send mail to salesman with updated Lead details.` @ lead: browse record of 'crm.lead' object. """ #TOFIX: mail template should be used here instead of fix subject, body text. diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 02fc3369041..03e5a15feff 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -87,7 +87,6 @@ You and your team(s) will be able to plan meetings and phone calls from opportun
- form diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 7c0b2f6cfa4..e68abc5e32f 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -9,7 +9,7 @@ src_model="res.partner" view_mode="calendar,tree,form,gantt" context="{'search_default_partner_id': active_id, 'default_duration': 4.0}" - domain="[('partner_id', '=', active_id)]" + domain="[('partner_id', '=', active_id) ]" />