[FIX] Bug. Closing cursor in incorrect place

wizard/padron_import.py

@@ -252,6 +252,7 @@ class padron_import_(osv.osv_memory):
 
         dbname = cr.dbname
         cursor = pooler.get_db(dbname).cursor()  # Obtengo un nuevo cursor a partir del cursor existente
+        flag = False
         for file_name in files_extracted:
             txt_path = "'" + file_name + "'"
             if 'Ret' in file_name:
@@ -286,6 +287,7 @@ class padron_import_(osv.osv_memory):
                     cursor.rollback()
                     _logger.warning('[ARBA]ERROR: Rollback')
                 else:
+                    flag = True
                     cursor.commit()
                     _logger.info('[ARBA]SUCCESS: Fin de carga de retenciones')
             if 'Per' in file_name:
@@ -318,26 +320,28 @@ class padron_import_(osv.osv_memory):
                     cursor.rollback()
                     _logger.warning('[ARBA]ERROR: Rollback')
                 else:
+                    flag = True
+                    cursor.commit()
                     _logger.info('[ARBA]SUCCESS: Fin de carga de percepciones')
-                    # Mass Update
-                    try:
-                        mass_wiz_obj = self.pool.get('padron.mass.update')
-                        mass_wiz_id = mass_wiz_obj.create(cursor, uid,
-                                {'arba': True, 'agip': False}, context={})
-                        mass_wiz_obj.action_update(cursor, uid, [mass_wiz_id])
 
-                        _logger.info('[ARBA] Mass Update Completado')
+        # Mass Update
+        if flag:
+            try:
+                mass_wiz_obj = self.pool.get('padron.mass.update')
+                mass_wiz_id = mass_wiz_obj.create(cursor, uid,
+                        {'arba': True, 'agip': False}, context={})
+                mass_wiz_obj.action_update(cursor, uid, [mass_wiz_id])
 
-                    except Exception, e:
-                        _logger.exception(e)
-                        raise e
-                    finally:
-                        cursor.commit()
+                _logger.info('[ARBA] Mass Update Completado')
 
-                finally:
-                    rmtree(out_path)  # Delete temp folder
-                    cursor.close()
+            except Exception, e:
+                _logger.exception(e)
+                cursor.rollback()
+            else:
+                cursor.commit()
 
+        rmtree(out_path)  # Delete temp folder
+        cursor.close()
         return True
 
     def import_zip_file(self, cr, uid, ids, context=None):