From 137859f01e2551767396b3a4df0f3e814df47062 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 6 May 2013 10:13:54 +0200 Subject: [PATCH] [FIX] sale_crm: fix JustGage widget bzr revid: chm@openerp.com-20130506081354-ulx7c02wo4uxq2h7 --- addons/sale_crm/sale_crm.py | 16 ++++++++-------- addons/sale_crm/static/src/js/sale_crm.js | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index 798c6a0d86b..0576bf6d731 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -56,9 +56,9 @@ class crm_case_section(osv.osv): if when: domain += [('date_order', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))] rate = 0 - opportunity_ids = obj.search(cr, uid, domain, context=context) - for invoice in obj.browse(cr, uid, opportunity_ids, context=context): - rate += invoice.amount_total + order_ids = obj.search(cr, uid, domain, context=context) + for order in obj.browse(cr, uid, order_ids, context=context): + rate += order.amount_total rate_invoice.append(rate) rate_invoice.reverse() res[section.id] = rate_invoice @@ -77,9 +77,9 @@ class crm_case_section(osv.osv): if when: domain += [('date_confirm', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))] rate = 0 - opportunity_ids = obj.search(cr, uid, domain, context=context) - for invoice in obj.browse(cr, uid, opportunity_ids, context=context): - rate += invoice.amount_total + order_ids = obj.search(cr, uid, domain, context=context) + for order in obj.browse(cr, uid, order_ids, context=context): + rate += order.amount_total rate_invoice.append(rate) rate_invoice.reverse() res[section.id] = rate_invoice @@ -98,8 +98,8 @@ class crm_case_section(osv.osv): if when: domain += [('date', '<', dates[when-1].strftime(tools.DEFAULT_SERVER_DATE_FORMAT))] rate = 0 - opportunity_ids = obj.search(cr, uid, domain, context=context) - for invoice in obj.browse(cr, uid, opportunity_ids, context=context): + invoice_ids = obj.search(cr, uid, domain, context=context) + for invoice in obj.browse(cr, uid, invoice_ids, context=context): rate += invoice.price_total rate_invoice.append(rate) rate_invoice.reverse() diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js index 066ec062f70..7284dea57e9 100644 --- a/addons/sale_crm/static/src/js/sale_crm.js +++ b/addons/sale_crm/static/src/js/sale_crm.js @@ -12,7 +12,8 @@ openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({ label = this.getParent().record[this.options.label_field].raw_value; } var title = this.$node.html(); - var value = _.isArray(this.field.value) ? this.field.value.pop() : this.field.value; + var val = this.field.value; + var value = _.isArray(val) && val.length ? val[val.length-1] : val; var unique_id = _.uniqueId("JustGage"); this.$el.empty()