diff --git a/addons/account/account.py b/addons/account/account.py index aced4041f13..03a9b628922 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -921,7 +921,7 @@ class account_period(osv.osv): #CHECKME: shouldn't we check the state of the period? ids = self.search(cr, uid, [('date_start','<=',dt),('date_stop','>=',dt)]) if not ids: - raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt) + raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt) return ids def action_draft(self, cr, uid, ids, *args): diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2733ecbd189..4f4c63e041e 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -514,8 +514,6 @@ class account_move_line(osv.osv): type='many2one', relation='account.invoice', fnct_search=_invoice_search), 'account_tax_id':fields.many2one('account.tax', 'Tax'), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), - #TODO: remove this - #'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')), 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) }