diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index da471499087..be1f103d6f9 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -10,6 +10,8 @@ import openerpweb.ast
 import openerpweb.nonliterals
 
 import cherrypy
+import csv
+import xml.dom.minidom
 
 # Should move to openerpweb.Xml2Json
 class Xml2Json:
@@ -179,7 +181,7 @@ class Session(openerpweb.Controller):
         context, domain = eval_context_and_domain(req.session,
                                                   openerpweb.nonliterals.CompoundContext(*(contexts or [])),
                                                   openerpweb.nonliterals.CompoundDomain(*(domains or [])))
-        
+
         group_by_sequence = []
         for candidate in (group_by_seq or []):
             ctx = req.session.eval_context(candidate, context)
@@ -190,7 +192,7 @@ class Session(openerpweb.Controller):
                 group_by_sequence.append(group_by)
             else:
                 group_by_sequence.extend(group_by)
-        
+
         return {
             'context': context,
             'domain': domain,
@@ -203,7 +205,7 @@ class Session(openerpweb.Controller):
         This method store an action object in the session object and returns an integer
         identifying that action. The method get_session_action() can be used to get
         back the action.
-        
+
         :param the_action: The action to save in the session.
         :type the_action: anything
         :return: A key identifying the saved action.
@@ -226,7 +228,7 @@ class Session(openerpweb.Controller):
         """
         Gets back a previously saved action. This method can return None if the action
         was saved since too much time (this case should be handled in a smart way).
-        
+
         :param key: The key given by save_session_action()
         :type key: integer
         :return: The saved action or None.
@@ -361,7 +363,7 @@ class Menu(openerpweb.Controller):
         menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id'], context)
         menu_root = {'id': False, 'name': 'root', 'parent_id': [-1, '']}
         menu_items.append(menu_root)
-        
+
         # make a tree using parent_id
         menu_items_map = dict((menu_item["id"], menu_item) for menu_item in menu_items)
         for menu_item in menu_items:
@@ -468,7 +470,7 @@ class DataSet(openerpweb.Controller):
         record_map = dict((record['id'], record) for record in records)
 
         return [record_map[id] for id in ids if record_map.get(id)]
-    
+
     @openerpweb.jsonrequest
     def load(self, req, model, id, fields):
         m = req.session.model(model)
@@ -631,7 +633,7 @@ class View(openerpweb.Controller):
         except ValueError:
             # not a literal
             return openerpweb.nonliterals.Domain(session, domain)
-        
+
     def parse_context(self, context, session):
         """ Parses an arbitrary string containing a context, transforms it
         to either a literal context or a :class:`openerpweb.nonliterals.Context`
@@ -832,4 +834,259 @@ class Action(openerpweb.Controller):
         return clean_action(req.session.model('ir.actions.server').run(
             [action_id], req.session.eval_context(req.context)), req.session)
 
-#
+def export_csv(fields, result):
+    import StringIO
+    fp = StringIO.StringIO()
+    writer = csv.writer(fp, quoting=csv.QUOTE_ALL)
+
+    writer.writerow(fields)
+
+    for data in result:
+        row = []
+        for d in data:
+            if isinstance(d, basestring):
+                d = d.replace('\n',' ').replace('\t',' ')
+                try:
+                    d = d.encode('utf-8')
+                except:
+                    pass
+            if d is False: d = None
+            row.append(d)
+        writer.writerow(row)
+
+    fp.seek(0)
+    data = fp.read()
+    fp.close()
+    return data
+
+def export_xls(fieldnames, table):
+    import StringIO
+    try:
+        import xlwt
+    except ImportError:
+        common.error(_('Import Error.'), _('Please install xlwt library to export to MS Excel.'))
+
+    workbook = xlwt.Workbook()
+    worksheet = workbook.add_sheet('Sheet 1')
+
+    for i, fieldname in enumerate(fieldnames):
+        worksheet.write(0, i, str(fieldname))
+        worksheet.col(i).width = 8000 # around 220 pixels
+
+    style = xlwt.easyxf('align: wrap yes')
+
+    for row_index, row in enumerate(table):
+        for cell_index, cell_value in enumerate(row):
+            cell_value = str(cell_value)
+            cell_value = re.sub("\r", " ", cell_value)
+            worksheet.write(row_index + 1, cell_index, cell_value, style)
+
+
+    fp = StringIO.StringIO()
+    workbook.save(fp)
+    fp.seek(0)
+    data = fp.read()
+    fp.close()
+    #return data.decode('ISO-8859-1')
+    return unicode(data, 'utf-8', 'replace')
+
+def node_attributes(node):
+    attrs = node.attributes
+
+    if not attrs:
+        return {}
+    # localName can be a unicode string, we're using attribute names as
+    # **kwargs keys and python-level kwargs don't take unicode keys kindly
+    # (they blow up) so we need to ensure all keys are ``str``
+    return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue)
+                 for i in range(attrs.length)])
+
+def _fields_get_all(req, model, views, context=None):
+
+    if context is None:
+        context = {}
+
+    def parse(root, fields):
+        for node in root.childNodes:
+            if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'):
+                parse(node, fields)
+            elif node.nodeName=='field':
+                attrs = node_attributes(node)
+                name = attrs['name']
+                fields[name].update(attrs)
+        return fields
+
+    def get_view_fields(view):
+        return parse(
+            xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement,
+            view['fields'])
+
+    model_obj = req.session.model(model)
+    tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context)
+    form_view = model_obj.fields_view_get(views.get('form', False), 'form', context)
+    fields = {}
+    fields.update(get_view_fields(tree_view))
+    fields.update(get_view_fields(form_view))
+    return fields
+
+
+class Export(View):
+    _cp_path = "/base/export"
+
+    def fields_get(self, req, model):
+        Model = req.session.model(model)
+        fields = Model.fields_get(False, req.session.eval_context(req.context))
+        return fields
+
+    @openerpweb.jsonrequest
+    def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}):
+        import_compat = params.get("import_compat", False)
+        views_id = params.get("views_id", {})
+
+        fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context))
+        field_parent_type = params.get("parent_field_type",False)
+
+        if import_compat and field_parent_type and field_parent_type == "many2one":
+            fields = {}
+
+        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+        records = []
+        fields_order = fields.keys()
+        fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
+
+        for index, field in enumerate(fields_order):
+            value = fields[field]
+            record = {}
+            if import_compat and value.get('readonly', False):
+                ok = False
+                for sl in value.get('states', {}).values():
+                    for s in sl:
+                        ok = ok or (s==['readonly',False])
+                if not ok: continue
+
+            id = prefix + (prefix and '/'or '') + field
+            nm = name + (name and '/' or '') + value['string']
+            record.update(id=id, string= nm, action='javascript: void(0)',
+                          target=None, icon=None, children=[], field_type=value.get('type',False), required=value.get('required', False))
+            records.append(record)
+
+            if len(nm.split('/')) < 3 and value.get('relation', False):
+                if import_compat:
+                    ref = value.pop('relation')
+                    cfields = self.fields_get(req, ref)
+                    if (value['type'] == 'many2many'):
+                        record['children'] = []
+                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+
+                    elif value['type'] == 'many2one':
+                        record['children'] = [id + '/id', id + '/.id']
+                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+
+                    else:
+                        cfields_order = cfields.keys()
+                        cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
+                        children = []
+                        for j, fld in enumerate(cfields_order):
+                            cid = id + '/' + fld
+                            cid = cid.replace(' ', '_')
+                            children.append(cid)
+                        record['children'] = children or []
+                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+                else:
+                    ref = value.pop('relation')
+                    cfields = self.fields_get(req, ref)
+                    cfields_order = cfields.keys()
+                    cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
+                    children = []
+                    for j, fld in enumerate(cfields_order):
+                        cid = id + '/' + fld
+                        cid = cid.replace(' ', '_')
+                        children.append(cid)
+                    record['children'] = children or []
+                    record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+
+        records.reverse()
+        return records
+
+    @openerpweb.jsonrequest
+    def save_export_lists(self, req, name, model, field_list):
+        result = {'resource':model, 'name':name, 'export_fields': []}
+        for field in field_list:
+            result['export_fields'].append((0, 0, {'name': field}))
+        return req.session.model("ir.exports").create(result, req.session.eval_context(req.context))
+
+    @openerpweb.jsonrequest
+    def exist_export_lists(self, req, model):
+        export_model = req.session.model("ir.exports")
+        return export_model.read(export_model.search([('resource', '=', model)]), ['name'])
+
+    @openerpweb.jsonrequest
+    def delete_export(self, req, export_id):
+        req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context))
+        return True
+
+    @openerpweb.jsonrequest
+    def namelist(self,req,  model, export_id):
+
+        result = self.get_data(req, model, req.session.eval_context(req.context))
+        ir_export_obj = req.session.model("ir.exports")
+        ir_export_line_obj = req.session.model("ir.exports.line")
+
+        field = ir_export_obj.read(export_id)
+        fields = ir_export_line_obj.read(field['export_fields'])
+
+        name_list = {}
+        [name_list.update({field['name']: result.get(field['name'])}) for field in fields]
+        return name_list
+
+    def get_data(self, req, model, context=None):
+        ids = []
+        context = context or {}
+        fields_data = {}
+        proxy = req.session.model(model)
+        fields = self.fields_get(req, model)
+        if not ids:
+            f1 = proxy.fields_view_get(False, 'tree', context)['fields']
+            f2 = proxy.fields_view_get(False, 'form', context)['fields']
+
+            fields = dict(f1)
+            fields.update(f2)
+            fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+
+        def rec(fields):
+            _fields = {'id': 'ID' , '.id': 'Database ID' }
+            def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
+                fields_order = fields.keys()
+                fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
+
+                for field in fields_order:
+                    fields_data[prefix_node+field] = fields[field]
+                    if prefix_node:
+                        fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string'])
+                    st_name = fields[field]['string'] or field
+                    _fields[prefix_node+field] = st_name
+                    if fields[field].get('relation', False) and level>0:
+                        fields2 = self.fields_get(req,  fields[field]['relation'])
+                        fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+                        model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1)
+            model_populate(fields)
+            return _fields
+        return rec(fields)
+
+    @openerpweb.jsonrequest
+    def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None):
+        context = req.session.eval_context(req.context)
+        modle_obj = req.session.model(model)
+        ids = ids or modle_obj.search(domain, context=context)
+
+        field = fields.keys()
+        result = modle_obj.export_data(ids, field , context).get('datas',[])
+
+        if not import_compat:
+            field = [val.strip() for val in fields.values()]
+
+        if export_format == 'xls':
+            return export_xls(field, result)
+        else:
+            return export_csv(field, result)
+
diff --git a/addons/base/static/src/base.html b/addons/base/static/src/base.html
index 0c615ed8903..679ac454ca7 100644
--- a/addons/base/static/src/base.html
+++ b/addons/base/static/src/base.html
@@ -27,6 +27,7 @@
     <script type="text/javascript" src="/base/static/src/js/dates.js"></script>
     <script type="text/javascript" src="/base/static/src/js/chrome.js"></script>
     <script type="text/javascript" src="/base/static/src/js/data.js"></script>
+    <script type="text/javascript" src="/base/static/src/js/export.js"></script>
     <script type="text/javascript" src="/base/static/src/js/views.js"></script>
     <script type="text/javascript" src="/base/static/src/js/form.js"></script>
     <script type="text/javascript" src="/base/static/src/js/list.js"></script>
@@ -39,6 +40,7 @@
     <link rel="stylesheet" type="text/css" href="/base/static/lib/jquery.superfish/css/superfish.css" media="screen">
 
     <link rel="stylesheet" href="/base/static/src/css/base.css" type="text/css"/>
+    <link rel="stylesheet" href="/base/static/src/css/export.css" type="text/css"/>
     <!--[if lte IE 7]>
     <link rel="stylesheet" href="/base/static/src/css/base-ie7.css" type="text/css"/>
     <![endif]-->
diff --git a/addons/base_export/static/src/css/base_export.css b/addons/base/static/src/css/export.css
similarity index 95%
rename from addons/base_export/static/src/css/base_export.css
rename to addons/base/static/src/css/export.css
index 485338b63e3..051b5cb076c 100644
--- a/addons/base_export/static/src/css/base_export.css
+++ b/addons/base/static/src/css/export.css
@@ -55,7 +55,7 @@ div#left_field_panel {
     text-align: left;
     white-space: nowrap;
     padding: 4px 5px;
-    background: url(/base_export/static/src/img/header.gif);
+    background: url(/base/static/src/img/header.gif);
 }
 
 
diff --git a/addons/base/static/src/img/collapse.gif b/addons/base/static/src/img/collapse.gif
old mode 100755
new mode 100644
diff --git a/addons/base/static/src/img/expand.gif b/addons/base/static/src/img/expand.gif
old mode 100755
new mode 100644
diff --git a/addons/base_export/static/src/img/header.gif b/addons/base/static/src/img/header.gif
similarity index 100%
rename from addons/base_export/static/src/img/header.gif
rename to addons/base/static/src/img/header.gif
diff --git a/addons/base/static/src/js/base.js b/addons/base/static/src/js/base.js
index 28022f8b764..8e593de5949 100644
--- a/addons/base/static/src/js/base.js
+++ b/addons/base/static/src/js/base.js
@@ -87,6 +87,9 @@ openerp.base = function(instance) {
     if (openerp.base.view_tree) {
         openerp.base.view_tree(instance);
     }
+    if (openerp.base.export) {
+        openerp.base.export(instance);
+    }
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/base_export/static/src/js/base_export.js b/addons/base/static/src/js/export.js
similarity index 88%
rename from addons/base_export/static/src/js/base_export.js
rename to addons/base/static/src/js/export.js
index 566a6cf167c..e12ba0e613c 100644
--- a/addons/base_export/static/src/js/base_export.js
+++ b/addons/base/static/src/js/export.js
@@ -1,7 +1,5 @@
-openerp.base_export = function(openerp) {
-QWeb.add_template('/base_export/static/src/xml/base_export.xml');
-openerp.base.views.add('export', 'openerp.base_export.Export');
-openerp.base_export.Export = openerp.base.Dialog.extend({
+openerp.base.export = function(openerp) {
+openerp.base.Export = openerp.base.Dialog.extend({
 
     init: function(parent, dataset, views){
         this._super(parent);
@@ -57,7 +55,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
         });
         import_comp = $("#import_compat option:selected").val()
         var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id}
-        this.rpc("/base_export/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data);
+        this.rpc("/base/export/get_fields", {"model": this.dataset.model, "params": params}, this.on_show_data);
 
         $("#import_compat").change(function(){
             $("#fields_list option").remove();
@@ -65,7 +63,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
             import_comp = $("#import_compat option:selected").val();
             if(import_comp){
                 var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id}
-                self.rpc("/base_export/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data);
+                self.rpc("/base/export/get_fields", {"model": self.dataset.model, "params": params}, self.on_show_data);
             }
         });
     },
@@ -76,20 +74,20 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
             $("#ExistsExportList").show();
         }
         else{
-            this.rpc("/base_export/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){
+            this.rpc("/base/export/exist_export_lists", {"model": this.dataset.model}, function(export_list){
                 if(export_list.length){
                     $("#ExistsExportList").append(QWeb.render('Exists.ExportList', {'existing_exports':export_list}));
                     $("#saved_export_list").change(function(){
                         $("#fields_list option").remove();
                         export_id = $("#saved_export_list option:selected").val();
                         if (export_id){
-                            self.rpc("/base_export/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
+                            self.rpc("/base/export/namelist", {"model": self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
                         }
                     });
                     $('#delete_export_list').click(function(){
                         select_exp = $("#saved_export_list option:selected")
                         if (select_exp.val()){
-                            self.rpc("/base_export/export/delete_export", {"export_id": parseInt(select_exp.val())}, {});
+                            self.rpc("/base/export/delete_export", {"export_id": parseInt(select_exp.val())}, {});
                             select_exp.remove();
                             if($("#saved_export_list option").length <= 1){
                                 $("#ExistsExportList").hide();
@@ -137,7 +135,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
         var self = this;
         var export_field = self.get_fields()
         if(export_field.length){
-            self.rpc("/base_export/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){
+            self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id){
                 if(exp_id){
                     if($("#saved_export_list").length > 0){
                         $("#saved_export_list").append( new Option(value, exp_id));
@@ -177,11 +175,11 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
                     }
                 });
                 if (is_loaded == 0) {
-                    if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base_export/static/src/img/expand.gif') {
+                    if ($("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') == '/base/static/src/img/expand.gif') {
                         if (model){
                             import_comp = $("#import_compat option:selected").val()
                             var params = {"import_compat":parseInt(import_comp), "views_id": this.views_id, "parent_field_type" : record['field_type']}
-                            self.rpc("/base_export/export/get_fields", {"model": model, "prefix": prefix, "name": name,  "field_parent" : self.field_id, "params":params}, function (results) {
+                            self.rpc("/base/export/get_fields", {"model": model, "prefix": prefix, "name": name,  "field_parent" : self.field_id, "params":params}, function (results) {
                                 self.on_show_data(results);
                             });
                         }
@@ -200,7 +198,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
         var self = this;
         var current_tr = $("tr[id='treerow-" + self.field_id + "']");
         if (current_tr.length >= 1){
-            current_tr.find('img').attr('src','/base_export/static/src/img/collapse.gif');
+            current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
         }
         else{
@@ -279,7 +277,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
                 arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
                     case arrow.left:
-                        if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){
+                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
                             self.on_click(this.id, result);
                         }
                     break;
@@ -295,7 +293,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
                         $(elem).prev().find('a').focus();
                     break;
                     case arrow.right:
-                        if( jQuery(this).find('img').attr('src') == '/base_export/static/src/img/expand.gif'){
+                        if( jQuery(this).find('img').attr('src') == '/base/static/src/img/expand.gif'){
                             self.on_click(this.id, result);
                         }
                     break;
@@ -340,10 +338,10 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
     showcontent: function (id, flag) {
         var first_child = $("tr[id='treerow-" + id + "']").find('img')
         if (flag) {
-            first_child.attr('src', '/base_export/static/src/img/expand.gif');
+            first_child.attr('src', '/base/static/src/img/expand.gif');
         }
         else {
-            first_child.attr('src', '/base_export/static/src/img/collapse.gif');
+            first_child.attr('src', '/base/static/src/img/collapse.gif');
         }
         var child_field = $("tr[id^='treerow-" + id +"/']")
         var child_len = (id.split("/")).length + 1
@@ -353,8 +351,8 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
             }
             else {
                 if(child_len ==  (child_field[i].id.split("/")).length){
-                    if( jQuery(child_field[i]).find('img').attr('src') == '/base_export/static/src/img/collapse.gif'){
-                        jQuery(child_field[i]).find('img').attr('src', '/base_export/static/src/img/expand.gif')
+                    if( jQuery(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif'){
+                        jQuery(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif')
                     }
                     $(child_field[i]).show();
                 }
@@ -395,7 +393,7 @@ openerp.base_export.Export = openerp.base.Dialog.extend({
         import_comp = $("#import_compat option:selected").val()
         export_format = $("#export_format").val()
 
-        self.rpc("/base_export/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){
+        self.rpc("/base/export/export_data", {"model": self.dataset.model, "fields":export_field, 'ids': self.dataset.ids, 'domain': self.dataset.domain, "import_compat":parseInt(import_comp), "export_format" :export_format}, function(data){
             window.location="data:text/csv/excel;charset=utf8," + data
             self.close();
         });
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 0f520cab13d..0d8539d6292 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -200,7 +200,7 @@ openerp.base.ViewManager =  openerp.base.Controller.extend({
             if(this.active_view == 'list' || this.active_view == 'form') {
                 this.views[this.active_view].controller.$element.after(QWeb.render('ExportView'))
                 this.$element.find('#exportview').click(function(ev) {
-                    var export_view = new openerp.base_export.Export(self, self.dataset, self.views);
+                    var export_view = new openerp.base.Export(self, self.dataset, self.views);
                     export_view.start(false);
                     ev.preventDefault();
                 });
@@ -417,6 +417,7 @@ openerp.base.Sidebar = openerp.base.BaseWidget.extend({
 
 openerp.base.NullSidebar = openerp.base.generate_null_object_class(openerp.base.Sidebar);
 
+/*
 openerp.base.Export = openerp.base.Dialog.extend({
     dialog_title: "Export",
     template: 'ExportDialog',
@@ -435,7 +436,7 @@ openerp.base.Export = openerp.base.Dialog.extend({
         this.$element.dialog("close");
     }
 });
-
+*/
 openerp.base.View = openerp.base.Controller.extend({
     /**
      * Fetches and executes the action identified by ``action_data``.
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 04841a2e297..fee6a07281b 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -103,7 +103,7 @@
     <div class="oe_login_right_pane">
         <p>We think that daily job activities can be more intuitive, efficient, automated, .. and even fun.</p>
         <h3>OpenERP's vision to be:</h3>
-        
+
         <table cellpadding="0" cellspacing="0" width="100%" style="border:none;">
             <tbody>
             <tr>
@@ -135,7 +135,7 @@
             </tr>
             </tbody>
         </table>
-        
+
     </div>
 </t>
 <t t-name="Header">
@@ -311,7 +311,7 @@
     t-att-data-index="row_index">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
-            
+
         </td>
     </t>
     <th t-if="options.selectable" class="oe-record-selector" width="1">
@@ -786,7 +786,7 @@
             <option value="all">All the following conditions must match</option>
             <option value="none">None of the following conditions must match</option>
         </select>
-        <a class="searchview_extended_delete_group" 
+        <a class="searchview_extended_delete_group"
                 href="javascript:void(0)"><span></span></a>
         <div class="searchview_extended_propositions_list">
         </div>
@@ -932,4 +932,145 @@
             .unwrap();
     </t>
 </t>
+
+<t t-name="ExportView">
+    <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
+</t>
+
+<t t-name="ExportTreeView">
+    <table class="view" style="background-color: #F3F3F3;">
+        <tr>
+            <td align="left">
+                This wizard will export all data that matches the current search criteria to a CSV file.
+                You can export all data or only the fields that can be reimported after modification.
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <table>
+                    <tr>
+                        <td class="label"><label>Export Type:</label></td>
+                        <td>
+                            <select id="import_compat" name="import_compat"  style="background-color: #F3F3F3;" >
+                                <option value="1">Import Compatible Export</option>
+                                <option value="0">Export all Data</option>
+                            </select>
+                        </td>
+                        <td class="label"><label>Export Format</label></td>
+                        <td>
+                            <select id="export_format" name="export_format">
+                                <option value="csv">CSV</option>
+                                <option value="xls">Excel</option>
+                            </select>
+                        </td>
+
+                    </tr>
+                </table>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <table class="fields-selector-export">
+                    <tr>
+                        <th class="oe_view_title" valign="bottom">Available fields</th>
+                        <th class="oe_view_title"></th>
+                        <th class="oe_view_title">Fields to export
+                        <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
+                        <div id="savenewlist"></div>
+                        <div id="ExistsExportList"></div>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td class="fields-selector-left">
+                            <div id="left_field_panel">
+                            </div>
+                        </td>
+                        <td>
+                            <table class="fields-selector-center">
+                                <tr>
+                                    <td align="center">
+                                        <button id="add_field" class="button-export">Add</button>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center">
+                                        <button id="remove_field" class="button-export">Remove</button>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="center">
+                                        <button id="remove_all_field" class="button-export">Remove All</button>
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                        <td class="fields-selector-right">
+                            <select name="fields_list" id="fields_list" multiple="multiple"></select>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</t>
+
+<t t-name="ExportTreeView-Secondary">
+    <table id="field-tree-structure" class="fields-selector-export" cellspacing="0" cellpadding="0">
+        <tr><th class="tree_header"> Name </th></tr>
+        <t t-call="ExportTreeView-Secondary.children"/>
+    </table>
+</t>
+<t t-name="ExportTreeView-Secondary.children">
+    <t t-foreach="fields" t-as="field" >
+        <tr t-att-id="'treerow-' + field.id" class="row">
+            <td>
+                <table class="tree-grid" border="0">
+                    <tr class="row">
+                        <t t-foreach="(field.id).split('/')" t-as="level" >
+                            <t t-if="(field.id).split('/')[0] != level">
+                                <td width="18">&amp;nbsp;</td>
+                            </t>
+                        </t>
+                        <td valign="top" align="left" style="cursor: pointer;" width="18">
+                            <t t-if="(field.children).length >= 1">
+                                <t t-if="(field.id).split('/').length != 3">
+                                    <img t-att-id="'parentimg-' + field.id" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
+                                </t>
+                            </t>
+                        </td>
+                        <td id="tree-column" valign="middle" align="left" style="cursor: pointer;">
+                            <a t-att-id="'export-' + field.id"  t-att-string="field.string" href="javascript: void(0);" style="text-decoration: none;">
+                                <t t-esc="field.string"/>
+                            </a>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </t>
+</t>
+
+<t t-name="ExportNewList">
+    <tr>
+        <th><label>Save as:</label></th>
+        <td><input size="10" type="text" id="savelist_name"/></td>
+        <td><button class="button-export" id="add_export_list">Ok</button></td>
+    </tr>
+</t>
+
+<t t-name="Exists.ExportList">
+    <tr><th align="right"><label >Saved exports:</label></th></tr>
+    <tr align="left">
+        <td>
+            <select id="saved_export_list" style="width: 100%;">
+                <option></option>
+                <t t-foreach="existing_exports" t-as="export">
+                    <option t-att-value="export.id"><t t-esc="export.name"/></option>
+                </t>
+            </select>
+        </td>
+        <td><button class="button-export" id="delete_export_list">Delete</button></td>
+    </tr>
+</t>
 </templates>
diff --git a/addons/base_export/__init__.py b/addons/base_export/__init__.py
deleted file mode 100644
index 4a64491e6bb..00000000000
--- a/addons/base_export/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-import controllers
diff --git a/addons/base_export/__openerp__.py b/addons/base_export/__openerp__.py
deleted file mode 100644
index 53347c57d04..00000000000
--- a/addons/base_export/__openerp__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "name": "Base Export",
-    "version": "2.0",
-    "depends": ['base'],
-    "js": [
-        'static/src/js/base_export.js'
-    ],
-    "css": ["static/src/css/base_export.css"],
-    'active': True
-}
diff --git a/addons/base_export/controllers/__init__.py b/addons/base_export/controllers/__init__.py
deleted file mode 100644
index 039d9715fab..00000000000
--- a/addons/base_export/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import main
\ No newline at end of file
diff --git a/addons/base_export/controllers/main.py b/addons/base_export/controllers/main.py
deleted file mode 100644
index 3aa73147ebb..00000000000
--- a/addons/base_export/controllers/main.py
+++ /dev/null
@@ -1,260 +0,0 @@
-from base.controllers.main import View
-import openerpweb
-import StringIO
-import csv
-import xml.dom.minidom
-import re
-
-def export_csv(fields, result):
-    fp = StringIO.StringIO()
-    writer = csv.writer(fp, quoting=csv.QUOTE_ALL)
-
-    writer.writerow(fields)
-
-    for data in result:
-        row = []
-        for d in data:
-            if isinstance(d, basestring):
-                d = d.replace('\n',' ').replace('\t',' ')
-                try:
-                    d = d.encode('utf-8')
-                except:
-                    pass
-            if d is False: d = None
-            row.append(d)
-        writer.writerow(row)
-
-    fp.seek(0)
-    data = fp.read()
-    fp.close()
-    return data
-
-def export_xls(fieldnames, table):
-    try:
-        import xlwt
-    except ImportError:
-        common.error(_('Import Error.'), _('Please install xlwt library to export to MS Excel.'))
-
-    workbook = xlwt.Workbook()
-    worksheet = workbook.add_sheet('Sheet 1')
-
-    for i, fieldname in enumerate(fieldnames):
-        worksheet.write(0, i, str(fieldname))
-        worksheet.col(i).width = 8000 # around 220 pixels
-
-    style = xlwt.easyxf('align: wrap yes')
-
-    for row_index, row in enumerate(table):
-        for cell_index, cell_value in enumerate(row):
-            cell_value = str(cell_value)
-            cell_value = re.sub("\r", " ", cell_value)
-            worksheet.write(row_index + 1, cell_index, cell_value, style)
-
-
-    fp = StringIO.StringIO()
-    workbook.save(fp)
-    fp.seek(0)
-    data = fp.read()
-    fp.close()
-    #return data.decode('ISO-8859-1')
-    return unicode(data, 'utf-8', 'replace')
-
-def node_attributes(node):
-    attrs = node.attributes
-
-    if not attrs:
-        return {}
-    # localName can be a unicode string, we're using attribute names as
-    # **kwargs keys and python-level kwargs don't take unicode keys kindly
-    # (they blow up) so we need to ensure all keys are ``str``
-    return dict([(str(attrs.item(i).localName), attrs.item(i).nodeValue)
-                 for i in range(attrs.length)])
-
-def _fields_get_all(req, model, views, context=None):
-
-    if context is None:
-        context = {}
-
-    def parse(root, fields):
-        for node in root.childNodes:
-            if node.nodeName in ('form', 'notebook', 'page', 'group', 'tree', 'hpaned', 'vpaned'):
-                parse(node, fields)
-            elif node.nodeName=='field':
-                attrs = node_attributes(node)
-                name = attrs['name']
-                fields[name].update(attrs)
-        return fields
-
-    def get_view_fields(view):
-        return parse(
-            xml.dom.minidom.parseString(view['arch'].encode('utf-8')).documentElement,
-            view['fields'])
-
-    model_obj = req.session.model(model)
-    tree_view = model_obj.fields_view_get(views.get('tree', False), 'tree', context)
-    form_view = model_obj.fields_view_get(views.get('form', False), 'form', context)
-    fields = {}
-    fields.update(get_view_fields(tree_view))
-    fields.update(get_view_fields(form_view))
-    return fields
-
-
-class Export(View):
-    _cp_path = "/base_export/export"
-
-    def fields_get(self, req, model):
-        Model = req.session.model(model)
-        fields = Model.fields_get(False, req.session.eval_context(req.context))
-        return fields
-
-    @openerpweb.jsonrequest
-    def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}):
-        import_compat = params.get("import_compat", False)
-        views_id = params.get("views_id", {})
-
-        fields = _fields_get_all(req, model, views=views_id, context=req.session.eval_context(req.context))
-        field_parent_type = params.get("parent_field_type",False)
-
-        if import_compat and field_parent_type and field_parent_type == "many2one":
-            fields = {}
-
-        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
-        records = []
-        fields_order = fields.keys()
-        fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
-
-        for index, field in enumerate(fields_order):
-            value = fields[field]
-            record = {}
-            if import_compat and value.get('readonly', False):
-                ok = False
-                for sl in value.get('states', {}).values():
-                    for s in sl:
-                        ok = ok or (s==['readonly',False])
-                if not ok: continue
-
-            id = prefix + (prefix and '/'or '') + field
-            nm = name + (name and '/' or '') + value['string']
-            record.update(id=id, string= nm, action='javascript: void(0)',
-                          target=None, icon=None, children=[], field_type=value.get('type',False), required=value.get('required', False))
-            records.append(record)
-
-            if len(nm.split('/')) < 3 and value.get('relation', False):
-                if import_compat:
-                    ref = value.pop('relation')
-                    cfields = self.fields_get(req, ref)
-                    if (value['type'] == 'many2many'):
-                        record['children'] = []
-                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
-
-                    elif value['type'] == 'many2one':
-                        record['children'] = [id + '/id', id + '/.id']
-                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
-
-                    else:
-                        cfields_order = cfields.keys()
-                        cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
-                        children = []
-                        for j, fld in enumerate(cfields_order):
-                            cid = id + '/' + fld
-                            cid = cid.replace(' ', '_')
-                            children.append(cid)
-                        record['children'] = children or []
-                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
-                else:
-                    ref = value.pop('relation')
-                    cfields = self.fields_get(req, ref)
-                    cfields_order = cfields.keys()
-                    cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
-                    children = []
-                    for j, fld in enumerate(cfields_order):
-                        cid = id + '/' + fld
-                        cid = cid.replace(' ', '_')
-                        children.append(cid)
-                    record['children'] = children or []
-                    record['params'] = {'model': ref, 'prefix': id, 'name': nm}
-
-        records.reverse()
-        return records
-
-    @openerpweb.jsonrequest
-    def save_export_lists(self, req, name, model, field_list):
-        result = {'resource':model, 'name':name, 'export_fields': []}
-        for field in field_list:
-            result['export_fields'].append((0, 0, {'name': field}))
-        return req.session.model("ir.exports").create(result, req.session.eval_context(req.context))
-
-    @openerpweb.jsonrequest
-    def exist_export_lists(self, req, model):
-        export_model = req.session.model("ir.exports")
-        return export_model.read(export_model.search([('resource', '=', model)]), ['name'])
-
-    @openerpweb.jsonrequest
-    def delete_export(self, req, export_id):
-        req.session.model("ir.exports").unlink(export_id, req.session.eval_context(req.context))
-        return True
-
-    @openerpweb.jsonrequest
-    def namelist(self,req,  model, export_id):
-
-        result = self.get_data(req, model, req.session.eval_context(req.context))
-        ir_export_obj = req.session.model("ir.exports")
-        ir_export_line_obj = req.session.model("ir.exports.line")
-
-        field = ir_export_obj.read(export_id)
-        fields = ir_export_line_obj.read(field['export_fields'])
-
-        name_list = {}
-        [name_list.update({field['name']: result.get(field['name'])}) for field in fields]
-        return name_list
-
-    def get_data(self, req, model, context=None):
-        ids = []
-        context = context or {}
-        fields_data = {}
-        proxy = req.session.model(model)
-        fields = self.fields_get(req, model)
-        if not ids:
-            f1 = proxy.fields_view_get(False, 'tree', context)['fields']
-            f2 = proxy.fields_view_get(False, 'form', context)['fields']
-
-            fields = dict(f1)
-            fields.update(f2)
-            fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
-
-        def rec(fields):
-            _fields = {'id': 'ID' , '.id': 'Database ID' }
-            def model_populate(fields, prefix_node='', prefix=None, prefix_value='', level=2):
-                fields_order = fields.keys()
-                fields_order.sort(lambda x,y: -cmp(fields[x].get('string', ''), fields[y].get('string', '')))
-
-                for field in fields_order:
-                    fields_data[prefix_node+field] = fields[field]
-                    if prefix_node:
-                        fields_data[prefix_node + field]['string'] = '%s%s' % (prefix_value, fields_data[prefix_node + field]['string'])
-                    st_name = fields[field]['string'] or field
-                    _fields[prefix_node+field] = st_name
-                    if fields[field].get('relation', False) and level>0:
-                        fields2 = self.fields_get(req,  fields[field]['relation'])
-                        fields2.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
-                        model_populate(fields2, prefix_node+field+'/', None, st_name+'/', level-1)
-            model_populate(fields)
-            return _fields
-        return rec(fields)
-
-    @openerpweb.jsonrequest
-    def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None):
-        context = req.session.eval_context(req.context)
-        modle_obj = req.session.model(model)
-        ids = ids or modle_obj.search(domain, context=context)
-
-        field = fields.keys()
-        result = modle_obj.export_data(ids, field , context).get('datas',[])
-
-        if not import_compat:
-            field = [val.strip() for val in fields.values()]
-
-        if export_format == 'xls':
-            return export_xls(field, result)
-        else:
-            return export_csv(field, result)
diff --git a/addons/base_export/static/src/img/collapse.gif b/addons/base_export/static/src/img/collapse.gif
deleted file mode 100644
index 759e72ebcfe..00000000000
Binary files a/addons/base_export/static/src/img/collapse.gif and /dev/null differ
diff --git a/addons/base_export/static/src/img/expand.gif b/addons/base_export/static/src/img/expand.gif
deleted file mode 100644
index ca98d0b5f2b..00000000000
Binary files a/addons/base_export/static/src/img/expand.gif and /dev/null differ
diff --git a/addons/base_export/static/src/xml/base_export.xml b/addons/base_export/static/src/xml/base_export.xml
deleted file mode 100644
index 74fd260ac2e..00000000000
--- a/addons/base_export/static/src/xml/base_export.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-
-    <t t-name="ExportView">
-        <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
-    </t>
-
-    <t t-name="ExportTreeView">
-        <table class="view" style="background-color: #F3F3F3;">
-            <tr>
-                <td align="left">
-                    This wizard will export all data that matches the current search criteria to a CSV file.
-                    You can export all data or only the fields that can be reimported after modification.
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <table>
-                        <tr>
-                            <td class="label"><label>Export Type:</label></td>
-                            <td>
-                                <select id="import_compat" name="import_compat"  style="background-color: #F3F3F3;" >
-                                    <option value="1">Import Compatible Export</option>
-                                    <option value="0">Export all Data</option>
-                                </select>
-                            </td>
-	                        <td class="label"><label>Export Format</label></td>
-	                        <td>
-	                            <select id="export_format" name="export_format">
-	                                <option value="csv">CSV</option>
-	                                <option value="xls">Excel</option>
-	                            </select>
-	                        </td>
-
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-
-            <tr>
-                <td>
-                    <table class="fields-selector-export">
-                        <tr>
-                            <th class="oe_view_title" valign="bottom">Available fields</th>
-                            <th class="oe_view_title"></th>
-                            <th class="oe_view_title">Fields to export
-                            <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
-                            <div id="savenewlist"></div>
-                            <div id="ExistsExportList"></div>
-                            </th>
-                        </tr>
-                        <tr>
-                            <td class="fields-selector-left">
-                                <div id="left_field_panel">
-                                </div>
-                            </td>
-                            <td>
-                                <table class="fields-selector-center">
-                                    <tr>
-                                        <td align="center">
-                                            <button id="add_field" class="button-export">Add</button>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td align="center">
-                                            <button id="remove_field" class="button-export">Remove</button>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td align="center">
-                                            <button id="remove_all_field" class="button-export">Remove All</button>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                            <td class="fields-selector-right">
-                                <select name="fields_list" id="fields_list" multiple="multiple"></select>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </table>
-    </t>
-
-    <t t-name="ExportTreeView-Secondary">
-        <table id="field-tree-structure" class="fields-selector-export" cellspacing="0" cellpadding="0">
-            <tr><th class="tree_header"> Name </th></tr>
-            <t t-call="ExportTreeView-Secondary.children"/>
-        </table>
-    </t>
-    <t t-name="ExportTreeView-Secondary.children">
-        <t t-foreach="fields" t-as="field" >
-            <tr t-att-id="'treerow-' + field.id" class="row">
-                <td>
-                    <table class="tree-grid" border="0">
-                        <tr class="row">
-                            <t t-foreach="(field.id).split('/')" t-as="level" >
-                                <t t-if="(field.id).split('/')[0] != level">
-                                    <td width="18">&amp;nbsp;</td>
-                                </t>
-                            </t>
-                            <td valign="top" align="left" style="cursor: pointer;" width="18">
-                                <t t-if="(field.children).length >= 1">
-                                    <t t-if="(field.id).split('/').length != 3">
-                                        <img t-att-id="'parentimg-' + field.id" src="/base_export/static/src/img/expand.gif" width="16" height="16" border="0"/>
-                                    </t>
-                                </t>
-                            </td>
-                            <td id="tree-column" valign="middle" align="left" style="cursor: pointer;">
-                                <a t-att-id="'export-' + field.id"  t-att-string="field.string" href="javascript: void(0);" style="text-decoration: none;">
-                                    <t t-esc="field.string"/>
-                                </a>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-        </t>
-    </t>
-
-    <t t-name="ExportNewList">
-        <tr>
-            <th><label>Save as:</label></th>
-            <td><input size="10" type="text" id="savelist_name"/></td>
-            <td><button class="button-export" id="add_export_list">Ok</button></td>
-        </tr>
-    </t>
-
-    <t t-name="Exists.ExportList">
-        <tr><th align="right"><label >Saved exports:</label></th></tr>
-        <tr align="left">
-            <td>
-                <select id="saved_export_list" style="width: 100%;">
-                    <option></option>
-                    <t t-foreach="existing_exports" t-as="export">
-                        <option t-att-value="export.id"><t t-esc="export.name"/></option>
-                    </t>
-                </select>
-            </td>
-            <td><button class="button-export" id="delete_export_list">Delete</button></td>
-        </tr>
-    </t>
-</template>
\ No newline at end of file