[MERGE] from trunk

bzr revid: chm@openerp.com-20130131094016-245nk6scqsdkzyl0

addons/edi/static/src/js/edi.js

@@ -63,8 +63,8 @@ instance.edi.EdiImport = instance.web.Widget.extend({
     on_imported_error: function(response){
         var self = this;
         var msg = _t("Sorry, the document could not be imported.");
-        if (response.data.fault_code) {
-            msg += "\n " + _t("Reason:") + response.data.fault_code;
+        if (response.data.message) {
+            msg += "\n " + _t("Reason:") + response.data.message;
         }
         var params = {error: response, message: msg};
         $(instance.web.qweb.render("CrashManager.warning", params)).dialog({

addons/survey/wizard/survey_print.py

@@ -1,5 +1,4 @@
-
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution

addons/web_analytics/static/src/js/web_analytics.js

@@ -227,7 +227,7 @@ openerp.web_analytics = function(instance) {
                     if (error.code) {
                         t._push_event({
                             'category': error.message,
-                            'action': error.data.fault_code,
+                            'action': error.data.message,
                             'label': url,
                             'noninteraction': true,
                         });