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

[Xavier ALT]

Hi,

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

Thanks,
Xavier

[Olivier Dony (Odoo) (odo-openerp)]

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.

Thanks!

review: Needs Information

Unmerged revisions

6647. By Luc De Meyer on 2012-03-06

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

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-02-13 18:07:41 +0000
+++ account/account_move_line.py	2012-03-06 16:45:27 +0000
@@ -751,7 +751,7 @@
             else:
                 currency_id = line.company_id.currency_id
             if line.reconcile_id:
-                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
+                raise osv.except_osv(_('Warning'), _("Journal Item '%s' (id: %s), Move '%s' is already reconciled!") % (line.name, line.id, line.move_id.name))
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     if not line2.reconcile_id: