From 52a35371b15076302d85eb988f4ea203eac1b88f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 2 Apr 2013 11:25:47 +0200
Subject: [PATCH] [FIX] javascript error that made the application crash when a
 on_change returns a warning

lp bug: https://launchpad.net/bugs/1161772 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130402092547-rid9bjbxv92ukqti
---
 addons/web/static/src/xml/base.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 41067240b52..405ee81e0cd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -40,11 +40,11 @@
         <td>
             <p>
                 <t t-js="d">
-                    var message = d.error.data.message || d.error.data.fault_code;
-                    d.error.html_error = context.engine.tools.html_escape(message)
+                    var message = d.message ? d.message : d.error.data.message;
+                    d.html_error = context.engine.tools.html_escape(message)
                         .replace(/\n/g, '<br/>');
                 </t>
-                <t t-raw="error.html_error"/>
+                <t t-raw="html_error"/>
             </p>
         </td>
     </tr>