From 5438979397584b60c19e9aee2cc58fe449fd85cc Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Fri, 28 Jan 2011 14:49:06 +0530
Subject: [PATCH 1/4] [FIX] Account: Can not display list of analytic entries
 when you open it's list view from Analytic Account form

lp bug: https://launchpad.net/bugs/708593 fixed

bzr revid: ara@tinyerp.com-20110128091906-bqo6ced09d4rc9si
---
 addons/analytic/analytic.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 124607112a9..84124d94cf4 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -109,12 +109,12 @@ class account_analytic_account(osv.osv):
     def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res = self.name_get(cr, uid, ids)
         return dict(res)
-    
+
     def _child_compute(self, cr, uid, ids, name, arg, context=None):
         result = {}
         if context is None:
             context = {}
-        
+
         for account in self.browse(cr, uid, ids, context=context):
             for child in account.child_ids:
                 if child.state == 'template':
@@ -229,6 +229,7 @@ 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)
             newacc = account
             while newacc:

From a101b76a36bdbf5844918ebcffe8309e4c9f28a0 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 31 Jan 2011 15:01:30 +0530
Subject: [PATCH 2/4] [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
---
 addons/account/project/project_view.xml | 2 +-
 addons/analytic/analytic.py             | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 46867c8bf23..161b061c18c 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -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"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 84124d94cf4..78a049436cb 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -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)

From 6fba820016419e7895865336142d140b25ce1367 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 31 Jan 2011 15:31:46 +0530
Subject: [PATCH 3/4] [IMP] Account: Can not display list of analytic entries
 when you open it's list view from Analytic Account form

bzr revid: ara@tinyerp.com-20110131100146-mkmyrjiz9uylr2yd
---
 addons/account/project/project_view.xml | 2 +-
 addons/analytic/analytic.py             | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 161b061c18c..495efbede08 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -445,7 +445,7 @@
         </record>
 
         <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'act_window': True}"
+            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'analytic_act_window': True}"
             id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
             name="All Analytic Entries"
             res_model="account.analytic.line"
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 78a049436cb..1a72e878fcf 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -229,9 +229,8 @@ 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:
-            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)
+            if context.get('analytic_act_window', False):
+                account = self.search(cr, uid, [('id', '=', context.get('active_id'))]+args, limit=limit, context=context)
             else:
                 account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
             newacc = account

From 8d0add19dcb4f0ccf229077b2c4b7c7234225eed Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Mon, 31 Jan 2011 15:43:45 +0530
Subject: [PATCH 4/4] [IMP] Account: Can not display list

bzr revid: ara@tinyerp.com-20110131101345-mnqgppe0p9hmozuy
---
 addons/analytic/analytic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 1a72e878fcf..092a09fe773 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -230,7 +230,7 @@ class account_analytic_account(osv.osv):
         account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
         if not account:
             if context.get('analytic_act_window', False):
-                account = self.search(cr, uid, [('id', '=', context.get('active_id'))]+args, limit=limit, context=context)
+                account = self.search(cr, uid, [('id', '=', context['active_id'])]+args, limit=limit, context=context)
             else:
                 account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
             newacc = account