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

Proposed by Vincent Renaville@camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile
Merge into: lp:banking-addons/bank-statement-reconcile-70
Diff against target: 18 lines (+4/-1)
1 file modified
account_easy_reconcile/base_reconciliation.py (+4/-1)
To merge this branch: bzr merge lp:~camptocamp/banking-addons/vre-preserve-manual-partial-reconcile
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review Approve
Review via email: mp+223934@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Why is there parenthesis around 'manual'?

160. By Vincent Renaville@camptocamp

[FIX] remove unuseful brackets

Revision history for this message
Vincent Renaville@camptocamp (vrenaville-c2c) wrote :

Hello,

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

Vincent

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks

review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

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

[FIX] remove unuseful brackets

159. By Vincent Renaville@camptocamp

[FIX] It exclude manual partial reconcile from reconcile selection

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
77 return "SELECT %s" % ', '.join(self._base_columns(rec))77 return "SELECT %s" % ', '.join(self._base_columns(rec))
7878
79 def _from(self, rec, *args, **kwargs):79 def _from(self, rec, *args, **kwargs):
80 return "FROM account_move_line"80 return ("FROM account_move_line "
81 "LEFT OUTER JOIN account_move_reconcile ON (account_move_line.reconcile_partial_id = account_move_reconcile.id)"
82 )
8183
82 def _where(self, rec, *args, **kwargs):84 def _where(self, rec, *args, **kwargs):
83 where = ("WHERE account_move_line.account_id = %s "85 where = ("WHERE account_move_line.account_id = %s "
86 "AND COALESCE(account_move_reconcile.type,'') <> 'manual' "
84 "AND account_move_line.reconcile_id IS NULL ")87 "AND account_move_line.reconcile_id IS NULL ")
85 # it would be great to use dict for params88 # it would be great to use dict for params
86 # but as we use _where_calc in _get_filter89 # but as we use _where_calc in _get_filter

Subscribers

People subscribed via source and target branches