banking-addons-team team mailing list archive

["Vincent Renaville@camptocamp" <vincent.renaville@xxxxxxxxxxxxxx>]

Vincent Renaville@camptocamp has proposed merging lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile into lp:banking-addons/bank-statement-reconcile-7.0.

Requested reviews:
  Banking Addons Core Editors (banking-addons-team)
Related bugs:
  Bug #1317509 in Banking Addons: "[6.1/7.0] module : account_easy_reconcile - should never modify manual reconcile"
  https://bugs.launchpad.net/banking-addons/+bug/1317509

For more details, see:
https://code.launchpad.net/~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile/+merge/223934

This fix prevent to remove manual partial reconcile, when you use easy reconcile
-- 
https://code.launchpad.net/~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile/+merge/223934
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile into lp:banking-addons/bank-statement-reconcile-7.0.

=== modified file 'account_easy_reconcile/base_reconciliation.py'
--- account_easy_reconcile/base_reconciliation.py	2013-01-04 08:39:10 +0000
+++ account_easy_reconcile/base_reconciliation.py	2014-06-20 14:15:27 +0000
@@ -77,10 +77,13 @@
         return "SELECT %s" % ', '.join(self._base_columns(rec))
 
     def _from(self, rec, *args, **kwargs):
-        return "FROM account_move_line"
+        return ("FROM account_move_line "
+                "LEFT OUTER JOIN account_move_reconcile ON (account_move_line.reconcile_partial_id = account_move_reconcile.id)"
+                )
 
     def _where(self, rec, *args, **kwargs):
         where = ("WHERE account_move_line.account_id = %s "
+                 "AND COALESCE(account_move_reconcile.type,'') <> ('manual')"
                  "AND account_move_line.reconcile_id IS NULL ")
         # it would be great to use dict for params
         # but as we use _where_calc in _get_filter