From 58f8d09bbccb8b18b0b877b65cd35880c461430f Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 6 Feb 2013 23:30:10 +0100 Subject: [PATCH 001/325] 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) From 2c9ecb911f6ffe10342e691e02fa05f7ddf15041 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 7 Feb 2013 09:19:54 +0100 Subject: [PATCH 002/325] Adapt error message accordingly. Fix a typo in an error message. bzr revid: alexis@via.ecp.fr-20130207081954-a1ahr7wr03rea3qv --- addons/account/wizard/account_validate_account_move.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index 6ebf040bbea..ec938f0349f 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -36,7 +36,7 @@ class validate_account_move(osv.osv_memory): 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.')) + raise osv.except_osv(_('Warning!'), _('Specified journals do not have any account move entries in draft state for the specified periods.')) obj_move.button_validate(cr, uid, ids_move, context=context) return {'type': 'ir.actions.act_window_close'} @@ -58,7 +58,7 @@ class validate_account_move_lines(osv.osv_memory): move_ids.append(line.move_id.id) move_ids = list(set(move_ids)) if not move_ids: - raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.')) + raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move entries in draft state.')) obj_move.button_validate(cr, uid, move_ids, context) return {'type': 'ir.actions.act_window_close'} validate_account_move_lines() From 253042ce872ce31e87b198d3eb70aa716bd37469 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 7 Feb 2013 10:48:45 +0100 Subject: [PATCH 003/325] Rename fields '_id' to '_ids', to reflect the change from many2one to many2many Adapt the YAML test (but it still fails, I don't know why) bzr revid: alexis@via.ecp.fr-20130207094845-fhawd5jw1409p7pc --- addons/account/test/account_validate_account_move.yml | 9 +++++++-- addons/account/wizard/account_validate_account_move.py | 6 +++--- addons/account/wizard/account_validate_move_view.xml | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml index d47ee564019..f2ab6fd9014 100644 --- a/addons/account/test/account_validate_account_move.yml +++ b/addons/account/test/account_validate_account_move.yml @@ -75,8 +75,13 @@ I validate this account move by using the 'Post Journal Entries' wizard - !record {model: validate.account.move, id: validate_account_move_0}: - journal_id: account.bank_journal - period_id: account.period_6 + journal_ids: + - bank_journal + - check_journal + period_ids: + - period_6 + - period_7 + - period_8 - I click on validate Button - diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index ec938f0349f..77afda7123a 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -25,8 +25,8 @@ class validate_account_move(osv.osv_memory): _name = "validate.account.move" _description = "Validate Account Move" _columns = { - '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')]), + 'journal_ids': fields.many2many('account.journal', 'wizard_validate_account_move_journal', 'wizard_id', 'journal_id', 'Journal', required=True), + 'period_ids': 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): @@ -34,7 +34,7 @@ class validate_account_move(osv.osv_memory): if context is None: context = {} 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']))]) + ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_ids','in',tuple(data['journal_ids'])),('period_ids','in',tuple(data['period_ids']))]) if not ids_move: raise osv.except_osv(_('Warning!'), _('Specified journals do not have any account move entries in draft state for the specified periods.')) obj_move.button_validate(cr, uid, ids_move, context=context) diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index 6a9b1e159f0..5f22ccbc97f 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -9,8 +9,8 @@
- - + +