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
=== 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 2013-08-13 12:30:53 +0000
@@ -73,7 +73,7 @@
73 AND (account_account.type IN %s)\73 AND (account_account.type IN %s)\
74 AND account_account.active\74 AND account_account.active\
75 AND ((reconcile_id IS NULL)\75 AND ((reconcile_id IS NULL)\
76 OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\76 OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
77 AND (l.partner_id=res_partner.id)\77 AND (l.partner_id=res_partner.id)\
78 AND (l.date <= %s)\78 AND (l.date <= %s)\
79 AND ' + self.query + ' \79 AND ' + self.query + ' \
@@ -97,7 +97,7 @@
97 AND (account_account.type IN %s)\97 AND (account_account.type IN %s)\
98 AND (l.partner_id IN %s)\98 AND (l.partner_id IN %s)\
99 AND ((l.reconcile_id IS NULL)\99 AND ((l.reconcile_id IS NULL)\
100 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\100 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
101 AND ' + self.query + '\101 AND ' + self.query + '\
102 AND account_account.active\102 AND account_account.active\
103 AND (l.date <= %s)\103 AND (l.date <= %s)\
@@ -117,7 +117,7 @@
117 AND (COALESCE(l.date_maturity, l.date) < %s)\117 AND (COALESCE(l.date_maturity, l.date) < %s)\
118 AND (l.partner_id IN %s)\118 AND (l.partner_id IN %s)\
119 AND ((l.reconcile_id IS NULL)\119 AND ((l.reconcile_id IS NULL)\
120 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\120 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
121 AND '+ self.query + '\121 AND '+ self.query + '\
122 AND account_account.active\122 AND account_account.active\
123 AND (l.date <= %s)\123 AND (l.date <= %s)\
@@ -134,7 +134,7 @@
134 AND (COALESCE(l.date_maturity,l.date) > %s)\134 AND (COALESCE(l.date_maturity,l.date) > %s)\
135 AND (l.partner_id IN %s)\135 AND (l.partner_id IN %s)\
136 AND ((l.reconcile_id IS NULL)\136 AND ((l.reconcile_id IS NULL)\
137 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\137 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
138 AND '+ self.query + '\138 AND '+ self.query + '\
139 AND account_account.active\139 AND account_account.active\
140 AND (l.date <= %s)\140 AND (l.date <= %s)\
@@ -166,7 +166,7 @@
166 AND (account_account.type IN %s)166 AND (account_account.type IN %s)
167 AND (l.partner_id IN %s)167 AND (l.partner_id IN %s)
168 AND ((l.reconcile_id IS NULL)168 AND ((l.reconcile_id IS NULL)
169 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))169 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))
170 AND ''' + self.query + '''170 AND ''' + self.query + '''
171 AND account_account.active171 AND account_account.active
172 AND ''' + dates_query + '''172 AND ''' + dates_query + '''
@@ -240,7 +240,7 @@
240 AND (l.partner_id IS NULL)\240 AND (l.partner_id IS NULL)\
241 AND (account_account.type IN %s)\241 AND (account_account.type IN %s)\
242 AND ((l.reconcile_id IS NULL) \242 AND ((l.reconcile_id IS NULL) \
243 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\243 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
244 AND ' + self.query + '\244 AND ' + self.query + '\
245 AND (l.date <= %s)\245 AND (l.date <= %s)\
246 AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))246 AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
@@ -257,7 +257,7 @@
257 AND (account_account.type IN %s)\257 AND (account_account.type IN %s)\
258 AND (COALESCE(l.date_maturity, l.date) < %s)\258 AND (COALESCE(l.date_maturity, l.date) < %s)\
259 AND ((l.reconcile_id IS NULL)\259 AND ((l.reconcile_id IS NULL)\
260 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\260 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
261 AND '+ self.query + '\261 AND '+ self.query + '\
262 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))262 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
263 t = self.cr.fetchall()263 t = self.cr.fetchall()
@@ -272,7 +272,7 @@
272 AND (account_account.type IN %s)\272 AND (account_account.type IN %s)\
273 AND (COALESCE(l.date_maturity,l.date) > %s)\273 AND (COALESCE(l.date_maturity,l.date) > %s)\
274 AND ((l.reconcile_id IS NULL)\274 AND ((l.reconcile_id IS NULL)\
275 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\275 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
276 AND '+ self.query + '\276 AND '+ self.query + '\
277 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))277 AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
278 t = self.cr.fetchall()278 t = self.cr.fetchall()
@@ -300,7 +300,7 @@
300 AND (account_account.type IN %s)\300 AND (account_account.type IN %s)\
301 AND (l.partner_id IS NULL)\301 AND (l.partner_id IS NULL)\
302 AND ((l.reconcile_id IS NULL)\302 AND ((l.reconcile_id IS NULL)\
303 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\303 OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
304 AND '+ self.query + '\304 AND '+ self.query + '\
305 AND account_account.active\305 AND account_account.active\
306 AND ' + dates_query + '\306 AND ' + dates_query + '\