Merge lp:~jfb-tempo-consulting/unifield-web/bklg-78 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/templates/error_page.mako'
--- addons/openerp/controllers/templates/error_page.mako	2011-12-23 10:27:14 +0000
+++ addons/openerp/controllers/templates/error_page.mako	2015-05-21 15:51:19 +0000
@@ -201,6 +201,15 @@
                     % else:
                          <script type="text/javascript">
                             jQuery('.save_close:eq(0) button').removeAttr('disabled');
+
+                            function close_me() {
+                                if (typeof close_error_window !== 'undefined') {
+                                    return close_error_window();
+                                }
+                                if (parent.window) {
+                                    parent.window.close_this_frame();
+                                }
+                            }
                          </script>
                         <table class="errorbox" align="center">
                             <tr>
@@ -215,7 +224,7 @@
                             <tr>
                                 <td colspan="2" align="right" style="padding: 1px">
                                     <a class="button-a" href="javascript: void(0)"
-                                       onclick="close_error_window()">OK</a>
+                                       onclick="close_me()">OK</a>
                                 </td>
                             </tr>
                         </table>

=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2013-05-22 08:51:40 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2015-05-21 15:51:19 +0000
@@ -8,6 +8,15 @@
  * @default afterLoad callback to execute after URL has been loaded and
  *                    inserted, if any.
  */
+
+function close_this_frame() {
+    /* less intrusive than UF-2513 */
+    fr = jQuery('.ui-icon-closethick')
+    if (fr && fr.length) {
+        fr[0].click();
+    }
+}
+
 function openLink(url /*optional afterLoad */) {
     var $app = jQuery('#appContent');
     var afterLoad = arguments[1];