Odoo Addons (MOVED TO GITHUB)

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

  1. 6.1-opw-590932-rha
  2. Merge into 6.1
Proposed by Anaël Closson (openerp)
Status: Merged
Merged at revision: 7203
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-590932-rha
Merge into: lp:openobject-addons/6.1
Diff against target: 25 lines (+2/-2)
2 files modified
l10n_fr/wizard/fr_report_bilan.py (+1/-1)
l10n_fr/wizard/fr_report_compute_resultant.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-590932-rha
Reviewer Review Type Date Requested Status
OpenERP R&D Team Pending
Review via email: mp+160621@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_fr/wizard/fr_report_bilan.py'
2--- l10n_fr/wizard/fr_report_bilan.py 2011-01-14 00:11:01 +0000
3+++ l10n_fr/wizard/fr_report_bilan.py 2013-04-24 12:13:31 +0000
4@@ -49,7 +49,7 @@
5 data = {}
6 data['form'] = {}
7 data['ids'] = active_ids
8- data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
9+ data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
10 return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
11
12 account_bilan_report()
13
14=== modified file 'l10n_fr/wizard/fr_report_compute_resultant.py'
15--- l10n_fr/wizard/fr_report_compute_resultant.py 2011-01-14 00:11:01 +0000
16+++ l10n_fr/wizard/fr_report_compute_resultant.py 2013-04-24 12:13:31 +0000
17@@ -49,7 +49,7 @@
18 data = {}
19 data['form'] = {}
20 data['ids'] = active_ids
21- data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
22+ data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
23 return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
24
25 account_cdr_report()