Merge lp:~openerp-dev/openobject-addons/6.1-opw-51075-xal into lp:openobject-addons/6.1

Proposed by Xavier ALT
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-51075-xal
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
account/ (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-51075-xal
Reviewer Review Type Date Requested Status
Olivier Dony (Odoo) Needs Information
Review via email:

Description of the change


This is a forward-port of OPW 51075.

Display a usefull message when reconciling entries with have already been reconciled.
Note: Without, it make things unusable if that case happen; i.e impossible to find out the cause of the problem


To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

Looks good to me, but you should probably double-check the account.pot file to see if this term "Already Reconciled!" was used elsewhere and if not delete it, then add the new term. No need to re-export all templates, a manual fix of the POT should be sufficient here. BTW, do not forget to update the timestamp in POT header, I'm not sure if LP cares about it for detecting changes.


review: Needs Information

Unmerged revisions

6647. By Luc De Meyer

account.move.line: reconcile_partial() error msg when lines are already reconciled

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/'
2--- account/ 2012-02-13 18:07:41 +0000
3+++ account/ 2012-03-06 16:45:27 +0000
4@@ -751,7 +751,7 @@
5 else:
6 currency_id = line.company_id.currency_id
7 if line.reconcile_id:
8- raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
9+ raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (,,
10 if line.reconcile_partial_id:
11 for line2 in line.reconcile_partial_id.line_partial_ids:
12 if not line2.reconcile_id: