diff --git a/addons/account/account.py b/addons/account/account.py index a5090d3226a..f05fc7ca119 100755 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1125,7 +1125,7 @@ class account_move(osv.osv): 'state': 'draft', 'period_id': _get_period, 'date': lambda *a: time.strftime('%Y-%m-%d'), - 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, + 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } def _check_centralisation(self, cursor, user, ids, context=None): @@ -1612,7 +1612,6 @@ class account_tax_code(osv.osv): ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context) return self.name_get(cr, user, ids, context) - def name_get(self, cr, uid, ids, context=None): if isinstance(ids, (int, long)): ids = [ids] @@ -1647,6 +1646,7 @@ class account_tax_code(osv.osv): (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']) ] _order = 'code' + account_tax_code() class account_tax(osv.osv): @@ -2300,7 +2300,6 @@ class account_account_template(osv.osv): (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']) ] - def name_get(self, cr, uid, ids, context=None): if not ids: return [] @@ -3007,4 +3006,4 @@ class account_bank_accounts_wizard(osv.osv_memory): account_bank_accounts_wizard() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file