diff options
| author | pso (OpenERP) <pso@tinyerp.com> | 2012-07-25 18:23:32 +0530 |
|---|---|---|
| committer | pso (OpenERP) <pso@tinyerp.com> | 2012-07-25 18:23:32 +0530 |
| commit | e5da0e191b1c3d778f7d6d2ba4f2ff0fc726ecbd (patch) | |
| tree | 4314f65784b65fdcbdd88f3c556c57ccdc4db3d8 /addons/account_analytic_analysis | |
| parent | 082513a80587c3732f13a89edda7c5ba4fcd8410 (diff) | |
| parent | ac580aeae09c2bc76e7c5c090567b7bc7ba24b25 (diff) | |
[MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
Diffstat (limited to 'addons/account_analytic_analysis')
3 files changed, 2 insertions, 4 deletions
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 4f25ece5954..e0bec840467 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -30,7 +30,7 @@ This module is for modifying account analytic view to show important data to pro Adds menu to show relevant information to each manager. You can also view the report of account analytic summary -user-wise as well as month wise. +user-wise as well as month-wise. """, "author": "Camptocamp", "website": "http://www.camptocamp.com/", diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 6e15fe1d5a5..93718a75211 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -446,7 +446,7 @@ class account_analytic_account(osv.osv): help="Computed using the formula: Invoiced Amount - Total Costs.", digits_compute=dp.get_precision('Account')), 'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin', - help="Computed using the formula: Theorial Revenue - Total Costs", + help="Computed using the formula: Theoretical Revenue - Total Costs", digits_compute=dp.get_precision('Account')), 'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100.", diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv index 4af43dbcb2f..74425cea3dd 100644 --- a/addons/account_analytic_analysis/security/ir.model.access.csv +++ b/addons/account_analytic_analysis/security/ir.model.access.csv @@ -3,5 +3,3 @@ access_account_analytic_analysis_summary_user_sale,account_analytic_analysis.sum access_account_analytic_analysis_summary_month_sale,account_analytic_analysis.summary.month sale,model_account_analytic_analysis_summary_month,base.group_sale_salesman,1,0,0,0
access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
-access_account_analytic_analysis_summary_user_project_user,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_user,1,0,0,0
-access_account_analytic_analysis_summary_month_project_user,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_user,1,0,0,0
|