From 222c7308fe3b93a2cf1014f6cb6defd41f036ac1 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 8 Sep 2015 12:58:47 +0200 Subject: [PATCH] [FIX] js assets: date comparison using wrong types --- openerp/addons/base/ir/ir_qweb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 50a64ed7bcf..e082c465e0d 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -27,6 +27,7 @@ import openerp.http import openerp.tools from openerp.tools.func import lazy_property import openerp.tools.lru +from openerp.fields import Datetime from openerp.http import request from openerp.tools.safe_eval import safe_eval as eval from openerp.osv import osv, orm, fields @@ -1252,7 +1253,7 @@ class AssetsBundle(object): def js(self): attachments = self.get_attachments('js') - if not attachments or attachments[0]['__last_update'] < max([asset.last_modified for asset in self.javascripts]): + if not attachments or attachments[0]['__last_update'] < Datetime.to_string(max([asset.last_modified for asset in self.javascripts])): content = ';\n'.join(asset.minify() for asset in self.javascripts) return self.save_attachment('js', content) return attachments[0]