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

[Ashvin Rathod (OpenERP)]

Hello,

Fix: Overlapping fiscal years error in initial chart of accounts installation

Thanks,
ara

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

review: Approve

=== modified file 'account/installer.py'
--- account/installer.py	2011-04-29 08:49:48 +0000
+++ account/installer.py	2011-05-23 09:14:33 +0000
@@ -118,7 +118,6 @@
     def execute(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        super(account_installer, self).execute(cr, uid, ids, context=context)
         fy_obj = self.pool.get('account.fiscalyear')
         mod_obj = self.pool.get('ir.model.data')
         obj_acc_temp = self.pool.get('account.account.template')
@@ -226,6 +225,7 @@
                         fy_obj.create_period(cr, uid, [fiscal_id])
                     elif res['period'] == '3months':
                         fy_obj.create_period3(cr, uid, [fiscal_id])
+        super(account_installer, self).execute(cr, uid, ids, context=context)
 
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(