diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d6cea46f0f7..9a1c2856e25 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -199,7 +199,6 @@ class crm_case_section(osv.osv): 'open_lead_per_duration': fields.function(_get_open_lead_per_duration, string='Open Leads per duration', type="string", readonly=True), 'won_opportunity_per_duration': fields.function(_get_won_opportunity_per_duration, string='Rate of opporunities whon per duration', type="string", readonly=True) - } def _get_stage_common(self, cr, uid, context): diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml index c32ce4e6451..183eeceedbd 100644 --- a/addons/crm/crm_case_section_view.xml +++ b/addons/crm/crm_case_section_view.xml @@ -101,11 +101,11 @@
Leads - + Number of opening leads per duration.
(last one is )
Opportunities - + Rate of won opportunities per duration.
(last one is )
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css index a64dd76b5fb..128f3daf31c 100644 --- a/addons/crm/static/src/css/crm.css +++ b/addons/crm/static/src/css/crm.css @@ -64,4 +64,5 @@ .openerp .oe_kanban_view .oe_sparkline_bar { float: right; + height: 20px; } \ No newline at end of file diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js index a228d09f4ed..fd307880afd 100644 --- a/addons/crm/static/src/js/crm_case_section.js +++ b/addons/crm/static/src/js/crm_case_section.js @@ -61,7 +61,14 @@ openerp.crm = function(openerp) { }); } }); - setTimeout(function () {self.$(".oe_sparkline_bar").sparkline('html', {type: 'bar', barWidth: 5} );}, 0); + setTimeout(function () { + self.$(".oe_sparkline_bar").each(function () { + var $el = $(this); + $el.data("title", $el.html()); + $el.sparkline($el.data("value").split(','), {type: 'bar', barWidth: 5} ); + $el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return $(this).data("title")}, 'gravity': 'n'}); + }); + }, 0); }); } }, diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index f3453dda7a0..961ac059fa2 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -227,26 +227,29 @@ + + + +
- QuotationsQuotation - + Quotations + jhfhgj
- Sales OrdersSales Order - - + Sales Orders + jfhjh
- InvoicesInvoice - + Invoices + jfghjgh