[FIX] minor fixes before merge

bzr revid: al@openerp.com-20120626200909-rnriwjhsvr8u7i7w

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),

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()

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()

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