Merge lp:~openerp-dev/openobject-addons/6.1-opw-582763-nep into lp:openobject-addons/6.1

Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 7092
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-582763-nep
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
account/account_move_line.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-582763-nep
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+138059@code.launchpad.net

Description of the change

Hello,

Improved warning message for already reconciled entries.

Thanks

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Unmerged revisions

7092. By Nehal Panchal (OpenERP)

[IMP] account : Improved warning message for already reconciled entries

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_move_line.py'
2--- account/account_move_line.py 2012-09-06 14:35:17 +0000
3+++ account/account_move_line.py 2012-12-05 06:17:22 +0000
4@@ -772,7 +772,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!") % (line.name, line.id, line.move_id.name))
10 if line.reconcile_partial_id:
11 for line2 in line.reconcile_partial_id.line_partial_ids:
12 if not line2.reconcile_id: