Merge lp:~openerp-dev/openobject-addons/trunk-bug-1011178-rmu into lp:openobject-addons

[Ravish(OpenERP)]

Hello,

I have improved the error message in account move line's _update_journal_check method .This will raise when you try to create entry for period which is already closed .

Thanks..!!!

[Amit Parik (amit-parik)]

review: Approve

[Amit Parik (amit-parik)]

Hello Ravish,

Remove the indentation problem.

Next time don't do this kind of silly mistake, even you are applying a patch then you have to first apply the patch at your end I know the given patch has same mistake but don't repeat it.

Please be careful for next time because it's not good as a developer you are doing a indentation 's mistake.

Thanks!

review: Needs Fixing

[Ravish(OpenERP) (rmu-openerp)]

Hello Sir,

Improved the code

Thanks.!!!

review: Needs Resubmitting

[Amit Parik (amit-parik)]

review: Approve

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-08-07 11:34:14 +0000
+++ account/account_move_line.py	2012-08-23 13:36:24 +0000
@@ -1184,12 +1184,12 @@
         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':
-                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,