summaryrefslogtreecommitdiff
path: root/addons/website/models/ir_qweb.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-10-21 14:59:56 +0200
committerChristophe Simonis <chs@odoo.com>2014-10-21 14:59:56 +0200
commita42167d085e8c4989412c39ec4e21685ebd93cd2 (patch)
treefc8cf942fe689de94aec631d5b8d7365693de5d0 /addons/website/models/ir_qweb.py
parentd822766296fed8f72d3168c675d4cf0b89e73f0c (diff)
parent262eb662de489d98b76dece7305b594399161014 (diff)
[MERGE] forward port of branch 8.0 up to 262eb66
Diffstat (limited to 'addons/website/models/ir_qweb.py')
-rw-r--r--addons/website/models/ir_qweb.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 7eba7c585be..019eedd3686 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -438,6 +438,9 @@ class Contact(orm.AbstractModel):
_name = 'website.qweb.field.contact'
_inherit = ['ir.qweb.field.contact', 'website.qweb.field.many2one']
+ def from_html(self, cr, uid, model, column, element, context=None):
+ return None
+
class QwebView(orm.AbstractModel):
_name = 'website.qweb.field.qweb'
_inherit = ['ir.qweb.field.qweb']