Merge lp:~camptocamp/openobject-addons/extra-6.0-syleam-document_csv-improvements into lp:~syleam/openobject-addons/extra-6.0-syleam

[Guewen Baconnier @ Camptocamp]

Hello,

Here is some improvements for your 6.0 branch on the document_csv module.
That's thoses I've done for 6.1 and backported for the 6.0 version.

 - Ported old wizard.interface wizards to osv_memory
 - Button to generate a structure with all fields of a model
 - Choose in which translation import a file
 - use /id and /.id as specified in the import_data documentation in orm.py
 - Fixed the menu and misplaced and a cast on a variable

Do you agree to merge that ?

Thanks
Guewen

[lp:~camptocamp/openobject-addons/extra-6.0-syleam-document_csv-improvements]

101. By Yannick Vaucher @ Camptocamp on 2011-12-02

[ADD] document_csv - field auto-completion option from csv in document import list

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello,

I just added an option in csv import wizard to auto fill fields of the document import lines.
It also adds all fields that are mandatory to the column list.

Regards,
Yannick

[lp:~camptocamp/openobject-addons/extra-6.0-syleam-document_csv-improvements]

102. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-01-10

[FIX] allow to get references by db id or xmlid also for sub-lines (relation and relation field selected like bom_lines/product_uom/.id when importing a mrp.bom)

103. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-01-10

[IMP] review auto-completion

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hello,

I just commit 2 new revisions:
 - Now the selection DB ID / ID / Search is also applied on sub items searches like bom_lines/product_uom/.id
 - Some modifications on the Yannick's autocompletion

Do you agree to merge please ?

Thanks
Guewen

[lp:~camptocamp/openobject-addons/extra-6.0-syleam-document_csv-improvements]

104. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-01-11

[FIX] help message

[Sylvain Garancher (sylvain-garancher)]

review: Approve

=== modified file 'document_csv/__openerp__.py'
--- document_csv/__openerp__.py	2011-11-11 10:21:25 +0000
+++ document_csv/__openerp__.py	2012-01-11 07:46:28 +0000
@@ -44,9 +44,10 @@
         'format_data.xml',
         'directory_data.xml',
         'content_type_data.xml',
-        'wizard/wizard.xml',
         'wizard/launch_view.xml',
         'wizard/read_csv_view.xml',
+        'wizard/export_yml_view.xml',
+        'wizard/import_yml_view.xml',
         'document_view.xml',
         #'export_view.xml',
     ],

=== modified file 'document_csv/document.py'
--- document_csv/document.py	2011-11-11 10:21:25 +0000
+++ document_csv/document.py	2012-01-11 07:46:28 +0000
@@ -3,6 +3,8 @@
 #
 #    document_csv module for OpenERP
 #    Copyright (C) 2009-2011 SYLEAM (<http://www.syleam.fr>) Christophe CHAUVET
+#    Copyright (C) 2011 Camptocamp (http://www.camptocamp.com)
+#              Guewen Baconnier
 #
 #    This file is a part of document_csv
 #
@@ -99,7 +101,7 @@
         'ctx': fields.char('Context', size=256, help='this part complete the original context'),
         'disable': fields.boolean('Disable', help='Check this, if you want to disable it'),
         'err_mail': fields.boolean('Send log by mail', help='The log file was send to all users of the groupes'),
-        'err_reject': fields.boolean('Reject all if error', help='Reject all lines if there is an error'),
+        'err_reject': fields.boolean('Reject all if error', help='Reject all lines if there is an error. You need to activate this flag if you import sub-items (like a BoM and its components) in the same file.'),
         'csv_sep': fields.char('Separator', size=1, required=True),
         'csv_esc': fields.char('Escape', size=1),
         'lang_id': fields.many2one('res.lang', 'Language', help='Language use in this import, to convert correctly date and float'),
@@ -158,6 +160,85 @@
 
         return {'warning': False}
 
+    def _prepare_structure_line(self, cr, uid, ids, field, context=None):
+        """
+        Prepare vals to write in document lines.
+        @param field: browse instance of a field
+        @return: dict of vals to write in the document for the field
+        """
+        import_line_obj = self.pool.get('document.import.list.line')
+        line_vals = {
+            'name': field.name,
+            'field_id': field.id,
+        }
+        onchange_res = import_line_obj.onchange_model_field(cr, uid, [], field.id, context=context)
+        line_vals.update(onchange_res['value'])
+        return line_vals
+
+    def _get_model_fields(self, cr, uid, model_id, context=None):
+        fields_obj = self.pool.get('ir.model.fields')
+        ctx_import = context.copy()
+        ctx_import.update({'import': True})
+
+        all_field_ids = fields_obj.search(cr, uid,
+            [('model_id', '=', model_id),
+             ('readonly', '=', False)],
+            context=ctx_import, order='name asc')
+        return all_field_ids
+    
+    def complete_structure_from_model(self, cr, uid, ids, context=None):
+        context = context or {}
+        if not isinstance(ids, list):
+            ids = [ids]
+        fields_obj = self.pool.get('ir.model.fields')
+        for import_list in self.browse(cr, uid, ids, context=context):
+            existing_lines = import_list.line_ids
+            struct_fields_ids = self._get_model_fields(cr, uid, import_list.model_id.id, context)
+            struct_fields = fields_obj.browse(cr, uid, struct_fields_ids, context)
+
+            existing_line_names = [f.name for f in existing_lines]
+
+            lines = []
+            # filter fields that match both list
+            # then prepare those lines to be updated
+            fields_to_replace = [(ef, sf) for ef in existing_lines for sf in struct_fields if ef.name[:].split('/')[0].split('.')[0] == sf.name]
+            for field in fields_to_replace:
+                line_vals = self._prepare_structure_line(cr, uid, ids, field[1], context=context)
+                line_vals.update({'name': field[0].name}) # ensure that we keep the csv header name
+                lines.append((1, field[0].id, line_vals))
+
+            # list fields that are mandatory but not listed in the csv file
+            missing_fields = [sf for sf in struct_fields if sf.name not in existing_line_names and sf.required == 't']
+            for field in missing_fields:
+                line_vals = self._prepare_structure_line(cr, uid, ids, field, context=context)
+                lines.append((0, 0, line_vals))
+
+            self.write(cr, uid, import_list.id,
+                       {'line_ids': lines},
+                       context=context)
+        return True
+
+    def generate_structure_from_model(self, cr, uid, ids, context=None):
+        fields_obj = self.pool.get('ir.model.fields')
+        for import_list in self.browse(cr, uid, ids, context=context):
+            existing_fields_ids = [il_field.id for il_field in [l.field_id for l in import_list.line_ids]]
+            all_fields_ids = self._get_model_fields(cr, uid, import_list.model_id.id, context=context)
+            # keep only non existing fields but keep the sort
+            fields_to_add_ids = [f_id for f_id in all_fields_ids if f_id not in existing_fields_ids]
+
+            lines = []
+            for field in fields_obj.browse(cr, uid, fields_to_add_ids, context=context):
+                line_vals = self._prepare_structure_line(cr, uid, ids, field, context=context)
+                if line_vals:
+                    lines.append((0, 0, line_vals))
+
+            self.write(cr, uid, import_list.id,
+                       {'line_ids': lines},
+                       context=context)
+
+        return True
+
+
 import_list()
 
 

=== modified file 'document_csv/document_view.xml'
--- document_csv/document_view.xml	2011-11-11 10:21:25 +0000
+++ document_csv/document_view.xml	2012-01-11 07:46:28 +0000
@@ -123,7 +123,8 @@
                                 <group colspan="2" col="2">
                                     <separator string="Actions" colspan="2"/>
                                     <button string="Read CSV Header" type="action" name="%(document_csv.action_wizard_read_csv_file_view)d" colspan="2"/>
-                                    <button string="Export structure" type="action" name="%(document_csv.document_csv_export_wizard)d" colspan="2"/>
+                                    <button string="Generate structure from model" type="object" name="generate_structure_from_model" colspan="2"/>
+                                    <button string="Export structure" type="action" name="%(document_csv.action_document_import_csv_export_yaml)d" colspan="2"/>
                                     <separator string="Import file information" colspan="2"/>
                                     <field name="csv_sep"/>
                                     <field name="csv_esc"/>

=== modified file 'document_csv/ir_attachment.py'
--- document_csv/ir_attachment.py	2011-11-23 11:00:10 +0000
+++ document_csv/ir_attachment.py	2012-01-11 07:46:28 +0000
@@ -4,6 +4,8 @@
 #    document_csv module for OpenERP, Import structure in CSV
 #    Copyright (C) 2011 SYLEAM (<http://www.syleam.fr/>)
 #              Christophe CHAUVET <[e-mail]>
+#    Copyright (C) 2011 Camptocamp (http://www.camptocamp.com)
+#              Guewen Baconnier
 #
 #    This file is a part of document_csv
 #
@@ -88,7 +90,7 @@
             args = {
                 'name': l.name,
                 'field': l.field_id.name,
-                'rel_field': l .field_relation_id.name,
+                'rel_field': l.field_relation_id.name,
                 'type': l.field_id.ttype,
                 'relation': l.field_id.relation,
                 'key': l.refkey,
@@ -113,7 +115,7 @@
             header.append(u'id')
         if rel_uniq_key:
             for x in rel_uniq_key:
-                header.append('%s:id' % x)
+                header.append('%s/id' % x)
 
         for h in fld:
             rej_header.append(h['name'])
@@ -121,11 +123,14 @@
                 header.append(h['field'])
             else:
                 if h['rel_field']:
-                    header.append('%s/%s' % (h['field'], h['rel_field']))
-                elif h['ref'] in ('id', 'db_id'):
-                    header.append('%s:%s' % (h['field'], h['ref']))
+                    base_field = '%s/%s' % (h['field'], h['rel_field'])
                 else:
-                    header.append(h['field'])
+                    base_field = h['field']
+                if h['ref'] == 'db_id':
+                    base_field = '%s/.id' % (base_field,)
+                elif h['ref'] == 'id':
+                    base_field = '%s/id' % (base_field,)
+                header.append(base_field)
 
         _logger.debug('module document_csv: ' + log_compose('%s: %s' % ('Object', imp_data.model_id.model)))
         _logger.debug('module document_csv: ' + log_compose('%s: %r' % ('Context', context)))

=== modified file 'document_csv/menu_view.xml'
--- document_csv/menu_view.xml	2011-11-11 10:21:25 +0000
+++ document_csv/menu_view.xml	2012-01-11 07:46:28 +0000
@@ -32,7 +32,7 @@
         <menuitem id="menu_document_import_configuration"
             sequence="30"
             name="Exchange Datas"
-            parent="base.menu_lunch_survey_root"/>
+            parent="base.menu_tools"/>
 
     </data>
 </openerp>

=== modified file 'document_csv/wizard/export_yml.py'
--- document_csv/wizard/export_yml.py	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/export_yml.py	2012-01-11 07:46:28 +0000
@@ -3,6 +3,7 @@
 #
 #    document_csv module for OpenERP
 #    Copyright (C) 2009-2011 SYLEAM (<http://www.syleam.fr>) Christophe CHAUVET
+#    Copyright (C) 2011 Camptocamp Guewen Baconnier
 #
 #    This file is a part of document_csv
 #
@@ -21,103 +22,81 @@
 #
 ##############################################################################
 
-import wizard
-import pooler
-from cStringIO import StringIO
+from osv import osv, fields
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
 import base64
 from tools.translate import _
 
-init_form = """<?xml version="1.0" ?>
-<form string="Export file structure">
-  <separator string="The export file is available, save it to a local drive" colspan="4"/>
-  <field name="name" invisible="1"/>
-  <field name="filename" colspan="4" width="350" fieldname="name" readonly="1"/>
-</form>
-"""
-
-init_fields = {
-    'name': {'string': 'File name', 'type': 'char', 'size': 128},
-    'filename': {'string': 'Select a filename, and save it', 'type': 'binary', 'required': True, 'filters': '*.yml'},
-}
-
-
-def _init(self, cr, uid, data, context):
-    if context is None:
-        context = {}
-
-    try:
-        import yaml
-    except ImportError:
-        raise wizard.except_wizard(_('Error'), _('Python Yaml Module not found, see description module'))
-    pool = pooler.get_pool(cr.dbname)
-    doc_obj = pool.get('document.import.list')
-    doc = doc_obj.browse(cr, uid, data['id'], context=context)
-    yml_file = '%s.yml' % doc.name.lower().replace(' ', '_').replace('-', '')
-    content = {
-        'version': '1.3',
-        'name': doc.name,
-        'object': doc.model_id.model,
-        'context': doc.ctx,
-        'separator': doc.csv_sep,
-        'escape': doc.csv_esc,
-        'encoding': doc.encoding,
-        'key_field_name': doc.key_field_name,
-        'reject_all': doc.err_reject,
-        'log_filename': doc.log_filename,
-        'reject_filename': doc.reject_filename,
-        'backup_filename': doc.backup_filename,
-        'lang': doc.lang_id.code or 'en_US',
-        'notes': doc.notes or '',
-        'send_mail': doc.err_mail,
-        'mail_from': doc.mail_from,
-        'mail_cc': doc.mail_cc,
-        'mail_subject': doc.mail_subject,
-        'mail_body': doc.mail_body,
-        'mail_cc_err': doc.mail_cc_err,
-        'mail_subject_err': doc.mail_subject_err,
-        'mail_body_err': doc.mail_body_err,
+class ExportYaml(osv.osv_memory):
+
+    _name = 'document.import.csv.export.yaml'
+
+    _columns = {
+        'name': fields.char('Filename', size=128),
+        'filename': fields.binary('Select a filename and save it', required=True, filters='*.yml'),
     }
-    lines = []
-    for l in doc.line_ids:
-        line = {}
-        line['name'] = l.name
-        line['field'] = l.field_id.name
-        if l.field_id.ttype in ('many2one', 'one2many', 'many2many'):
-            line['model'] = l.model_relation_id.model and str(l.model_relation_id.model) or False
-            line['model_field'] = l.field_relation_id.name and str(l.field_relation_id.name) or False
-            line['relation'] = l.relation and str(l.relation) or False
-        line['refkey'] = l.refkey
-        lines.append(line)
-
-    content['lines'] = lines
-    buf = StringIO()
-    buf.write(yaml.dump(content, encoding='utf-8', default_flow_style=False))
-    out = base64.encodestring(buf.getvalue())
-    buf.close()
-    return {'filename': out, 'name': yml_file}
-
-
-class export_yaml(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [_init],
-            'result': {
-                'type': 'form',
-                'arch': init_form,
-                'fields': init_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('valid', 'OK', 'gtk-ok', True)],
-            }
-        },
-        'valid': {
-            'actions': [],
-            'result': {
-                'type': 'state',
-                'state': 'end'
-            }
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        if context is None: context = {}
+        res = super(ExportYaml, self).default_get(cr, uid, fields_list, context=context)
+
+        try:
+            import yaml
+        except ImportError:
+            raise osv.except_osv(_('Error'), _('Python Yaml Module not found, see description module'))
+
+        doc_id = context.get('active_id')
+        doc_obj = self.pool.get('document.import.list')
+        doc = doc_obj.browse(cr, uid, doc_id, context=context)
+
+        yml_file = '%s.yml' % doc.name.lower().replace(' ', '_').replace('-', '')
+        content = {
+            'version': '1.3',
+            'name': doc.name,
+            'object': doc.model_id.model,
+            'context': doc.ctx,
+            'separator': doc.csv_sep,
+            'escape': doc.csv_esc,
+            'encoding': doc.encoding,
+            'key_field_name': doc.key_field_name,
+            'reject_all': doc.err_reject,
+            'log_filename': doc.log_filename,
+            'reject_filename': doc.reject_filename,
+            'backup_filename': doc.backup_filename,
+            'lang': doc.lang_id.code or 'en_US',
+            'notes': doc.notes or '',
+            'send_mail': doc.err_mail,
+            'mail_from': doc.mail_from,
+            'mail_cc': doc.mail_cc,
+            'mail_subject': doc.mail_subject,
+            'mail_body': doc.mail_body,
+            'mail_cc_err': doc.mail_cc_err,
+            'mail_subject_err': doc.mail_subject_err,
+            'mail_body_err': doc.mail_body_err,
         }
-    }
-
-export_yaml('document_csv.export')
+        lines = []
+        for l in doc.line_ids:
+            line = {}
+            line['name'] = l.name
+            line['field'] = l.field_id.name
+            if l.field_id.ttype in ('many2one', 'one2many', 'many2many'):
+                line['model'] = l.model_relation_id.model and str(l.model_relation_id.model) or False
+                line['model_field'] = l.field_relation_id.name and str(l.field_relation_id.name) or False
+                line['relation'] = l.relation and str(l.relation) or False
+            line['refkey'] = l.refkey
+            lines.append(line)
+
+        content['lines'] = lines
+        buf = StringIO()
+        buf.write(yaml.dump(content, encoding='utf-8', default_flow_style=False))
+        out = base64.encodestring(buf.getvalue())
+        buf.close()
+        res.update({'filename': out, 'name': yml_file})
+        return res
+
+ExportYaml()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'document_csv/wizard/export_yml_view.xml'
--- document_csv/wizard/export_yml_view.xml	1970-01-01 00:00:00 +0000
+++ document_csv/wizard/export_yml_view.xml	2012-01-11 07:46:28 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_document_import_csv_export_yaml_form" model="ir.ui.view">
+            <field name="name">document.import.csv.export.yaml.form</field>
+            <field name="model">document.import.csv.export.yaml</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <form string="Export file structure">
+                    <separator string="The export file is available, save it to a local drive" colspan="4"/>
+                    <field name="name" invisible="1"/>
+                    <field name="filename" colspan="4" width="350" fieldname="name" readonly="1"/>
+                    <separator string=""/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_document_import_csv_export_yaml">
+            <field name="name">Export Yaml</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">document.import.csv.export.yaml</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'document_csv/wizard/import_yml.py'
--- document_csv/wizard/import_yml.py	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/import_yml.py	2012-01-11 07:46:28 +0000
@@ -21,140 +21,113 @@
 #
 ##############################################################################
 
-import wizard
-import pooler
 import base64
 import yaml
+from osv import osv, fields
 from tools.translate import _
 
-init_form = """<?xml version="1.0" ?>
-<form string="Import CSV structure">
-  <field name="name" colspan="4"/>
-  <separator string="Select file to import" colspan="4"/>
-  <field name="filename" colspan="4" width="350"/>
-</form>
-"""
-
-init_fields = {
-    'filename': {'string': 'Select File', 'type': 'binary', 'required': True, 'filters': '*.yml'},
-    'name': {'string': 'Name of the new import', 'type': 'char', 'size': 64, 'required': False},
-}
-
-
-def _import(self, cr, uid, data, context):
-    if context is None:
-        context = {}
-
-    pool = pooler.get_pool(cr.dbname)
-    model_obj = pool.get('ir.model')
-    fld_obj = pool.get('ir.model.fields')
-    dat_obj = pool.get('ir.model.data')
-    dir_obj = pool.get('document.directory')
-    imp_obj = pool.get('document.import.list')
-    act_obj = pool.get('ir.actions.act_window')
-
-    context['import'] = True
-
-    content = base64.decodestring(data['form']['filename'])
-    st = yaml.load(content)
-
-    # Search the model_id
-    mod_ids = model_obj.search(cr, uid, [('model', '=', st['object'])])
-    if not mod_ids:
-        raise wizard.except_wizard(_('Error'),
-                _('No model name %s found') % st['object'])
-    mod_id = mod_ids[0]
-    imp = {
-        'name': data['form']['name'] or st['name'],
-        'ctx': st['context'],
-        'model_id': mod_id,
-        'csv_sep': st.get('separator', ';'),
-        'csv_esc': st.get('escape', '"'),
-        'encoding': st.get('encoding', 'utf-8'),
+class ImportYaml(osv.osv_memory):
+    _name = 'document.import.csv.import.yaml'
+
+    _columns = {
+        'filename': fields.binary('Select file to import', required=True, filters='*.yml'),
+        'name': fields.char('Name of the new import', size=64),
     }
-    if st.get('version', '0.0') >= '1.1':
-        imp['err_reject'] = st.get('reject_all', False)
-        imp['log_filename'] = st.get('log_filename', False)
-        imp['reject_filename'] = st.get('reject_filename', False)
-        imp['backup_filename'] = st.get('backup_filename', False)
-
-    if st.get('version', '0.0') >= '1.2':
-        imp['notes'] = st.get('notes', False)
-        imp['lang'] = st.get('lang', 'en_US')
-        imp['err_mail'] = st.get('send_mail', False)
-        imp['mail_from'] = st.get('mail_from', False)
-        imp['mail_cc'] = st.get('mail_cc', False)
-        imp['mail_subject'] = st.get('mail_subject', False)
-        imp['mail_body'] = st.get('mail_body', False)
-        imp['mail_cc_err'] = st.get('mail_cc_err', False)
-        imp['mail_subject_err'] = st.get('mail_subject_err', False)
-        imp['mail_body_err'] = st.get('mail_body_err', False)
-
-    if st.get('version', '0.0') >= '1.3':
-        imp['key_field_name'] = st.get('key_field_name', False)
-
-    lines_ids = []
-    for i in st['lines']:
-        # The field id associate to the name
-        fld_ids = fld_obj.search(cr, uid, [('model_id', '=', mod_id), ('name', '=', i['field'])], context=context)
-        if not fld_ids:
-            raise wizard.except_wizard(_('Error'), _('No field %s found in the object') % i['field'])
-
-        l = {
-            'name': i['name'],
-            'field_id': fld_ids[0],
-            'relation': i.get('relation', False),
-            'refkey': i.get('refkey', False),
+
+    def action_import(self, cr, uid, ids, context):
+        if context is None:
+            context = {}
+
+        context['import'] = True
+
+        model_obj = self.pool.get('ir.model')
+        fld_obj = self.pool.get('ir.model.fields')
+        dat_obj = self.pool.get('ir.model.data')
+        imp_obj = self.pool.get('document.import.list')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        form_id = ids
+        if isinstance(form_id, list):
+            form_id = form_id[0]
+        form = self.read(cr, uid, form_id, context=context)
+
+        content = base64.decodestring(form['filename'])
+        st = yaml.load(content)
+
+        # Search the model_id
+        mod_ids = model_obj.search(cr, uid, [('model', '=', st['object'])])
+        if not mod_ids:
+            raise osv.except_osv(_('Error'),
+                    _('No model name %s found') % st['object'])
+        mod_id = mod_ids[0]
+        imp = {
+            'name': form['name'] or st['name'],
+            'ctx': st['context'],
+            'model_id': mod_id,
+            'csv_sep': st.get('separator', ';'),
+            'csv_esc': st.get('escape', '"'),
+            'encoding': st.get('encoding', 'utf-8'),
         }
-        if i.get('model') and i.get('model') not in ('None', 'False'):
-            mod_ids = model_obj.search(cr, uid, [('model', '=', i['model'])])
-            if not mod_ids:
-                raise wizard.except_wizard(_('Error'),
-                                   _('No model name %s found') % i['model'])
-
-            l['model_relation_id'] = mod_ids[0]
-        if i.get('model_field') and i.get('model_field') not in ('None', 'False'):
-            fld_ids = fld_obj.search(cr, uid, [('model_id', '=', mod_ids[0]), ('name', '=', i['model_field'])])
+        if st.get('version', '0.0') >= '1.1':
+            imp['err_reject'] = st.get('reject_all', False)
+            imp['log_filename'] = st.get('log_filename', False)
+            imp['reject_filename'] = st.get('reject_filename', False)
+            imp['backup_filename'] = st.get('backup_filename', False)
+
+        if st.get('version', '0.0') >= '1.2':
+            imp['notes'] = st.get('notes', False)
+            imp['lang'] = st.get('lang', 'en_US')
+            imp['err_mail'] = st.get('send_mail', False)
+            imp['mail_from'] = st.get('mail_from', False)
+            imp['mail_cc'] = st.get('mail_cc', False)
+            imp['mail_subject'] = st.get('mail_subject', False)
+            imp['mail_body'] = st.get('mail_body', False)
+            imp['mail_cc_err'] = st.get('mail_cc_err', False)
+            imp['mail_subject_err'] = st.get('mail_subject_err', False)
+            imp['mail_body_err'] = st.get('mail_body_err', False)
+
+        if st.get('version', '0.0') >= '1.3':
+            imp['key_field_name'] = st.get('key_field_name', False)
+
+        lines_ids = []
+        for i in st['lines']:
+            # The field id associate to the name
+            fld_ids = fld_obj.search(cr, uid, [('model_id', '=', mod_id), ('name', '=', i['field'])], context=context)
             if not fld_ids:
-                raise wizard.except_wizard(_('Error'), _('No field %s found in the object') % i['model_field'])
-            l['field_relation_id'] = fld_ids[0]
-
-        lines_ids.append((0, 0, l))
-    imp['line_ids'] = lines_ids
-
-    imp_id = imp_obj.create(cr, uid, imp, context=context)
-    if not imp_id:
-        raise wizard.except_wizard(_('Error'), _('Failed to create the list entry'))
-
-    result = dat_obj._get_id(cr, uid, 'document_csv', 'action_document_import_list')
-    id = dat_obj.read(cr, uid, result, ['res_id'])['res_id']
-    result = act_obj.read(cr, uid, id)
-    result['domain'] = "[('id','in', [" + ','.join(map(str, [imp_id])) + "])]"
-    return result
-
-
-class import_yaml(wizard.interface):
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': init_form,
-                'fields': init_fields,
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('valid', 'OK', 'gtk-ok', True)],
-            }
-        },
-        'valid': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': _import,
-                'state': 'end'
-            }
-        }
-    }
-
-import_yaml('document_csv.import')
+                raise osv.except_osv(_('Error'), _('No field %s found in the object') % i['field'])
+
+            l = {
+                'name': i['name'],
+                'field_id': fld_ids[0],
+                'relation': i.get('relation', False),
+                'refkey': i.get('refkey', False),
+            }
+            if i.get('model') and i.get('model') not in ('None', 'False'):
+                mod_ids = model_obj.search(cr, uid, [('model', '=', i['model'])])
+                if not mod_ids:
+                    raise osv.except_osv(_('Error'),
+                                       _('No model name %s found') % i['model'])
+
+                l['model_relation_id'] = mod_ids[0]
+            if i.get('model_field') and i.get('model_field') not in ('None', 'False'):
+                fld_ids = fld_obj.search(cr, uid, [('model_id', '=', mod_ids[0]), ('name', '=', i['model_field'])])
+                if not fld_ids:
+                    raise osv.except_osv(_('Error'), _('No field %s found in the object') % i['model_field'])
+                l['field_relation_id'] = fld_ids[0]
+
+            lines_ids.append((0, 0, l))
+        imp['line_ids'] = lines_ids
+
+        imp_id = imp_obj.create(cr, uid, imp, context=context)
+        if not imp_id:
+            raise osv.except_osv(_('Error'), _('Failed to create the list entry'))
+
+        result = dat_obj._get_id(cr, uid, 'document_csv', 'action_document_import_list')
+        id = dat_obj.read(cr, uid, result, ['res_id'])['res_id']
+        result = act_obj.read(cr, uid, id)
+        result['domain'] = "[('id','in', [" + ','.join(map(str, [imp_id])) + "])]"
+        return result
+
+ImportYaml()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'document_csv/wizard/import_yml_view.xml'
--- document_csv/wizard/import_yml_view.xml	1970-01-01 00:00:00 +0000
+++ document_csv/wizard/import_yml_view.xml	2012-01-11 07:46:28 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_document_import_csv_import_yaml_form" model="ir.ui.view">
+            <field name="name">document.import.csv.import.yaml.form</field>
+            <field name="model">document.import.csv.import.yaml</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <form string="Import file structure">
+                    <field name="name" colspan="4"/>
+                    <field name="filename" colspan="4" width="350"/>
+                    <separator string=""/>
+                    <group colspan="4" col="6">
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button  icon="terp-gtk-go-back-rtl" string="Import Yaml structure" name="action_import" type="object" default_focus="1"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_document_import_csv_import_yaml">
+            <field name="name">Import Yaml</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">document.import.csv.import.yaml</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem id="menu_document_csv_import"
+            sequence="20"
+            name="Import Structure"
+            action="action_document_import_csv_import_yaml"
+            parent="menu_document_import_configuration"/>
+
+    </data>
+</openerp>

=== modified file 'document_csv/wizard/launch.py'
--- document_csv/wizard/launch.py	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/launch.py	2012-01-11 07:46:28 +0000
@@ -4,6 +4,8 @@
 #    document_csv module for OpenERP, Import structure in CSV
 #    Copyright (C) 2011 SYLEAM (<http://www.syleam.fr/>)
 #              Christophe CHAUVET <[e-mail]>
+#    Copyright (C) 2011 Camptocamp (http://www.camptocamp.com)
+#              Guewen Baconnier
 #
 #    This file is a part of document_csv
 #
@@ -41,6 +43,7 @@
     _columns = {
         'import_list': fields.selection(_import_list, 'List', help='List of available import structure', required=True),
         'import_file': fields.binary('Filename', required=True),
+        'lang_id': fields.many2one('res.lang', 'Language', help='Translation to update.'),
         'email_result': fields.char('Email', size=256, help='Email to send notification when import is finished'),
     }
 
@@ -52,15 +55,23 @@
             context = {}
 
         res = super(LaunchImport, self).default_get(cr, uid, fields_list, context=context)
-        res['email_result'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).user_email or ''
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        res['email_result'] = user.user_email or ''
+        if context.get('lang'):
+            res['lang_id'] = self.pool.get('res.lang').search(cr, uid, [('code', '=', context['lang'])], context=context)
         return res
 
     def launch_import(self, cr, uid, ids, context=None):
         """
         Save file, and execute importation
         """
+        if context is None:
+            context = {}
         cur = self.browse(cr, uid, ids[0], context=context)
-        self.pool.get('ir.attachment').import_csv(cr, uid, cur.import_list, cur.import_file, cur.email_result, context=context)
+        ctx = context.copy()
+        if cur.lang_id:
+            ctx.update({'lang': cur.lang_id.code})
+        self.pool.get('ir.attachment').import_csv(cr, uid, int(cur.import_list), cur.import_file, cur.email_result, context=ctx)
         return {'type': 'ir.actions.act_window_close'}
 
 LaunchImport()

=== modified file 'document_csv/wizard/launch_view.xml'
--- document_csv/wizard/launch_view.xml	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/launch_view.xml	2012-01-11 07:46:28 +0000
@@ -35,7 +35,9 @@
                     <field name="import_list" nolabel="1" />
                     <separator string="Select file to import" colspan="4"/>
                     <field name="import_file" nolabel="1" />
-                    <separator string="Email to send notificaiton when import is finished" colspan="4"/>
+                    <separator string="Translation to update from this file" colspan="4"/>
+                    <field name="lang_id" widget="selection" nolabel="1"/>
+                    <separator string="Email to send notification when import is finished" colspan="4"/>
                     <field name="email_result" nolabel="1" />
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">

=== modified file 'document_csv/wizard/read_csv.py'
--- document_csv/wizard/read_csv.py	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/read_csv.py	2012-01-11 07:46:28 +0000
@@ -40,6 +40,7 @@
 
     _columns = {
         'import_file': fields.binary('Filename', required=True),
+        'auto_completion': fields.boolean('Automatic Completion', help="Auto-complete the fields and relations based on the header names if the header names are the same as the OpenERP field names."),
     }
 
     def read_header(self, cr, uid, ids, context=None):
@@ -73,6 +74,9 @@
         finally:
             fpcsv.close()
 
+        if cur.auto_completion:
+            implist_obj.complete_structure_from_model(cr, uid, implist.id, context=context)
+
         return {'type': 'ir.actions.act_window_close'}
 
 ReadCsv()

=== modified file 'document_csv/wizard/read_csv_view.xml'
--- document_csv/wizard/read_csv_view.xml	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/read_csv_view.xml	2012-01-11 07:46:28 +0000
@@ -32,7 +32,8 @@
             <field name="arch" type="xml">
                 <form string="Import Form">
                     <separator string="Select file to analyse" colspan="4"/>
-                    <field name="import_file" nolabel="1" />
+                    <field name="import_file" nolabel="1" colspan="4"/>
+                    <field name="auto_completion" />
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>

=== removed file 'document_csv/wizard/wizard.xml'
--- document_csv/wizard/wizard.xml	2011-11-11 10:21:25 +0000
+++ document_csv/wizard/wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        ##############################################################################
-        #
-        #    document_csv module for OpenERP
-        #    Copyright (C) 2009-2011 SYLEAM ([http://www.syleam.fr]) Christophe CHAUVET
-        #
-        #    This file is a part of document_csv
-        #
-        #    document_csv is free software: you can redistribute it and/or modify
-        #    it under the terms of the GNU General Public License as published by
-        #    the Free Software Foundation, either version 3 of the License, or
-        #    (at your option) any later version.
-        #
-        #    document_csv is distributed in the hope that it will be useful,
-        #    but WITHOUT ANY WARRANTY; without even the implied warranty of
-        #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        #    GNU General Public License for more details.
-        #
-        #    You should have received a copy of the GNU General Public License
-        #    along with this program.  If not, see [http://www.gnu.org/licenses/].
-        #
-        ##############################################################################
-
-        <wizard id="document_csv_export_wizard"
-            name="document_csv.export"
-            model="document.import.list"
-            menu="False"
-            string="Export structure"/>
-
-        <wizard id='document_csv_import_wizard'
-            name="document_csv.import"
-            model="document.import.list"
-            string="Import structure"
-            menu="False"/>
-
-        <menuitem id="menu_document_csv_import"
-            sequence="20"
-            name="Import Structure"
-            action="document_csv_import_wizard"
-            parent="menu_document_import_configuration"
-            type="wizard"/>
-
-    </data>
-</openerp>