openerp-dev-web team mailing list archive

["Chirag Patel \(OpenERP\)" <cpa@xxxxxxxxxxx>]

Chirag Patel (OpenERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-opw-4489-cpa into lp:openobject-client-web.

Requested reviews:
  OpenERP SA's Web Client R&D (openerp-dev-web)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4489-cpa/+merge/53993

- Fixed date format problem for custom-filters.
- Enter Key is working on custom-filters now.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-4489-cpa/+merge/53993
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-opw-4489-cpa.

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2011-03-18 10:58:29 +0000
+++ addons/openerp/controllers/search.py	2011-03-18 14:03:18 +0000
@@ -215,7 +215,7 @@
                     datas = {field: fld}
 
                     try:
-                        TinyForm(**data).to_python()
+                        TinyForm(**datas).to_python()
                     except TinyFormError, e:
                         errors.append({e.field: ustr(e)})
                     except Exception, e:
@@ -371,6 +371,7 @@
             group_by_ctx = [group_by_ctx]
         if group_by_ctx:
             search_data['group_by_ctx'] = group_by_ctx
+        ncustom_domain = convert_date_format_in_domain(ncustom_domain, res, context)
         return dict(domain=ustr(domain), context=ustr(ctx), search_data=ustr(search_data), filter_domain=ustr(ncustom_domain))
 
     @expose()

=== modified file 'addons/openerp/static/javascript/search.js'
--- addons/openerp/static/javascript/search.js	2011-03-18 10:58:29 +0000
+++ addons/openerp/static/javascript/search.js	2011-03-18 14:03:18 +0000
@@ -742,7 +742,7 @@
             (fil_dom.length && fil_dom.val() != '[]')) {
         filter_table.show();
     }
-    jQuery('#search_filter_data').keydown(search_on_return);
+    jQuery('#search_filter_data, #filter_option_table').keydown(search_on_return);
 }
 
 jQuery(document).ready(initialize_search);

=== modified file 'openobject/i18n/format.py'
--- openobject/i18n/format.py	2011-03-02 15:05:11 +0000
+++ openobject/i18n/format.py	2011-03-18 14:03:18 +0000
@@ -264,7 +264,12 @@
                         user_dformat = user_dformat.replace(k, v)
                 if re.findall(r'%[CGsuV]', user_dformat):
                     ok = False
-
+                    
+                val_is_list = False    
+                if isinstance(val, list):
+                    val_is_list = True
+                    val = val[0]
+                    
                 if ok:
                     val = parse_datetime(val, dtype)
                     if val:
@@ -274,7 +279,8 @@
                         val = parse_datetime(formated_date, dtype)
                         if val:
                             val = DT.datetime.strptime( DT.datetime.strptime(val, server_dformat).strftime(user_dformat), user_dformat).strftime(server_dformat)
-
+                if val_is_list:
+                    val = [val]
             fixed_domain.append((key, op, val))
 
     return fixed_domain