OpenERP CLEARCORP Addons

Merge lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_move_reverse into lp:openerp-ccorp-addons/6.1

  1. 6.1-account_move_reverse
  2. Merge into 6.1
Proposed by Ronald Rubi
Status: Merged
Merged at revision: 751
Proposed branch: lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_move_reverse
Merge into: lp:openerp-ccorp-addons/6.1
Diff against target: 42 lines (+13/-4)
1 file modified
account_move_reverse/account_move_reverse.py (+13/-4)
To merge this branch: bzr merge lp:~rr.clearcorp/openerp-ccorp-addons/6.1-account_move_reverse
Reviewer Review Type Date Requested Status
ClearCorp drivers Pending
Review via email: mp+193500@code.launchpad.net

Description of the change

[FIX] Fix account_move_reverse, bad matching lines

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_move_reverse/account_move_reverse.py'
2--- account_move_reverse/account_move_reverse.py 2013-10-21 16:54:53 +0000
3+++ account_move_reverse/account_move_reverse.py 2013-10-31 21:17:26 +0000
4@@ -61,6 +61,7 @@
5 def reverse(self, cr, uid, ids, context=None):
6
7 for move_original_id in ids:
8+ new_reconcile_line_ids = []
9 move_original = self.pool.get('account.move').browse(cr, 1, move_original_id, context=context)
10
11 if move_original.move_reverse_id:
12@@ -110,9 +111,15 @@
13 if len(reconcile.line_id) > 2:
14 reconcile_line_ids = []
15 for line_id in reconcile.line_id:
16- reconcile_line_ids.append(line_id.id)
17- self.pool.get('account.move.line').write(cr,uid,reconcile_line_ids,{'reconcile_id': False, 'reconcile_partial_id':reconcile.id})
18- self.pool.get('account.move.line').write(cr,uid,line.id,{'reconcile_partial_id': False})
19+ if line_id.id not in new_reconcile_line_ids:
20+ reconcile_line_ids.append(line_id.id)
21+ if len(reconcile_line_ids) > 2:
22+ self.pool.get('account.move.line').write(cr,uid,reconcile_line_ids,{'reconcile_id': False, 'reconcile_partial_id':reconcile.id})
23+ self.pool.get('account.move.line').write(cr,uid,line.id,{'reconcile_partial_id': False})
24+ else:
25+ move_reconcile_obj.unlink(cr,uid,[reconcile.id],context=context)
26+ new_reconcile_line_ids.append(line.id) #Workaround, commit database
27+
28 else:
29 move_reconcile_obj.unlink(cr,uid,[reconcile.id],context=context)
30
31@@ -125,9 +132,11 @@
32
33 if line.account_id.reconcile:
34 reconcile_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'Account Reverse'})
35+
36+ #The move don't support write this line
37 cr.execute('UPDATE account_move_line '\
38 'SET reconcile_id=%s '\
39- 'WHERE id IN %s', (reconcile_id, tuple([line.id]),))
40+ 'WHERE id IN %s', (reconcile_id, tuple([line.id]),))
41 #self.pool.get('account.move.line').write(cr,uid,[line.id],{'reconcile_id': reconcile_id})
42 self.pool.get('account.move.line').write(cr,uid,[line_created_id],{'reconcile_id': reconcile_id})
43

Subscribers

People subscribed via source and target branches