diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 53e0207fc5a..37c2c1781d6 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -155,14 +155,5 @@ menu - - - - diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index b53028c952a..0e479d33737 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -204,7 +204,6 @@ class crm_lead(crm_case, osv.osv): '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, } def onchange_partner_address_id(self, cr, uid, ids, add, email=False): diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 66b3c8805e4..dbd5ac7db44 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -32,5 +32,104 @@ + + + + My Quotations + sale.order + form + tree,form + [('state','=','draft'),('user_id','=',uid)] + + + + + turnover.by.month.tree + account.invoice.report + tree + + + + + + + + + + + + turnover.by.month.graph + account.invoice.report + + + graph + + + + + + + + + + Monthly Turnover + account.invoice.report + form + graph,tree + + [('year','ilike',time.strftime('%Y')),('user_id','=',uid)] + {'group_by_no_leaf':1,'group_by':['month']} + + + + + + graph + + + + + + tree + + + + + board.sales.form + board.board + form + +
+ + + + + + + + +
+
+
+ + + Sales Dashboard + board.board + form + form + + + + + diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml index 27adce0ca9d..74c9d4f70c7 100644 --- a/addons/sale_crm/board_sale_crm_view.xml +++ b/addons/sale_crm/board_sale_crm_view.xml @@ -1,110 +1,70 @@ - - - - Quotations - sale.order - form - tree,form - [('state','=','draft'),('user_id','=',uid)] - - - - - turnover.by.month.tree - account.invoice.report - tree - - - - - - - - - - - - turnover.by.month.graph - account.invoice.report - - - graph - - - - - - - - - - Monthly Turnover - account.invoice.report - form - graph,tree - - [('year','ilike',time.strftime('%Y')),('user_id','=',uid)] - {'group_by_no_leaf':1,'group_by':['month']} - - - - - graph - - - - - tree - - - - - board.crm.form.inherit.child1 - board.board - form - - - - - - - - - + + board.crm.form.inherit.replace1 board.board form - + - - - + + + - board.crm.form.inherit.replace2 + board.crm.form.inherit.replace1 board.board form - + - - Opportunities by Stage - + + + + + board.crm.form.inherit.replace1 + board.board + form + + + + + + + + + + board.crm.form.inherit.replace1 + board.board + form + + + + + + +