Merge lp:~openerp-dev/openerp-web/trunk-qwebreport-pos-sle into lp:openerp-web

[sle-openerp]

[lp:~openerp-dev/openerp-web/trunk-qwebreport-pos-sle]

3977. By sle-openerp on 2014-04-16

[MERGE] trunk

3978. By sle-openerp on 2014-04-17

[MERGE] trunk

3979. By sle-openerp on 2014-04-22

[MERGE] trunk

3980. By sle-openerp on 2014-04-24

[MERGE] trunk

3981. By sle-openerp on 2014-04-28

[MERGE] trunk

3982. By sle-openerp on 2014-04-29

[MERGE] trunk

=== modified file 'addons/web/static/src/js/core.js'
--- addons/web/static/src/js/core.js	2014-04-18 15:25:11 +0000
+++ addons/web/static/src/js/core.js	2014-04-29 12:43:38 +0000
@@ -460,14 +460,11 @@
             .appendTo(document.body)
             .load(function () {
                 try {
-                   if (options.error) {
-                         if (!this.contentDocument.body.childNodes[1]) {
-                            options.error(this.contentDocument.body.childNodes);
-                        }
-                        else {
-                            options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent));
-                        }
-                   }
+                    if (options.error) {
+                        var body = this.contentDocument.body;
+                        var node = body.childNodes[1] || body.childNodes[0];
+                        options.error(JSON.parse(node.textContent));
+                    }
                 } finally {
                     complete();
                 }