Merge lp:~openerp-dev/openobject-addons/trunk-bug-735990-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: Con not open account chart from Wizard If we passing fiscal year argument

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

rename variable fiscalyear => fiscalyear_id

and if data['fiscalyear']: => if fiscalyear_id:

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

hello,

I have changed as you describe above.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[OpenERP buildbot (openerp-buildbot)]

product/test/product_report.yml: 'int' object is unsubscriptable
account/test/account_fiscalyear_close_state.yml: 'int' object is unsubscriptable
project/test/test_project_delegation.yml: 'int' object is unsubscriptable
project_long_term/test/test_schedule_phases_case1.yml: 'int' object is unsubscriptable
project_gtd/test/gtd_test.yml: 'int' object is unsubscriptable

review: Disapprove

=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py	2011-02-15 12:13:39 +0000
+++ account/wizard/account_chart.py	2011-03-16 13:29:32 +0000
@@ -30,12 +30,12 @@
     _columns = {
         'fiscalyear': fields.many2one('account.fiscalyear', \
                                     'Fiscal year',  \
-                                    help = 'Keep empty for all open fiscal years'),
+                                    help='Keep empty for all open fiscal years'),
         'period_from': fields.many2one('account.period', 'Start period'),
         'period_to': fields.many2one('account.period', 'End period'),
         'target_move': fields.selection([('posted', 'All Posted Entries'),
                                          ('all', 'All Entries'),
-                                        ], 'Target Moves', required = True),
+                                        ], 'Target Moves', required=True),
     }
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
@@ -83,13 +83,16 @@
         result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
+        fiscalyear_id = data.get('fiscalyear', False) and data['fiscalyear'][0] or False
         result['periods'] = []
         if data['period_from'] and data['period_to']:
-            result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to'])
-        result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \
+            period_from = data.get('period_from', False) and data['period_from'][0] or False
+            period_to = data.get('period_to', False) and data['period_to'][0] or False
+            result['periods'] = period_obj.build_ctx_periods(cr, uid, period_from, period_to)
+        result['context'] = str({'fiscalyear': fiscalyear_id, 'periods': result['periods'], \
                                     'state': data['target_move']})
-        if data['fiscalyear']:
-            result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code']
+        if fiscalyear_id:
+            result['name'] += ':' + fy_obj.read(cr, uid, [fiscalyear_id], context=context)[0]['code']
         return result
 
     _defaults = {