Codereview

This commit is contained in:
resteve 2013-10-18 14:58:11 +02:00
parent 8bce61ca9c
commit 29a33883b9

View file

@ -350,12 +350,14 @@ class CSVArchive(Workflow, ModelSQL, ModelView):
@Workflow.transition('done') @Workflow.transition('done')
def import_csv(cls, archives): def import_csv(cls, archives):
pool = Pool() pool = Pool()
now = datetime.now()
ExternalMapping = pool.get('base.external.mapping') ExternalMapping = pool.get('base.external.mapping')
CSVImport = pool.get('csv.import') CSVImport = pool.get('csv.import')
User = pool.get('res.user') User = pool.get('res.user')
now = datetime.now()
log_vlist = [] log_vlist = []
context = {} context = {}
for archive in archives: for archive in archives:
profile = archive.profile profile = archive.profile
separator = profile.csv_archive_separator separator = profile.csv_archive_separator
@ -367,6 +369,7 @@ class CSVArchive(Workflow, ModelSQL, ModelView):
model = code_internal.model.model model = code_internal.model.model
external_mappings = profile.models external_mappings = profile.models
field_key = profile.code_external field_key = profile.code_external
ModelToImport = pool.get(model) ModelToImport = pool.get(model)
data = StringIO(archive.data) data = StringIO(archive.data)
@ -385,6 +388,7 @@ class CSVArchive(Workflow, ModelSQL, ModelView):
}) })
CSVImport.create(log_vlist) CSVImport.create(log_vlist)
return return
log_vlist.append({ log_vlist.append({
'create_date': now, 'create_date': now,
'status': 'done', 'status': 'done',
@ -395,6 +399,7 @@ class CSVArchive(Workflow, ModelSQL, ModelView):
if header: if header:
rows.next() rows.next()
parent_models = ExternalMapping.search([('parent', '=', None)]) parent_models = ExternalMapping.search([('parent', '=', None)])
send_mail = [] send_mail = []
csv_vals = {} csv_vals = {}
new_records = [] new_records = []
@ -432,6 +437,7 @@ class CSVArchive(Workflow, ModelSQL, ModelView):
}) })
CSVImport.create(log_vlist) CSVImport.create(log_vlist)
return return
if code_external: if code_external:
try_vals = {} try_vals = {}
for external_mapping in external_mappings: for external_mapping in external_mappings: