odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] Account: Can not display list of analytic entries when you open it's list view from Analytic Account form 

bzr revid: ara@tinyerp.com-20110131093130-d1jo5lb8kiywrhrb
This commit is contained in:
ARA (OpenERP) 2011-01-31 15:01:30 +05:30
parent 57b8780e54
commit a101b76a36
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/project/project_view.xml
View File

@ -445,7 +445,7 @@
</record>
<act_window
context="{'search_default_account_id': [active_id], 'search_default_user_id': False}"
context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'act_window': True}"
id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
name="All Analytic Entries"
res_model="account.analytic.line"

7
addons/analytic/analytic.py
View File

@ -229,8 +229,11 @@ class account_analytic_account(osv.osv):
return self.name_get(cr, uid, project_ids, context=context)
account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
if not account:
name = name.split('/ ')[-1]
account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
if context.get('act_window', False):
active_id = context.get('active_id')
account = self.search(cr, uid, [('id', '=', active_id)]+args, limit=limit, context=context)
else:
account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
newacc = account
while newacc:
newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args, limit=limit, context=context)