Merge lp:~unifield-team/unifield-web/uf-1309 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2013-03-01 13:00:15 +0000
+++ addons/openerp/static/javascript/form.js	2013-03-27 17:27:32 +0000
@@ -187,11 +187,12 @@
                     jQuery("<tr>").append(
                         jQuery("<td>", {'colspan': 2, align: 'right'}).append(
                             jQuery("<a>", {'class': 'button-a', 'href': 'javascript: void(0)'})
-                            .click(function(){jQuery.fancybox.close();})
+                            //.click(function(){jQuery.fancybox.close();})
+                            .click(function(){window.top.jQuery.fancybox.close();})
                             .text('OK')
                         )
                 ));
-    jQuery.fancybox(error, {scrolling: 'no'});
+    window.top.jQuery.fancybox(error, {scrolling: 'no'});
 }