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

[Nehal Panchal (OpenERP)]

Hello,

If you edit Journal Items (when "Centralised Counterpart" is True for the jouranl which is used in Journal Items) raises the traceback.

Steps to reproduce:
1. In Accounting > Configuration > Financial accounting > Journals > Journals, check that the journal "Opening entries journal" has the option "Centralized Counterpart" = True and it has a "Default Debit Account" and a "Default Credit Account".
2. Go to Accounting > Journal entries > Journal Items and set Journal = "Opening entries journal" and period = "03/2013" and click on "Filter"
3. Enter a line (enter some text in the "Reference" field) and save it.
4. Select a created line and modify the content of the field "Reference"

This fixes the issue.

Thanks

[Chris Biersbach (OpenERP) (cbi-openerp)]

I am rejecting this because 6.1 is not an LTS and we thus no longer merge in 6.1.

Unmerged revisions

7193. By Nehal Panchal (OpenERP) on 2013-03-26

[FIX] account : Crash when using a Centralised journal

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-09-06 14:35:17 +0000
+++ account/account_move_line.py	2013-03-26 07:15:26 +0000
@@ -1112,6 +1112,7 @@
         # use the first move ever created for this journal and period
         if context is None:
             context = {}
+        context = self.convert_to_period(cr, uid, context=context)
         cr.execute('SELECT id, state, name FROM account_move WHERE journal_id = %s AND period_id = %s ORDER BY id limit 1', (context['journal_id'],context['period_id']))
         res = cr.fetchone()
         if res: