Merge lp:~openerp-dev/openobject-client-web/6.0-opw-575059-cpa into lp:openobject-client-web

[Chirag Patel (OpenERP)]

Hello,

Fixed domain not append when domain type unicode.

Demo: Sales > Sales > Sales Orders
1) Edit one Sales Orders.
2) Edit One Sales Order Lines.
3) Sort M2M 'Tax Name' column.

Observed: Error:"'unicode' object has no attribute 'append'".

Thanks.

=== modified file 'addons/openerp/widgets/form/_m2m.py'
--- addons/openerp/widgets/form/_m2m.py	2012-03-19 09:43:24 +0000
+++ addons/openerp/widgets/form/_m2m.py	2012-05-29 12:03:20 +0000
@@ -30,7 +30,7 @@
 from openerp.widgets import register_widget
 
 from openerp import validators
-
+from openobject.tools import ast
 
 __all__ = ["M2M"]
 
@@ -106,6 +106,8 @@
             ids = ids[current.offset: current.offset+current.limit]
         
         if self.name == params.source and params.sort_key and ids:
+            if isinstance(self.domain, basestring):
+                self.domain = ast.literal_eval(self.domain)
             self.domain.append(('id', 'in', ids))
             limit = current.limit
             if current.limit == -1: