Merge lp:~openerp-dev/openobject-addons/7.0-partial-aged-balance-mat into lp:openobject-addons/7.0

[Martin Trigaux (OpenERP)]

modify aged partner balance report to avoid displaying the partially reconciled entries

Way to reproduce:
- create invoice of 1000€ Jan 2014 for a partner
- create payment of 300€ in Mar 2014 for same partner

Observed:
- period 1 -> +1000
- period 2 -> -300
- total -> +700

Expected
- period 1 -> +700
- total -> +700

[lp:~openerp-dev/openobject-addons/7.0-partial-aged-balance-mat]

10029. By Martin Trigaux (OpenERP) on 2014-04-30

[FIX] should not use exclude bounds

Unmerged revisions

10029. By Martin Trigaux (OpenERP) on 2014-04-30

[FIX] should not use exclude bounds

10028. By Martin Trigaux (OpenERP) on 2014-04-30

[IMP] account: when computing the aged partner balance, do not display the partial reconcilations, only display the remaining amount in the oldest period.

eg: if +1000 in period 1 and -300 in period 2, should only display +700 in period 1

=== modified file 'account/report/account_aged_partner_balance.py'
--- account/report/account_aged_partner_balance.py	2013-06-14 21:36:02 +0000
+++ account/report/account_aged_partner_balance.py	2014-04-30 15:28:48 +0000
@@ -159,7 +159,7 @@
                 dates_query += ' < %s)'
                 args_list += (form[str(i)]['stop'],)
             args_list += (self.date_from,)
-            self.cr.execute('''SELECT l.partner_id, SUM(l.debit-l.credit)
+            self.cr.execute('''SELECT l.partner_id, SUM(l.debit-l.credit), l.reconcile_partial_id
                     FROM account_move_line AS l, account_account, account_move am 
                     WHERE (l.account_id = account_account.id) AND (l.move_id=am.id)
                         AND (am.state IN %s)
@@ -171,11 +171,23 @@
                         AND account_account.active
                         AND ''' + dates_query + '''
                     AND (l.date <= %s)
-                    GROUP BY l.partner_id''', args_list)
+                    GROUP BY l.partner_id, l.reconcile_partial_id''', args_list)
             t = self.cr.fetchall()
-            d = {}
+            d = dict((i[0],0) for i in t)
             for i in t:
-                d[i[0]] = i[1]
+                if i[2]:
+                    # in case of partial reconciliation, we want to keep the left amount in the oldest period
+                    self.cr.execute('''SELECT MIN(COALESCE(date_maturity,date)) FROM account_move_line WHERE reconcile_partial_id = %s''', (i[2],))
+                    date = self.cr.fetchall()
+                    if date and args_list[-3] <= date[0][0] <= args_list[-2]:
+                        # partial reconcilation
+                        self.cr.execute('''SELECT SUM(l.debit-l.credit)
+                                           FROM account_move_line AS l
+                                           WHERE l.reconcile_partial_id = %s''', (i[2],))
+                        unreconciled_amount = self.cr.fetchall()
+                        d[i[0]] += unreconciled_amount[0][0]
+                else:
+                    d[i[0]] += i[1]
             history.append(d)
 
         for partner in partners: