diff options
| author | vra <vra@tinyerp.com> | 2010-06-24 14:16:50 +0530 |
|---|---|---|
| committer | vra <vra@tinyerp.com> | 2010-06-24 14:16:50 +0530 |
| commit | 7ed648ce889dfeaa9045602fad7dca555095e9d4 (patch) | |
| tree | 9dc3dffd579a27ace5529179b203c41227d3e19e /bin/addons/__init__.py | |
| parent | b311f12e2a697bfaad7582aff9ac6502129e9a61 (diff) | |
| parent | 5696ed3785c80671b38fd196584786482d293dea (diff) | |
[MERGE] merge the changes from main trunk branch.
bzr revid: vra@tinyerp.com-20100624084539-ne1e1tscqn1z3jw5
bzr revid: vra@tinyerp.com-20100624084650-svala4jb0dnf7aal
Diffstat (limited to 'bin/addons/__init__.py')
| -rw-r--r-- | bin/addons/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py index a7557448ad2..a538e928cad 100644 --- a/bin/addons/__init__.py +++ b/bin/addons/__init__.py @@ -665,7 +665,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs): process_sql_file(cr, fp) elif ext == '.csv': noupdate = (kind == 'init') - tools.convert_csv_import(cr, module_name, file, id_map, mode, noupdate) + tools.convert_csv_import(cr, module_name, pathname, file.read(), id_map, mode, noupdate) elif ext == '.yml': tools.convert_yaml_import(cr, module_name, file, id_map, mode, noupdate) else: |