diff options
| author | JMA(OpenERP) <> | 2010-12-10 20:27:51 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2010-12-10 20:27:51 +0100 |
| commit | acee5c69bc6a89648cb4ec0b75930ce4e67b5068 (patch) | |
| tree | 4249916706d88087dd0c6cec0f9d787876c8e1d4 | |
| parent | f377b3696cb8ad93a09d0e09be825ab121eaaa30 (diff) | |
[IMP] analytic,account_analytic_plans: analytic lines should only reference non-view analytic accounts
bzr revid: odo@openerp.com-20101210192751-wlic09qc88st2cra
| -rw-r--r-- | addons/account_analytic_plans/account_analytic_plans.py | 2 | ||||
| -rw-r--r-- | addons/analytic/analytic.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index fa3e4a24635..afb6b263b3d 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -240,7 +240,7 @@ class account_analytic_plan_instance_line(osv.osv): _description = "Analytic Instance Line" _columns = { 'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'), - 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), + 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]), 'rate': fields.float('Rate (%)', required=True), } _defaults = { diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 58f2357d452..c852c6d93b9 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -206,7 +206,7 @@ class account_analytic_line(osv.osv): 'date': fields.date('Date', required=True, select=1), 'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')), 'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'), - 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True), + 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]), 'user_id': fields.many2one('res.users', 'User'), 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), |