← Back to branch summary

~syleam/openobject-server/trunk-manage-tablespace

« back to all changes in this revision

Viewing changes to bin/addons/__init__.py

  • Committer: HDA(OpenERP)
  • Date: 2010-03-09 14:33:28 UTC
  • mfrom: (2111.1.5 trunk)
  • Revision ID: hda@tinyerp.com-20100309143328-g5g5wv6kgh38orqf
merged

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/addons/__init__.py
657
657
                    fp = tools.file_open(opj(m, xml))
658
658
                    if ext == '.csv':
659
659
                        tools.convert_csv_import(cr, m, os.path.basename(xml), fp.read(), idref, mode=mode, noupdate=True)
 
660
                    elif ext == '.yml':
 
661
                        tools.convert_yaml_import(cr, m, fp, idref, mode=mode, **kwargs)
660
662
                    else:
661
663
                        tools.convert_xml_import(cr, m, fp, idref, mode=mode, noupdate=True, **kwargs)
662
664
                    fp.close()