odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] sale_crm: fix JustGage widget 

bzr revid: chm@openerp.com-20130506081354-ulx7c02wo4uxq2h7
This commit is contained in:
Christophe Matthieu 2013-05-06 10:13:54 +02:00
parent 64eceedcb9
commit 137859f01e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/sale_crm/sale_crm.py
View File

@ -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()

3
addons/sale_crm/static/src/js/sale_crm.js
View File

@ -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()