Merge lp:~openerp-dev/openobject-addons/trunk-bug-1219204-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

  I have fixed this bug "error when re-generating opening entries",i unlink the opening entry.

Thanks,
Chirag Dodiya(cod).

[Mohammad Alhashash (alhashash)]

This branch should be updated to prevent conflict on the current v7 addons. Please check lp:~alhashash/openobject-addons/7.0-bug-1219204

[Holger Brunn (Therp) (hbrunn)]

#24 don't loose the context here. I propose
context=dict(context or {}, regenerate_opening=True)

Then you should move #9 before the loop, as we don't need to loop if this key is set

review: Needs Fixing

Unmerged revisions

9020. By Mohammad Alhashash on 2013-12-19

[FIX] Fixed this bug: error when re-generating opening entries

=== modified file 'account/account.py'
--- account/account.py	2013-12-09 10:50:31 +0000
+++ account/account.py	2013-12-19 07:40:19 +0000
@@ -1680,7 +1680,7 @@
     # you should use the generate opening entries wizard for that
     def unlink(self, cr, uid, ids, context=None):
         for move_rec in self.browse(cr, uid, ids, context=context):
-            if move_rec.opening_reconciliation:
+            if move_rec.opening_reconciliation and not context['regenerate_opening']:
                 raise osv.except_osv(_('Error!'), _('You cannot unreconcile journal items if they has been generated by the \
                                                         opening/closing fiscal year process.'))
         return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context)
 
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-12-09 10:50:31 +0000
+++ account/account_move_line.py	2013-12-19 07:40:19 +0000
@@ -1022,9 +1022,8 @@
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
         if unlink_ids:
-            if opening_reconciliation:
-                obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
-            obj_move_rec.unlink(cr, uid, unlink_ids)
+            ctx = {'regenerate_opening':True} if opening_reconciliation else None
+            obj_move_rec.unlink(cr, uid, unlink_ids, ctx)
         return True
 
     def unlink(self, cr, uid, ids, context=None, check=True):