Odoo Addons (MOVED TO GITHUB)

Merge lp:~akretion-team/openobject-addons/trunk-addons-post-journal-entries-enhanced into lp:openobject-addons

  1. trunk-addons-post-journal-entries-enhanced
  2. Merge into trunk
Proposed by Alexis de Lattre
Status: Merged
Merged at revision: 8995
Proposed branch: lp:~akretion-team/openobject-addons/trunk-addons-post-journal-entries-enhanced
Merge into: lp:openobject-addons
Diff against target: 62 lines (+14/-9)
3 files modified
account/test/account_validate_account_move.yml (+7/-2)
account/wizard/account_validate_account_move.py (+5/-5)
account/wizard/account_validate_move_view.xml (+2/-2)
To merge this branch: bzr merge lp:~akretion-team/openobject-addons/trunk-addons-post-journal-entries-enhanced
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, no test Approve
OpenERP Core Team Pending
Review via email: mp+146978@code.launchpad.net

Description of the change

This is a very small but very usefull enhancement : In the wizard "Accounting > Periodical processing > Draft entries > Post Journal Entries", we can now select multiple journals and multiple periods (instead of just one journal and one period). In some scenarios, it can save a lot of time !

P.S. : if you want to test this merge proposal on an existing database, you have to manually delete the field "journal_id" and "period_id" of the table "validate_account_move" (-u account is not enough).

To post a comment you must log in.
Revision history for this message
Alexis de Lattre (alexis-via) wrote :

Runbot is now green on this branch (with revno 8537) !

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Alexis de Lattre (alexis-via) wrote :

I have re-merged with addons-trunk and re-tested : it still works fine.

The runbot is green.

Could someone review this and merge if it's OK ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/test/account_validate_account_move.yml'
--- account/test/account_validate_account_move.yml 2013-02-21 05:29:58 +0000
+++ account/test/account_validate_account_move.yml 2013-10-29 04:17:24 +0000
@@ -80,8 +80,13 @@
80 I validate this account move by using the 'Post Journal Entries' wizard80 I validate this account move by using the 'Post Journal Entries' wizard
81-81-
82 !record {model: validate.account.move, id: validate_account_move_0}:82 !record {model: validate.account.move, id: validate_account_move_0}:
83 journal_id: account.bank_journal83 journal_ids:
84 period_id: account.period_684 - bank_journal
85 - check_journal
86 period_ids:
87 - period_6
88 - period_7
89 - period_8
85-90-
86 I click on validate Button91 I click on validate Button
87-92-
8893
=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py 2013-06-14 09:19:24 +0000
+++ account/wizard/account_validate_account_move.py 2013-10-29 04:17:24 +0000
@@ -25,18 +25,18 @@
25 _name = "validate.account.move"25 _name = "validate.account.move"
26 _description = "Validate Account Move"26 _description = "Validate Account Move"
27 _columns = {27 _columns = {
28 'journal_id': fields.many2one('account.journal', 'Journal', required=True),28 'journal_ids': fields.many2many('account.journal', 'wizard_validate_account_move_journal', 'wizard_id', 'journal_id', 'Journal', required=True),
29 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]),29 'period_ids': fields.many2many('account.period', 'wizard_validate_account_move_period', 'wizard_id', 'period_id', 'Period', required=True, domain=[('state','<>','done')]),
30 }30 }
3131
32 def validate_move(self, cr, uid, ids, context=None):32 def validate_move(self, cr, uid, ids, context=None):
33 obj_move = self.pool.get('account.move')33 obj_move = self.pool.get('account.move')
34 if context is None:34 if context is None:
35 context = {}35 context = {}
36 data = self.browse(cr, uid, ids, context=context)[0]36 data = self.read(cr, uid, ids[0], context=context)
37 ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)])37 ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','in',tuple(data['journal_ids'])),('period_id','in',tuple(data['period_ids']))])
38 if not ids_move:38 if not ids_move:
39 raise osv.except_osv(_('Warning!'), _('Specified journal does not have any account move entries in draft state for this period.'))39 raise osv.except_osv(_('Warning!'), _('Specified journals do not have any account move entries in draft state for the specified periods.'))
40 obj_move.button_validate(cr, uid, ids_move, context=context)40 obj_move.button_validate(cr, uid, ids_move, context=context)
41 return {'type': 'ir.actions.act_window_close'}41 return {'type': 'ir.actions.act_window_close'}
4242
4343
=== modified file 'account/wizard/account_validate_move_view.xml'
--- account/wizard/account_validate_move_view.xml 2012-12-18 02:11:23 +0000
+++ account/wizard/account_validate_move_view.xml 2013-10-29 04:17:24 +0000
@@ -9,8 +9,8 @@
9 <field name="arch" type="xml">9 <field name="arch" type="xml">
10 <form string="Post Journal Entries" version="7.0">10 <form string="Post Journal Entries" version="7.0">
11 <group>11 <group>
12 <field name="journal_id"/>12 <field name="journal_ids"/>
13 <field name="period_id"/>13 <field name="period_ids"/>
14 </group>14 </group>
15 <footer>15 <footer>
16 <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>16 <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>

Subscribers

People subscribed via source and target branches

to all changes: