Merge lp:~openerp-dev/openobject-addons/6.0-opw-590932-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Printing 'Bilan Report' and 'Compte de resultat Report' from Journal Items side bar
prints these reports with blank values.

Reproduce:
- install l10n_fr and chart (France - Plan comptable général)
- create any customer or supplier invoice and validate it
- open Journal Items list, select the items and print these report from side bar
- reports having no values printed.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5468. By Rifakat Husen (OpenERP) on 2013-04-09

[FIX] l10n_fr: also fixed report 'Compte de resultat Report'

5467. By Rifakat Husen (OpenERP) on 2013-04-09

[FIX] l10n_fr: printing Bilan report show blank value in report

=== modified file 'l10n_fr/wizard/fr_report_bilan.py'
--- l10n_fr/wizard/fr_report_bilan.py	2011-01-14 00:11:01 +0000
+++ l10n_fr/wizard/fr_report_bilan.py	2013-04-09 06:41:27 +0000
@@ -49,7 +49,7 @@
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
 account_bilan_report()

=== modified file 'l10n_fr/wizard/fr_report_compute_resultant.py'
--- l10n_fr/wizard/fr_report_compute_resultant.py	2011-01-14 00:11:01 +0000
+++ l10n_fr/wizard/fr_report_compute_resultant.py	2013-04-09 06:41:27 +0000
@@ -49,7 +49,7 @@
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
 
 account_cdr_report()