From ccd7a157092c9b9d7708c14b9d263d47a92f233b Mon Sep 17 00:00:00 2001 From: Damien Bouvy Date: Mon, 25 Apr 2016 18:28:01 +0200 Subject: [PATCH] [FIX] base: fixes previous fix In fix e248882, the previous elif statement prevented the execution of the fix code. This fix fixes the fix. --- openerp/addons/base/ir/ir_http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index 5148b11c8d8..e04bd270eea 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -300,7 +300,7 @@ class ir_http(osv.AbstractModel): mimetype = obj.mimetype elif filename: mimetype = mimetypes.guess_type(filename)[0] - elif getattr(env[model]._fields[field], 'attachment', False): + if not mimetype and getattr(env[model]._fields[field], 'attachment', False): # for binary fields, fetch the ir_attachement for mimetype check attach_mimetype = env['ir.attachment'].search_read(domain=[('res_model', '=', model), ('res_id', '=', id), ('res_field', '=', field)], fields=['mimetype'], limit=1) mimetype = attach_mimetype and attach_mimetype[0]['mimetype']