From 92a04d862cef2fe9cbf62b95c7b20a4026223173 Mon Sep 17 00:00:00 2001 From: vra Date: Wed, 8 Sep 2010 11:46:52 +0530 Subject: [PATCH] [REM][IMP] account, analytic: remove extended group from analytic related menu and improved analytic object. bzr revid: vra@tinyerp.com-20100908061652-e2e5nabdo3uflfxv --- addons/account/project/project_view.xml | 18 ++++++++---------- addons/analytic/analytic.py | 2 +- addons/analytic/security/analytic_security.xml | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index bda1b5f22a2..b4ad0977520 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -8,7 +8,7 @@ tree - + @@ -52,7 +52,7 @@ tree child_ids - + @@ -106,7 +106,7 @@ - + Accounts to Renew @@ -120,16 +120,14 @@ Chart of Analytic Accounts - ir.actions.act_window account.analytic.account - [('parent_id','=',False)] tree - form,graph + [('parent_id','=',False)] Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project. - + account.analytic.line.form @@ -335,7 +333,7 @@ tree,form,search - + # # Open journal entries @@ -347,7 +345,7 @@ form tree,form - + # # Reporting @@ -359,7 +357,7 @@ tree To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount. - + # # Statistics diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index db5e554717d..26f57c984c0 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -222,7 +222,7 @@ class account_analytic_account(osv.osv): def check_recursion(self, cr, uid, ids, parent=None): return super(account_analytic_account, self).check_recursion(cr, uid, ids, parent=parent) - _order = 'parent_id desc,code' + _order = 'date_start desc,parent_id desc,code' _constraints = [ (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']) ] diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index fcd4b8d7009..ff521f7cd1b 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -8,7 +8,7 @@ [('company_id','=',user.company_id.id)] - + Analytic Accounting