diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-06-26 22:09:09 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-06-26 22:09:09 +0200 |
| commit | ce583333f9bbf8948dcec5fb64fbc51d0cf71b03 (patch) | |
| tree | 62cb28c74a0f8146e2c72e4245ecccb4715ff7d3 | |
| parent | ae45655ef318fadd3bcac044d0aed943cd95a662 (diff) | |
[FIX] minor fixes before merge
bzr revid: al@openerp.com-20120626200909-rnriwjhsvr8u7i7w
| -rw-r--r-- | addons/account/account.py | 2 | ||||
| -rw-r--r-- | addons/account/wizard/account_fiscalyear_close_state.py | 4 | ||||
| -rw-r--r-- | addons/account/wizard/account_period_close.py | 3 | ||||
| -rw-r--r-- | addons/account_voucher/report/account_voucher.py | 2 |
4 files changed, 0 insertions, 11 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index 91615b364c3..caf1d68c45d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -884,7 +884,6 @@ account_journal() class account_fiscalyear(osv.osv): _name = "account.fiscalyear" _description = "Fiscal Year" - _inherit = 'mail.thread' _columns = { 'name': fields.char('Fiscal Year', size=64, required=True), 'code': fields.char('Code', size=6, required=True), @@ -981,7 +980,6 @@ account_fiscalyear() class account_period(osv.osv): _name = "account.period" _description = "Account period" - _inherit = 'mail.thread' _columns = { 'name': fields.char('Period Name', size=64, required=True), 'code': fields.char('Code', size=12), diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py index ffee8f2ef3b..2af649ba19f 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.py +++ b/addons/account/wizard/account_fiscalyear_close_state.py @@ -54,10 +54,6 @@ class account_fiscalyear_close_state(osv.osv_memory): cr.execute('UPDATE account_fiscalyear ' \ 'SET state = %s WHERE id = %s', ('done', fy_id)) - # Log message for Fiscalyear - fy_pool = self.pool.get('account.fiscalyear') - fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code - fy_pool.message_append_note(cr, uid, [fy_id], body=_("Fiscal year '%s' is closed, no more modification allowed.") % (fy_code)) return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close_state() diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py index d31b3b3979c..b2c61d9197a 100644 --- a/addons/account/wizard/account_period_close.py +++ b/addons/account/wizard/account_period_close.py @@ -53,9 +53,6 @@ class account_period_close(osv.osv_memory): cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id)) cr.execute('update account_period set state=%s where id=%s', (mode, id)) - # Log message for Period - for period_id, name in period_pool.name_get(cr, uid, [id]): - period_pool.message_append_note(cr, uid, [period_id], body=_("Period '%s' is closed, no more modification allowed for this period.") % (name)) return {'type': 'ir.actions.act_window_close'} account_period_close() diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py index 9fd69ab1e38..146fcbc258a 100644 --- a/addons/account_voucher/report/account_voucher.py +++ b/addons/account_voucher/report/account_voucher.py @@ -36,8 +36,6 @@ class report_voucher(report_sxw.rml_parse): }) def convert(self, amount, cur): - if cur is None: - cur='euro' amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur) return amt_en |