Odoo Web Client

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

  1. 6.0-opw-575059-cpa
  2. Merge into 6.0
Proposed by Xavier ALT
Status: Merged
Merged at revision: 4822
Proposed branch: lp:~openerp-dev/openobject-client-web/6.0-opw-575059-cpa
Merge into: lp:openobject-client-web
Diff against target: 20 lines (+3/-4)
1 file modified
addons/openerp/widgets/form/_m2m.py (+3/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client-web/6.0-opw-575059-cpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+109396@code.launchpad.net

Description of the change

Hello,

Fixed domain not append when domain type unicode.

Demo: Account > Invoices > Customer Invoices
1) Edit one Invoice.
2) Edit One Invoice Lines.
3) Add some taxes, and sort by 'Tax Name' column.

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

Regards,
Xavier

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/form/_m2m.py'
2--- addons/openerp/widgets/form/_m2m.py 2012-05-29 10:48:37 +0000
3+++ addons/openerp/widgets/form/_m2m.py 2012-06-08 17:06:21 +0000
4@@ -106,13 +106,12 @@
5 ids = ids[current.offset: current.offset+current.limit]
6
7 if self.name == params.source and params.sort_key and ids:
8- if isinstance(self.domain, basestring):
9- self.domain = ast.literal_eval(self.domain)
10- self.domain.append(('id', 'in', ids))
11+ domain = current.domain or []
12+ domain.append(('id','in',ids))
13 limit = current.limit
14 if current.limit == -1:
15 limit = 0
16- ids = rpc.RPCProxy(self.model).search(self.domain, current.offset, limit, params.sort_key+ ' '+params.sort_order, self.context)
17+ ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key+ ' '+params.sort_order, current.context)
18 id = ids[0]
19
20 if current.view_mode: view_mode = current.view_mode