[MERGE] from trunk

bzr revid: chm@openerp.com-20130131142200-yk9h6h1xt1kjobgf

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/mail/doc/mail_message.rst

@@ -4,7 +4,7 @@ mail.message
 ============
 
 Models
-+++++++
+++++++
 
 ``mail.message`` is a class for holding the main attributes of a message object
 (notification for system message, reciving email message or sent messages). It 
@@ -19,7 +19,8 @@ should inherit from this class.
 .. versionchanged:: 7.0
 
 ClientAction (ir.actions.client)
-+++++++
+++++++++++++++++++++++++++++++++
+
      <record id="action_mail_inbox_feeds" model="ir.actions.client">
          <field name="name">Inbox</field>
          <field name="tag">mail.wall</field>
@@ -56,7 +57,7 @@ ClientAction (ir.actions.client)
       - ``readonly`` : Read only mode, hide all action buttons and composer
 
 Fields
-+++++++
+++++++
 
  - ``type`` : usually 'email', 'comment', 'notification'.
    Message type: email for external email message recieve, notification for system
@@ -64,7 +65,7 @@ Fields
  - ``subtype_id`` :
    Subtype of the notification for system message. The users can followe a document
    and choose the subtype of this document (eg: Create, Comment, Done).
-   You can defined new subtypes and choose his name, by agreement the id begin by "mt_" on the model
+   You can defined new subtypes and choose his name, by agreement the id begin by "mt\_" on the model
    "mail.message.subtype".
  - ``partner_ids`` :
    List of recipients, the recipients have this message in their personal mailboxe.
@@ -104,4 +105,4 @@ Methods
    sort by id. The messages that the user can read but not in his search, are group in
    expandable messages. The expandable messages contain the domain to expand.
  - ``check_access_rule`` :
-   Overwrite the initial message for this model.
+   Overwrite the initial message for this model.

addons/mail/doc/mail_state.rst

@@ -1,7 +1,7 @@
 .. _mail_state:
 
 message_unread
-=============
+==============
 
 ``message_unread`` is a boolean field that states whether the document
 has unread messages. In previous versions, some documents were going
@@ -10,7 +10,7 @@ gateway. Now the state related to messages differs from the state or
 stage of the document itself.
 
 message_unread and need action mechanism
-+++++++++++++++++++++++++++++++++++++++
+++++++++++++++++++++++++++++++++++++++++
 
 The ``mail`` module introduces a default behavior for the need_action
 mechanism [REF].

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,
                         });