Merge lp:~openerp-community-committers/openobject-addons/5.0-bugfix-599090 into lp:~openerp-community-committers/openobject-addons/5.0

[Albert Cervera i Areny - http://www.NaN-tic.com]

account.move.line checks some fields are not updated if the line is reconciled or the move is not in draft state. There is a problem, though, that forbids users from removing unreconciled entries of a draft account moves.

When the user wants to remove a couple of lines of a draft move (leaving the move still in valid state), the system will call account.move validate() function. This function calls account.move.line write() for all account move lines of the move, forbiding the removal if there are move lines in reconciled state. The problem is that account.move's validate() function is not necessarily changing any of the forbiden values, it simply ensures they're properly set. As account.move.line's write() function doesn't check if those values are really changing it always raises an exception.

The patch has been in production in several customers for several months now.

Unmerged revisions

2881. By Albert Cervera i Areny - http://www.NaN-tic.com on 2010-11-19

[IMP] account: Be less restrictive in what can be done when the move is reconciled or is not in draft state.

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2010-11-04 08:15:41 +0000
+++ account/account_move_line.py	2010-11-19 23:26:54 +0000
@@ -777,15 +777,14 @@
         account_obj = self.pool.get('account.account')
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
-        if update_check:
-            if ('account_id' in vals) or ('journal_id' in vals) or ('period_id' in vals) or ('move_id' in vals) or ('debit' in vals) or ('credit' in vals) or ('date' in vals):
-                self._update_check(cr, uid, ids, context)
 
         todo_date = None
         if vals.get('date', False):
             todo_date = vals['date']
             del vals['date']
 
+        needs_check = False
+
         for line in self.browse(cr, uid, ids,context=context):
             ctx = context.copy()
             if ('journal_id' not in ctx):
@@ -803,7 +802,27 @@
             if journal.centralisation:
                 self._check_moves(cr, uid, context=ctx)
 
-        
+            # Check is only needed if the value of these fields has changed. It is important to check this
+            # because when removing a couple of lines of a move, the whole move is validated and this means
+            # that it's not possible to remove unreconciled move lines from a draft move that has reconciled lines.
+            if 'journal_id' in vals and line.journal_id.id != vals['journal_id']:
+                needs_check = True
+            if 'account_id' in vals and line.account_id.id != vals['account_id']:
+                needs_check = True
+            if 'period_id' in vals and line.period_id.id != vals['period_id']:
+                needs_check = True
+            if 'move_id' in vals and line.move_id.id != vals['move_id']:
+                needs_check = True
+            if 'debit' in vals and line.debit != vals['debit']:
+                needs_check = True
+            if 'credit' in vals and line.credit != vals['credit']:
+                needs_check = True
+            if 'date' in vals and line.date != vals['date']:
+                needs_check = True
+
+        if update_check and needs_check:
+            self._update_check(cr, uid, ids, context)
+ 
         result = super(account_move_line, self).write(cr, uid, ids, vals, context)
 
         if check: