Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

FIX

pull/2325/head
Nicolas Mac Rouillon 2016-12-27 16:57:47 -03:00 committed by Sylvain LE GAL
parent 6f94b6144e
commit e47da159d7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web_dashboard_tile/models/tile_tile.py
View File

@ -106,7 +106,7 @@ class TileTile(models.Model):
'ir.model.fields',
string='Field',
domain="[('model_id', '=', model_id),"
" ('ttype', 'in', ['float', 'integer'])]")
" ('ttype', 'in', ['float', 'integer', 'monetary'])]")
primary_format = fields.Char(
string='Format',
help='Python Format String valid with str.format()\n'
@ -126,7 +126,7 @@ class TileTile(models.Model):
'ir.model.fields',
string='Secondary Field',
domain="[('model_id', '=', model_id),"
" ('ttype', 'in', ['float', 'integer'])]")
" ('ttype', 'in', ['float', 'integer', 'monetary'])]")
secondary_format = fields.Char(
string='Secondary Format',
help='Python Format String valid with str.format()\n'

9
web_dashboard_tile/static/src/js/custom_js.js
View File

@ -19,11 +19,12 @@
//
//#############################################################################
odoo.web_dashboard_tile = function (instance)
odoo.web_dashboard_tile = function (require)
{
var QWeb = instance.web.qweb,
_t = instance.web._t,
_lt = instance.web._lt;
var QWeb = require('web.qweb')
var _t = require('web._t')
var _lt = require('web._lt')
_.mixin({
sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); }
});