← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~camptocamp/ocb-addons/lp1236844 into lp:ocb-addons

 

Frederic Clementi - Camptocamp.com has proposed merging lp:~camptocamp/ocb-addons/lp1236844 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1236844 in OpenERP Addons: "[trunk/7.0] Manual reconcile broken ?"
  https://bugs.launchpad.net/openobject-addons/+bug/1236844

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-addons/lp1236844/+merge/193061

Manual reconcile menu must display any move with a debit OR a credit (instead of debit AND a credit...which doesn't help much...)
-- 
https://code.launchpad.net/~camptocamp/ocb-addons/lp1236844/+merge/193061
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~camptocamp/ocb-addons/lp1236844 into lp:ocb-addons.
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-09-18 14:31:46 +0000
+++ account/account_move_line.py	2013-10-29 13:48:11 +0000
@@ -746,7 +746,7 @@
                     AND l.state <> 'draft'
                     GROUP BY l.partner_id, p.last_reconciliation_date
                 ) AS s
-                WHERE debit > 0 AND credit > 0 AND (last_reconciliation_date IS NULL OR max_date > last_reconciliation_date)
+                WHERE debit > 0 OR credit > 0 AND (last_reconciliation_date IS NULL OR max_date > last_reconciliation_date)
                 ORDER BY last_reconciliation_date""")
         ids = [x[0] for x in cr.fetchall()]
         if not ids: 


Follow ups