openerp-dev-web team mailing list archive

["Amit Dodiya \(OpenERP\)" <ado@xxxxxxxxxxx>]

Amit Dodiya (OpenERP) has proposed merging lp:~openerp-dev/openobject-client/6.0-bug-749311-ado into lp:openobject-client/6.0.

Requested reviews:
  Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
  Bug #749311 in OpenERP GTK Client: "[6.0.2] Problem with advanced filter in French."
  https://bugs.launchpad.net/openobject-client/+bug/749311

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-749311-ado/+merge/60375

Hello,

   This fixes the bug 749311.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/6.0-bug-749311-ado/+merge/60375
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/6.0-bug-749311-ado.

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2011-02-01 13:58:58 +0000
+++ bin/widget/screen/screen.py	2011-05-09 13:03:28 +0000
@@ -938,7 +938,5 @@
             return True
         process(self.widget, value)
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'bin/widget_search/custom_filter.py'
--- bin/widget_search/custom_filter.py	2011-01-25 10:58:55 +0000
+++ bin/widget_search/custom_filter.py	2011-05-09 13:03:28 +0000
@@ -44,9 +44,8 @@
 
         fields = attrs.get('fields',None)
         for item in fields:
-            self.field_selection[item[1]] = (item[0], item[2], item[3])
+            self.field_selection[item[1].encode('utf-8')] = (item[0], item[2], item[3])
             self.combo_fields.append_text(item[1])
-
         self.combo_fields.set_active(0)
 
         # Processing operator combo
@@ -62,9 +61,8 @@
                 ['in',_('in')],
                 ['not in',_('not in')],
                 ):
-            self.op_selection[item[1]] = item[0]
+            self.op_selection[item[1].encode('utf-8')] = item[0]
             self.combo_op.append_text(item[1])
-
         self.combo_op.set_active(0)
 
         # Processing text value