From 1a48187c3bb5f693fa039a2dd71bdbfd17c816da Mon Sep 17 00:00:00 2001 From: "Ferdinand @ Camptocamp" <> Date: Mon, 11 Jun 2012 12:03:52 +0530 Subject: [PATCH 1/3] [FIX] Improve in message of method update_journal_check in acount_move_line lp bug: https://launchpad.net/bugs/1011178 fixed bzr revid: rmu@tinyerp.com-20120611063352-agnsyq9l50fp883x --- addons/account/account_move_line.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 892747c849f..a0981c6100a 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1188,7 +1188,9 @@ class account_move_line(osv.osv): result = cr.fetchall() for (state,) in result: if state == 'done': - raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.')) + journal = journal_obj.read(cr, uid, journal_id, ['name']) + period = period_obj.read(cr, uid, period_id, ['name']) + raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period['name'],journal['name']))) if not result: journal = journal_obj.browse(cr, uid, journal_id, context=context) period = period_obj.browse(cr, uid, period_id, context=context) From eee05a71e69a079c7f568d31190274101e40dba1 Mon Sep 17 00:00:00 2001 From: Ferdinand <> Date: Mon, 11 Jun 2012 16:53:42 +0530 Subject: [PATCH 2/3] [FIX] Improve the code lp bug: https://launchpad.net/bugs/1011178 fixed bzr revid: rmu@tinyerp.com-20120611112342-26mx7amrg6x78l4i --- addons/account/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index a0981c6100a..65da0dc601b 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1190,7 +1190,7 @@ class account_move_line(osv.osv): if state == 'done': journal = journal_obj.read(cr, uid, journal_id, ['name']) period = period_obj.read(cr, uid, period_id, ['name']) - raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period['name'],journal['name']))) + raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period['name'],journal['name']))) if not result: journal = journal_obj.browse(cr, uid, journal_id, context=context) period = period_obj.browse(cr, uid, period_id, context=context) From c5bc0ce1f31bdb21fff44a3452b5409dad4ae9cc Mon Sep 17 00:00:00 2001 From: "Ravish Murari (OpenERP)" Date: Thu, 23 Aug 2012 19:00:31 +0530 Subject: [PATCH 3/3] [FIX] improved the in code bzr revid: rmu@tinyerp.com-20120823133031-9atxtgh0d3pypus4 --- addons/account/account_move_line.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 8923f4b92f2..b97cdd12874 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1184,17 +1184,12 @@ class account_move_line(osv.osv): jour_period_obj = self.pool.get('account.journal.period') cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id)) result = cr.fetchall() + journal = journal_obj.browse(cr, uid, journal_id, context=context) + period = period_obj.browse(cr, uid, period_id, context=context) for (state,) in result: if state == 'done': - - journal = journal_obj.read(cr, uid, journal_id, ['name']) - period = period_obj.read(cr, uid, period_id, ['name']) - raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period['name'],journal['name']))) - raise osv.except_osv(_('Error!'), _('You cannot add/modify entries in a closed journal.')) - + raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name))) if not result: - journal = journal_obj.browse(cr, uid, journal_id, context=context) - period = period_obj.browse(cr, uid, period_id, context=context) jour_period_obj.create(cr, uid, { 'name': (journal.code or journal.name)+':'+(period.name or ''), 'journal_id': journal.id,