1
=== modified file 'analytic/analytic.py'
2
--- analytic/analytic.py	2012-10-05 14:36:06 +0000
3
+++ analytic/analytic.py	2012-10-23 12:50:21 +0000
4
@@ -255,27 +255,27 @@
5
255
        if context is None:
255
        if context is None:
6
256
            context={}
256
            context={}
7
257
        if context.get('current_model') == 'project.project':
257
        if context.get('current_model') == 'project.project':
10
258
            cr.execute("select analytic_account_id from project_project")
258
            project_obj = self.pool.get("account.analytic.account")
11
259
            project_ids = [x[0] for x in cr.fetchall()]
259
            project_ids = project_obj.search(cr, uid, args)
12
260
            return self.name_get(cr, uid, project_ids, context=context)
260
            return self.name_get(cr, uid, project_ids, context=context)
13
261
        if name:
261
        if name:
16
262
            account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
262
            account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
17
263
            if not account:
263
            if not account_ids:
18
264
                names=map(lambda i : i.strip(),name.split('/'))
264
                names=map(lambda i : i.strip(),name.split('/'))
19
265
                for i in range(len(names)):
265
                for i in range(len(names)):
20
266
                    dom=[('name', operator, names[i])]
266
                    dom=[('name', operator, names[i])]
21
267
                    if i>0:
267
                    if i>0:
25
268
                        dom+=[('id','child_of',account)]
268
                        dom+=[('id','child_of',account_ids)]
26
269
                    account = self.search(cr, uid, dom, limit=limit, context=context)
269
                    account_ids = self.search(cr, uid, dom, limit=limit, context=context)
27
270
                newacc = account
270
                newacc = account_ids
28
271
                while newacc:
271
                while newacc:
29
272
                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
272
                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
31
273
                    account += newacc
273
                    account_ids += newacc
32
274
                if args:
274
                if args:
34
275
                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
275
                    account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context)
35
276
        else:
276
        else:
38
277
            account = self.search(cr, uid, args, limit=limit, context=context)
277
            account_ids = self.search(cr, uid, args, limit=limit, context=context)
39
278
        return self.name_get(cr, uid, account, context=context)
278
        return self.name_get(cr, uid, account_ids, context=context)
40
279
279
41
280
    def create(self, cr, uid, vals, context=None):
280
    def create(self, cr, uid, vals, context=None):
42
281
        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
281
        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
Status:	Merged
Approved by:	Anto on 2012-10-23
Approved revision:	no longer in the source branch.
Merged at revision:	7837
Proposed branch:	lp:~openerp-dev/openobject-addons/trunk-bug-1033505-abo
Merge into:	lp:openobject-addons
Diff against target:	42 lines (+11/-11) 1 file modified analytic/analytic.py (+11/-11)
To merge this branch:	bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1033505-abo
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2012-10-23	Pending
Review via email: mp+130993@code.launchpad.net
1	=== modified file 'analytic/analytic.py'
2	--- analytic/analytic.py 2012-10-05 14:36:06 +0000
3	+++ analytic/analytic.py 2012-10-23 12:50:21 +0000
4	@@ -255,27 +255,27 @@
5	255	if context is None:	255	if context is None:
6	256	context={}	256	context={}
7	257	if context.get('current_model') == 'project.project':	257	if context.get('current_model') == 'project.project':
10	258	cr.execute("select analytic_account_id from project_project")	258	project_obj = self.pool.get("account.analytic.account")
11	259	project_ids = [x[0] for x in cr.fetchall()]	259	project_ids = project_obj.search(cr, uid, args)
12	260	return self.name_get(cr, uid, project_ids, context=context)	260	return self.name_get(cr, uid, project_ids, context=context)
13	261	if name:	261	if name:
16	262	account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)	262	account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
17	263	if not account:	263	if not account_ids:
18	264	names=map(lambda i : i.strip(),name.split('/'))	264	names=map(lambda i : i.strip(),name.split('/'))
19	265	for i in range(len(names)):	265	for i in range(len(names)):
20	266	dom=[('name', operator, names[i])]	266	dom=[('name', operator, names[i])]
21	267	if i>0:	267	if i>0:
25	268	dom+=[('id','child_of',account)]	268	dom+=[('id','child_of',account_ids)]
26	269	account = self.search(cr, uid, dom, limit=limit, context=context)	269	account_ids = self.search(cr, uid, dom, limit=limit, context=context)
27	270	newacc = account	270	newacc = account_ids
28	271	while newacc:	271	while newacc:
29	272	newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)	272	newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
31	273	account += newacc	273	account_ids += newacc
32	274	if args:	274	if args:
34	275	account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)	275	account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context)
35	276	else:	276	else:
38	277	account = self.search(cr, uid, args, limit=limit, context=context)	277	account_ids = self.search(cr, uid, args, limit=limit, context=context)
39	278	return self.name_get(cr, uid, account, context=context)	278	return self.name_get(cr, uid, account_ids, context=context)
40	279		279
41	280	def create(self, cr, uid, vals, context=None):	280	def create(self, cr, uid, vals, context=None):
42	281	contract = super(account_analytic_account, self).create(cr, uid, vals, context=context)	281	contract = super(account_analytic_account, self).create(cr, uid, vals, context=context)