Merge lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile into lp:banking-addons/bank-statement-reconcile-70

[Vincent Renaville@camptocamp]

This fix prevent to remove manual partial reconcile, when you use easy reconcile

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Why is there parenthesis around 'manual'?

[lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile]

160. By Vincent Renaville@camptocamp on 2014-06-20

[FIX] remove unuseful brackets

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

Thanks for the review, it's a typo mistake, I have corrected it

Vincent

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/bank-statement-reconcile. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

160. By Vincent Renaville@camptocamp on 2014-06-20

[FIX] remove unuseful brackets

159. By Vincent Renaville@camptocamp on 2014-06-20

[FIX] It exclude manual partial reconcile from reconcile selection

=== 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 15:02:02 +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