diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-11-19 16:38:24 +0530 |
| commit | d23c5c8dca985dd0fde280c9237dee85b7bb4d7a (patch) | |
| tree | cf03bc2a74a1d9e93b5ef571fb78070c09c9857b /addons/analytic | |
| parent | f4ab81afb8285a8157258232c5fb2a6745ae7f72 (diff) | |
| parent | 66afff1b52b7ab6ab8c340e18960fb6367cfb714 (diff) | |
[MERGE]merge with trunk
bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g
Diffstat (limited to 'addons/analytic')
| -rw-r--r-- | addons/analytic/analytic.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 78c7e103946..708f9b3b196 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -98,6 +98,10 @@ class account_analytic_account(osv.osv): def name_get(self, cr, uid, ids, context=None): res = [] + if not ids: + return res + if isinstance(ids, (int, long)): + ids = [ids] for id in ids: elmt = self.browse(cr, uid, id, context=context) res.append((id, self._get_one_full_name(elmt))) @@ -323,7 +327,7 @@ class account_analytic_line(osv.osv): 'date': fields.date('Date', required=True, select=True), '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, domain=[('type','<>','view')]), + 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', 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), |