Odoo Addons (MOVED TO GITHUB)

Merge lp:~therp-nl/openobject-addons/7.0-lp1210524-aged_partner_balance_reconciations_off_by_one_day into lp:openobject-addons/7.0

  1. 7.0-lp1210524-aged_partner_balance_reconciations_off_by_one_day
  2. Merge into 7.0
Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp:~therp-nl/openobject-addons/7.0-lp1210524-aged_partner_balance_reconciations_off_by_one_day
Merge into: lp:openobject-addons/7.0
Diff against target: 84 lines (+9/-9)
1 file modified
account/report/account_aged_partner_balance.py (+9/-9)
To merge this branch: bzr merge lp:~therp-nl/openobject-addons/7.0-lp1210524-aged_partner_balance_reconciations_off_by_one_day
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+179439@code.launchpad.net
To post a comment you must log in.
lp:~therp-nl/openobject-addons/7.0-lp1210524-aged_partner_balance_reconciations_off_by_one_day updated
9356. By Stefan Rijnhart (Opener)

[IMP] Use postgres date arithmetic

9357. By Stefan Rijnhart (Opener)

[FIX] Also replace operator after previous change

Unmerged revisions

9357. By Stefan Rijnhart (Opener)

[FIX] Also replace operator after previous change

9356. By Stefan Rijnhart (Opener)

[IMP] Use postgres date arithmetic

9355. By Stefan Rijnhart (Opener)

[FIX] Remove debug print statement

9354. By Stefan Rijnhart (Opener)

[FIX] Aged partner balance unreconciled amount selection off by one day

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_aged_partner_balance.py'
2--- account/report/account_aged_partner_balance.py 2013-06-14 21:36:02 +0000
3+++ account/report/account_aged_partner_balance.py 2013-08-13 12:30:53 +0000
4@@ -73,7 +73,7 @@
5 AND (account_account.type IN %s)\
6 AND account_account.active\
7 AND ((reconcile_id IS NULL)\
8- OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
9+ OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
10 AND (l.partner_id=res_partner.id)\
11 AND (l.date <= %s)\
12 AND ' + self.query + ' \
13@@ -97,7 +97,7 @@
14 AND (account_account.type IN %s)\
15 AND (l.partner_id IN %s)\
16 AND ((l.reconcile_id IS NULL)\
17- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
18+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
19 AND ' + self.query + '\
20 AND account_account.active\
21 AND (l.date <= %s)\
22@@ -117,7 +117,7 @@
23 AND (COALESCE(l.date_maturity, l.date) < %s)\
24 AND (l.partner_id IN %s)\
25 AND ((l.reconcile_id IS NULL)\
26- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
27+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
28 AND '+ self.query + '\
29 AND account_account.active\
30 AND (l.date <= %s)\
31@@ -134,7 +134,7 @@
32 AND (COALESCE(l.date_maturity,l.date) > %s)\
33 AND (l.partner_id IN %s)\
34 AND ((l.reconcile_id IS NULL)\
35- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
36+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
37 AND '+ self.query + '\
38 AND account_account.active\
39 AND (l.date <= %s)\
40@@ -166,7 +166,7 @@
41 AND (account_account.type IN %s)
42 AND (l.partner_id IN %s)
43 AND ((l.reconcile_id IS NULL)
44- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
45+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))
46 AND ''' + self.query + '''
47 AND account_account.active
48 AND ''' + dates_query + '''
49@@ -240,7 +240,7 @@
50 AND (l.partner_id IS NULL)\
51 AND (account_account.type IN %s)\
52 AND ((l.reconcile_id IS NULL) \
53- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
54+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
55 AND ' + self.query + '\
56 AND (l.date <= %s)\
57 AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
58@@ -257,7 +257,7 @@
59 AND (account_account.type IN %s)\
60 AND (COALESCE(l.date_maturity, l.date) < %s)\
61 AND ((l.reconcile_id IS NULL)\
62- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
63+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
64 AND '+ self.query + '\
65 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
66 t = self.cr.fetchall()
67@@ -272,7 +272,7 @@
68 AND (account_account.type IN %s)\
69 AND (COALESCE(l.date_maturity,l.date) > %s)\
70 AND ((l.reconcile_id IS NULL)\
71- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
72+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
73 AND '+ self.query + '\
74 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
75 t = self.cr.fetchall()
76@@ -300,7 +300,7 @@
77 AND (account_account.type IN %s)\
78 AND (l.partner_id IS NULL)\
79 AND ((l.reconcile_id IS NULL)\
80- OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
81+ OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
82 AND '+ self.query + '\
83 AND account_account.active\
84 AND ' + dates_query + '\