Merge lp:~unifield-team/unifield-web/OEB-26-34 into lp:unifield-web

[Matthieu Dietrich @ camptocamp]

=== modified file 'addons/openerp/controllers/templates/error_page.mako'
--- addons/openerp/controllers/templates/error_page.mako	2011-01-18 13:35:04 +0000
+++ addons/openerp/controllers/templates/error_page.mako	2011-07-04 15:32:27 +0000
@@ -50,13 +50,31 @@
                 jQuery.fancybox.close();
                 return;
             }
+
+            var topWindow;
+            if(window.top != window) {
+                topWindow = window.top;
+            } else {
+                topWindow = window.opener;
+            }
+            var $doc = jQuery(topWindow.document);
+            var terp_id = jQuery(idSelector('_terp_id'), $doc).val();
+
+            var frame_element;
+            if(jQuery(window).attr('frameElement')) {
+               frame_element = window.frameElement;
+            } else {
+               frame_element = jQuery.fancybox;
+            }
+
+            if (terp_id) {
+                frame_element.close();
+                return;
+            }
+
             if (history.length > 1) {
                 history.back();
-				if(jQuery(window).attr('frameElement')) {
-					window.frameElement.close();
-				} else {
-				jQuery.fancybox.close();
-				}
+                frame_element.close();
             } else {
                 window.close();
             }
 
=== modified file 'addons/openerp/static/css/style.css'
--- addons/openerp/static/css/style.css	2011-01-28 15:23:17 +0000
+++ addons/openerp/static/css/style.css	2011-07-04 15:32:27 +0000
@@ -489,6 +489,8 @@
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .error_message_header {
 
=== modified file 'addons/openerp/widgets/form_view.py'
--- addons/openerp/widgets/form_view.py	2011-01-19 01:49:26 +0000
+++ addons/openerp/widgets/form_view.py	2011-07-04 15:32:27 +0000
@@ -60,7 +60,7 @@
         search_param = params.search_domain or []
         params_domain = params.domain or []
         for element in params_domain:
-            if element not in search_param:
+            if element not in search_param or len(element) == 1:
                 if not isinstance(element,tuple):
                     search_param.append(element)
                 else: