From 58f8d09bbccb8b18b0b877b65cd35880c461430f Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 6 Feb 2013 23:30:10 +0100 Subject: [PATCH] In the wizard "Post Journal Entries", we can now select multiple journals and multiple periods. bzr revid: alexis@via.ecp.fr-20130206223010-f1cr0qdodbp3xpp4 --- addons/account/wizard/account_validate_account_move.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index faf7f8e2ccd..6ebf040bbea 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -25,16 +25,16 @@ class validate_account_move(osv.osv_memory): _name = "validate.account.move" _description = "Validate Account Move" _columns = { - 'journal_id': fields.many2one('account.journal', 'Journal', required=True), - 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]), + 'journal_id': fields.many2many('account.journal', 'wizard_validate_account_move_journal', 'wizard_id', 'journal_id', 'Journal', required=True), + 'period_id': fields.many2many('account.period', 'wizard_validate_account_move_period', 'wizard_id', 'period_id', 'Period', required=True, domain=[('state','<>','done')]), } def validate_move(self, cr, uid, ids, context=None): obj_move = self.pool.get('account.move') if context is None: context = {} - data = self.browse(cr, uid, ids, context=context)[0] - ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)]) + data = self.read(cr, uid, ids[0], context=context) + ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','in',tuple(data['journal_id'])),('period_id','in',tuple(data['period_id']))]) if not ids_move: raise osv.except_osv(_('Warning!'), _('Specified journal does not have any account move entries in draft state for this period.')) obj_move.button_validate(cr, uid, ids_move, context=context)