From e4bfeb49b4531c49d52a469c2ae1f28583153dc0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 26 Aug 2011 16:14:39 +0200
Subject: [PATCH 01/47] [FIX] some warnings and overly complex code

bzr revid: xmo@openerp.com-20110826141439-k8eawjbx46953z16
---
 addons/base/static/src/js/data_export.js | 49 ++++++++++--------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index ad440302c69..b2372f275fa 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -59,7 +59,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             if (import_comp) {
                 var params = {
                     import_compat: parseInt(import_comp)
-                }
+                };
                 self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
             }
         });
@@ -166,7 +166,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                             var params = {
                                 import_compat: parseInt(import_comp),
                                 parent_field_type : record['field_type']
-                            }
+                            };
                             self.rpc("/base/export/get_fields", {
                                 model: model,
                                 prefix: prefix,
@@ -201,7 +201,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 o2m_fld.addClass("oe_export_readonlyfield");
             }
-            if ((record.required == true) || record.required == "True") {
+            if (record.required) {
                 var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 required_fld.addClass("oe_export_requiredfield");
             }
@@ -210,7 +210,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             });
 
             self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) {
-                if (e.shiftKey == true) {
+                if (e.shiftKey) {
                     var frst_click, scnd_click = '';
                     if (self.row_index == 0) {
                         self.row_index = this.rowIndex;
@@ -218,14 +218,14 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                         $(frst_click).addClass("ui-selected");
                     } else {
                         if (this.rowIndex >=self.row_index) {
-                            for (i = (self.row_index-1); i < this.rowIndex; i++) {
+                            for (var i = (self.row_index-1); i < this.rowIndex; i++) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
                                 if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
                                 }
                             }
                         } else {
-                            for (i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
+                            for (var i = (self.row_index-1); i >= (this.rowIndex-1); i--) {
                                 scnd_click = self.$element.find("tr[id^='treerow-']")[i];
                                 if (!$(scnd_click).find('#tree-column').hasClass("oe_export_readonlyfield")) {
                                     $(scnd_click).addClass("ui-selected");
@@ -236,37 +236,30 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 }
                 self.row_index = this.rowIndex;
 
-                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function(e) {
+                self.$element.find("tr[id='treerow-" + record.id + "']").keyup(function() {
                     self.row_index = 0;
                 });
                 var o2m_selection = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 if ($(o2m_selection).hasClass("oe_export_readonlyfield")) {
                     return false;
                 }
-                var selected = self.$element.find("tr.ui-selected");
-                if ($(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
-                    $(this).find('a').blur();
-                    $(this).removeClass("ui-selected");
-                } else if ($(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
-                    selected.find('a').blur();
-                    selected.removeClass("ui-selected");
-                    $(this).find('a').focus();
-                    $(this).addClass("ui-selected");
-                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == false) && (e.shiftKey == false)) {
-                    selected.find('a').blur();
-                    selected.removeClass("ui-selected");
-                    $(this).find('a').focus();
-                    $(this).addClass("ui-selected");
-                } else if (!$(this).hasClass("ui-selected") && (e.ctrlKey == true)) {
-                    $(this).find('a').focus();
-                    $(this).addClass("ui-selected");
+                if (e.ctrlKey) {
+                    if ($(this).hasClass('ui-selected')) {
+                        $(this).removeClass('ui-selected').find('a').blur();
+                    } else {
+                        $(this).addClass('ui-selected').find('a').focus();
+                    }
+                } else if (!e.shiftKey) {
+                    self.$element.find("tr.ui-selected")
+                            .removeClass("ui-selected").find('a').blur();
+                    $(this).addClass("ui-selected").find('a').focus();
                 }
                 return false;
             });
 
             self.$element.find("tr[id='treerow-" + record.id + "']").keydown(function(e) {
                 var keyCode = e.keyCode || e.which;
-                arrow = {left: 37, up: 38, right: 39, down: 40 };
+                var arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
                     case arrow.left:
                         if ($(this).find('img').attr('src') === '/base/static/src/img/collapse.gif') {
@@ -276,7 +269,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                     case arrow.up:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while ($(elem).prev().is(":visible") == false) {
+                        while (!$(elem).prev().is(":visible")) {
                             elem = $(elem).prev();
                         }
                         if (!$(elem).prev().find('#tree-column').hasClass("oe_export_readonlyfield")) {
@@ -292,7 +285,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                     case arrow.down:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
-                        while($(elem).next().is(":visible") == false) {
+                        while(!$(elem).next().is(":visible")) {
                             elem = $(elem).next();
                         }
                         if (!$(elem).next().find('#tree-column').hasClass("oe_export_readonlyfield")) {
@@ -302,7 +295,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                         break;
                 }
             });
-            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function(e) {
+            self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function() {
                 var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
                 if (!$o2m_selection.hasClass("oe_export_readonlyfield")) {
                     var field_id = $(this).find("a").attr("id");

From 8e68d81d30580de68486bcc0b19a431f38007a0d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 26 Aug 2011 16:39:14 +0200
Subject: [PATCH 02/47] [IMP] simplify markup of main export view

bzr revid: xmo@openerp.com-20110826143914-1h9pfue36yg9e1ec
---
 addons/base/static/src/css/data_export.css | 23 +++---
 addons/base/static/src/js/data_export.js   |  8 +-
 addons/base/static/src/xml/base.xml        | 96 ++++++++--------------
 3 files changed, 50 insertions(+), 77 deletions(-)

diff --git a/addons/base/static/src/css/data_export.css b/addons/base/static/src/css/data_export.css
index 7b4b9707b39..9a53d07d365 100644
--- a/addons/base/static/src/css/data_export.css
+++ b/addons/base/static/src/css/data_export.css
@@ -1,3 +1,6 @@
+.openerp .oe-export {
+    width: 100%;
+}
 .openerp .oe_export_row tr{
     background-color: #FFFFFF;
     font-size: 0.8em;
@@ -20,11 +23,6 @@
     background-color: #F3F3F3;
 }
 
-.openerp .oe_export_fields_selector_export {
-    width: 100%;
-    height: 400px;
-}
-
 .openerp .oe_export_fields_selector_left {
     width: 50%;
 }
@@ -35,9 +33,15 @@
     height: 400px;
     border: solid #999999 1px;
 }
+.openerp div#left_field_panel table {
+    width: 100%;
+}
 
 .openerp .oe_export_fields_selector_center {
-    width: 102px;
+    text-align: center;
+}
+.openerp .oe_export_fields_selector_center button {
+    white-space: nowrap;
 }
 
 .openerp .oe_export_fields_selector_right {
@@ -45,7 +49,7 @@
     height: 400px;
 }
 
-.openerp .oe_export_fields_selector_export select{
+.openerp .oe_export_fields_selector_right select{
     width: 100%;
     height: 100%;
 }
@@ -78,8 +82,3 @@
     border: none;
     display: block;
 }
-
-.openerp .oe_export_button_export {
-	border: 1px solid #006;
-	background-color: #F3F3F3;
-}
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index b2372f275fa..74a67d59ab2 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -1,15 +1,15 @@
 openerp.base.data_export = function(openerp) {
 openerp.base.DataExport = openerp.base.Dialog.extend({
+    template: 'ExportTreeView',
+    dialog_title: 'Export Data',
     init: function(parent, dataset) {
         this._super(parent);
         this.dataset = dataset;
     },
     start: function() {
         var self = this;
-        self._super(false);
-        self.template = 'ExportTreeView';
-        self.dialog_title = "Export Data";
-        self.open({
+        this._super.apply(this, arguments);
+        this.open({
             modal: true,
             width: '55%',
             height: 'auto',
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 0c17e70cfc7..28591276ed1 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1223,78 +1223,52 @@
     <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;">
+    <table class="oe-export" style="background-color: #F3F3F3;">
         <tr>
-            <td align="left">
+            <td colspan="3">
                 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">
-                                <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>
+            <td colspan="3">
+                <label for="import_compat">Export Type:</label>
+                <select id="import_compat" name="import_compat">
+                    <option value="1">Import Compatible Export</option>
+                    <option value="0">Export all Data</option>
+                </select>
 
-                    </tr>
-                </table>
+                <label for="export_format">Export Format</label>
+                <select id="export_format" name="export_format">
+                    <option value="csv">CSV</option>
+                    <option value="xls">Excel</option>
+                </select>
             </td>
         </tr>
 
         <tr>
-            <td>
-                <table class="oe_export_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="oe_export_fields_selector_left">
-                            <div id="left_field_panel">
-                            </div>
-                        </td>
-                        <td>
-                            <table class="oe_export_fields_selector_center">
-                                <tr>
-                                    <td align="center">
-                                        <button id="add_field" class="oe_export_button_export">Add</button>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td align="center">
-                                        <button id="remove_field" class="oe_export_button_export">Remove</button>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td align="center">
-                                        <button id="remove_all_field" class="oe_export_button_export">Remove All</button>
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                        <td class="oe_export_fields_selector_right">
-                            <select name="fields_list" id="fields_list" multiple="multiple"></select>
-                        </td>
-                    </tr>
-                </table>
+            <th>Available fields</th>
+            <th/>
+            <th>
+                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 style="height: 400px;">
+            <td class="oe_export_fields_selector_left">
+                <div id="left_field_panel">
+                </div>
+            </td>
+            <td class="oe_export_fields_selector_center">
+                <button id="add_field">Add</button>
+                <button id="remove_field">Remove</button>
+                <button id="remove_all_field">Remove All</button>
+            </td>
+            <td class="oe_export_fields_selector_right">
+                <select name="fields_list" id="fields_list"
+                        multiple="multiple"></select>
             </td>
         </tr>
     </table>

From 5ef387c85c1af34699153f0a90a12621999b9a34 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 26 Aug 2011 17:04:42 +0200
Subject: [PATCH 03/47] [IMP] more template markup cleanup, some trivial
 cleanup of the python code

bzr revid: xmo@openerp.com-20110826150442-j00m8sy9jib0y6ce
---
 addons/base/controllers/main.py     |  12 +-
 addons/base/static/src/xml/base.xml | 163 ++++++++++++++--------------
 2 files changed, 86 insertions(+), 89 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 562571f10de..c46b14d80d4 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1142,8 +1142,7 @@ class Export(View):
 
         for index, field in enumerate(fields_order):
             value = fields[field]
-            record = {}
-            if import_compat and value.get('readonly', False):
+            if import_compat and value.get('readonly'):
                 ok = False
                 for sl in value.get('states', {}).values():
                     for s in sl:
@@ -1152,15 +1151,16 @@ class Export(View):
 
             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))
+            record = {'id': id, 'string': nm, '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 len(nm.split('/')) < 3 and value.get('relation'):
                 if import_compat:
                     ref = value.pop('relation')
                     cfields = self.fields_get(req, ref)
-                    if (value['type'] == 'many2many'):
+                    if value['type'] == 'many2many':
                         record['children'] = []
                         record['params'] = {'model': ref, 'prefix': id, 'name': nm}
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 28591276ed1..9908606bf53 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1222,93 +1222,90 @@
 <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="oe-export" style="background-color: #F3F3F3;">
-        <tr>
-            <td colspan="3">
-                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 colspan="3">
-                <label for="import_compat">Export Type:</label>
-                <select id="import_compat" name="import_compat">
-                    <option value="1">Import Compatible Export</option>
-                    <option value="0">Export all Data</option>
-                </select>
+<table t-name="ExportTreeView" class="oe-export"
+       style="background-color: #F3F3F3;">
+    <tr>
+        <td colspan="3">
+            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 colspan="3">
+            <label for="import_compat">Export Type:</label>
+            <select id="import_compat" name="import_compat">
+                <option value="1">Import Compatible Export</option>
+                <option value="0">Export all Data</option>
+            </select>
 
-                <label for="export_format">Export Format</label>
-                <select id="export_format" name="export_format">
-                    <option value="csv">CSV</option>
-                    <option value="xls">Excel</option>
-                </select>
-            </td>
-        </tr>
+            <label for="export_format">Export Format</label>
+            <select id="export_format" name="export_format">
+                <option value="csv">CSV</option>
+                <option value="xls">Excel</option>
+            </select>
+        </td>
+    </tr>
 
-        <tr>
-            <th>Available fields</th>
-            <th/>
-            <th>
-                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 style="height: 400px;">
-            <td class="oe_export_fields_selector_left">
-                <div id="left_field_panel">
-                </div>
-            </td>
-            <td class="oe_export_fields_selector_center">
-                <button id="add_field">Add</button>
-                <button id="remove_field">Remove</button>
-                <button id="remove_all_field">Remove All</button>
-            </td>
-            <td class="oe_export_fields_selector_right">
-                <select name="fields_list" id="fields_list"
-                        multiple="multiple"></select>
-            </td>
-        </tr>
-    </table>
-</t>
+    <tr>
+        <th>Available fields</th>
+        <th/>
+        <th>
+            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 style="height: 400px;">
+        <td class="oe_export_fields_selector_left">
+            <div id="left_field_panel">
+            </div>
+        </td>
+        <td class="oe_export_fields_selector_center">
+            <button id="add_field">Add</button>
+            <button id="remove_field">Remove</button>
+            <button id="remove_all_field">Remove All</button>
+        </td>
+        <td class="oe_export_fields_selector_right">
+            <select name="fields_list" id="fields_list"
+                    multiple="multiple"></select>
+        </td>
+    </tr>
+</table>
 
-<t t-name="ExportTreeView-Secondary">
-    <table id="field-tree-structure" class="oe_export_fields_selector_export" cellspacing="0" cellpadding="0">
-        <tr><th class="oe_export_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="oe_export_row">
-            <td>
-                <table class="tree_grid" border="0">
-                    <tr class="oe_export_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>
+<table t-name="ExportTreeView-Secondary"
+       id="field-tree-structure" class="oe_export_fields_selector_export"
+       cellspacing="0" cellpadding="0">
+    <tr><th class="oe_export_tree_header"> Name </th></tr>
+    <t t-call="ExportTreeView-Secondary.children"/>
+</table>
+<tr t-name="ExportTreeView-Secondary.children"
+    t-foreach="fields" t-as="field"
+    t-att-id="'treerow-' + field.id" class="oe_export_row">
+    <td>
+        <table class="tree_grid" border="0">
+            <tr class="oe_export_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>
-                        <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>
+                </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-name="ExportNewList">
     <tr>

From 1cc90eebd95b8be9e458a5d892bfe82fab20ea1d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 26 Aug 2011 17:24:30 +0200
Subject: [PATCH 04/47] [IMP] move a bunch of trivial python RPC methods to
 usage of normal dataset methods in JS

bzr revid: xmo@openerp.com-20110826152430-8li5tzzlzfr99nda
---
 addons/base/controllers/main.py          | 17 -----
 addons/base/static/src/js/data_export.js | 90 ++++++++++++++----------
 2 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index c46b14d80d4..dddccb90619 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1194,23 +1194,6 @@ class Export(View):
         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):
 
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 74a67d59ab2..25c84516682 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -5,6 +5,8 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     init: function(parent, dataset) {
         this._super(parent);
         this.dataset = dataset;
+        this.exports = new openerp.base.DataSetSearch(
+            this, 'ir.exports', this.dataset.get_context());
     },
     start: function() {
         var self = this;
@@ -68,30 +70,33 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         var self = this;
         if (self.$element.find('#saved_export_list').is(':hidden')) {
             self.$element.find('#ExistsExportList').show();
-        } else {
-            this.rpc('/base/export/exist_export_lists', { 'model': this.dataset.model}, function(export_list) {
-                if (export_list.length) {
-                    self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
-                    self.$element.find('#saved_export_list').change(function() {
-                        self.$element.find('#fields_list option').remove();
-                        var export_id = self.$element.find('#saved_export_list option:selected').val();
-                        if (export_id) {
-                            self.rpc('/base/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
-                        }
-                    });
-                    self.$element.find('#delete_export_list').click(function() {
-                        var select_exp = self.$element.find('#saved_export_list option:selected');
-                        if (select_exp.val()) {
-                            self.rpc('/base/export/delete_export', { export_id: parseInt(select_exp.val())}, {});
-                            select_exp.remove();
-                            if (self.$element.find('#saved_export_list option').length <= 1) {
-                                self.$element.find('#ExistsExportList').hide();
-                            }
-                        }
-                    });
+            return;
+        }
+        this.exports.read_slice(['name'], {
+            domain: [['resource', '=', this.dataset.model]]
+        }, function (export_list) {
+            if (!export_list.length) {
+                return;
+            }
+            self.$element.find('#ExistsExportList').append(QWeb.render('Exists.ExportList', {'existing_exports': export_list}));
+            self.$element.find('#saved_export_list').change(function() {
+                self.$element.find('#fields_list option').remove();
+                var export_id = self.$element.find('#saved_export_list option:selected').val();
+                if (export_id) {
+                    self.rpc('/base/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}, self.do_load_export_field);
                 }
             });
-        }
+            self.$element.find('#delete_export_list').click(function() {
+                var select_exp = self.$element.find('#saved_export_list option:selected');
+                if (select_exp.val()) {
+                    self.exports.unlink([parseInt(select_exp.val(), 10)]);
+                    select_exp.remove();
+                    if (self.$element.find('#saved_export_list option').length <= 1) {
+                        self.$element.find('#ExistsExportList').hide();
+                    }
+                }
+            });
+        });
     },
     do_load_export_field: function(field_list) {
         var export_node = this.$element.find("#fields_list");
@@ -123,23 +128,32 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     do_save_export_list: function(value) {
         var self = this;
-        var export_field = self.get_fields();
-        if (export_field.length) {
-            self.rpc("/base/export/save_export_lists", {"model": self.dataset.model, "name":value, "field_list":export_field}, function(exp_id) {
-                if (exp_id) {
-                    if (self.$element.find("#saved_export_list").length > 0) {
-                        self.$element.find("#saved_export_list").append(new Option(value, exp_id));
-                    } else {
-                        self.on_show_exists_export_list();
-                    }
-                    if (self.$element.find("#saved_export_list").is(":hidden")) {
-                        self.on_show_exists_export_list();
-                    }
-                }
-            });
-            self.on_show_save_list();
-            self.$element.find("#fields_list option").remove();
+        var fields = self.get_fields();
+        if (!fields.length) {
+            return;
         }
+        this.exports.create({
+            name: value,
+            resource: this.dataset.model,
+            export_fields: _(fields).map(function (field) {
+                return [0, 0, {name: field}];
+            })
+        }, function (export_list_id) {
+            if (!export_list_id) {
+                return;
+            }
+            if (self.$element.find("#saved_export_list").length > 0) {
+                self.$element.find("#saved_export_list").append(
+                        new Option(value, export_list_id));
+            } else {
+                self.on_show_exists_export_list();
+            }
+            if (self.$element.find("#saved_export_list").is(":hidden")) {
+                self.on_show_exists_export_list();
+            }
+        });
+        this.on_show_save_list();
+        this.$element.find("#fields_list option").remove();
     },
     on_click: function(id, result) {
         var self = this;

From 81d2b20791b992e43d4f861b89087cf46ca63c7b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Aug 2011 12:38:09 +0200
Subject: [PATCH 05/47] [REM] useless conditional (always true) and unused
 associated variable

bzr revid: xmo@openerp.com-20110829103809-434etbz8mx3zvufp
---
 addons/base/controllers/main.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index dddccb90619..e3e94f396a1 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1209,18 +1209,17 @@ class Export(View):
         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'}})
+        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' }

From 272cc8b0c77f83516d9008167ea1279ea77d1790 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Aug 2011 12:47:55 +0200
Subject: [PATCH 06/47] [REM] error handling around xlwt import

bzr revid: xmo@openerp.com-20110829104755-mkw8fdgwtppx3a21
---
 addons/base/controllers/main.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index e3e94f396a1..9a024c22fd5 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1088,10 +1088,7 @@ def export_csv(fields, result):
     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.'))
+    import xlwt
 
     workbook = xlwt.Workbook()
     worksheet = workbook.add_sheet('Sheet 1')

From bf4e7856b62dbaea50343e3a4c99085c2e188429 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Aug 2011 12:48:12 +0200
Subject: [PATCH 07/47] [IMP] fix mime type in case of excel export

bzr revid: xmo@openerp.com-20110829104812-z2i5wa10rlanwm9p
---
 addons/base/static/src/js/data_export.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 25c84516682..2d5a128b37b 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -396,7 +396,10 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             import_compat: parseInt(import_comp),
             export_format: export_format
         }, function(data) {
-            window.location = "data:text/csv/excel;charset=utf8," + data;
+            var mime = export_format === 'csv'
+                    ? 'text/csv;charset=utf8'
+                    : 'application/vnd.mx-excel';
+            window.location = 'data:' + mime + ',' + data;
             self.close();
         });
     },

From bf83005072aa87c0755989c3b67c756268f82b9e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Aug 2011 14:27:18 +0200
Subject: [PATCH 08/47] [FIX] encoding and mime type for excel export files

bzr revid: xmo@openerp.com-20110829122718-y51ynodvlnkaixms
---
 addons/base/controllers/main.py          | 2 +-
 addons/base/static/src/js/data_export.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 9a024c22fd5..cef15d76231 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1112,7 +1112,7 @@ def export_xls(fieldnames, table):
     data = fp.read()
     fp.close()
     #return data.decode('ISO-8859-1')
-    return unicode(data, 'utf-8', 'replace')
+    return base64.b64encode(data)
 
 class Export(View):
     _cp_path = "/base/export"
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 2d5a128b37b..6180ef80183 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -398,7 +398,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         }, function(data) {
             var mime = export_format === 'csv'
                     ? 'text/csv;charset=utf8'
-                    : 'application/vnd.mx-excel';
+                    : 'application/vnd.mx-excel;base64';
             window.location = 'data:' + mime + ',' + data;
             self.close();
         });

From 9c0486b7381f4abb2ab2cf774fa57637b2096e21 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 10:53:51 +0200
Subject: [PATCH 09/47] [IMP] move file download API to session, so it can more
 easily be used for operations other than db backup

bzr revid: xmo@openerp.com-20110830085351-puvbzwwru9rbfo14
---
 addons/base/static/src/js/chrome.js | 66 +++++++----------------------
 addons/base/static/src/js/core.js   | 44 +++++++++++++++++++
 addons/base/static/src/xml/base.xml |  1 -
 3 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index a4a3b73cc77..972cd7e2b6e 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -339,62 +339,26 @@ openerp.base.Database = openerp.base.Widget.extend({
             }
         });
     },
-    wait_for_file: function (token, cleanup) {
-        var self = this,
-            cookie_name = 'fileToken',
-            cookie_length = cookie_name.length;
-        this.backup_timer = setInterval(function () {
-            var cookies = document.cookie.split(';');
-            for(var i=0; i<cookies.length; ++i) {
-                var cookie = cookies[i].replace(/^\s*/, '');
-                if(!cookie.indexOf(cookie_name) === 0) { continue; }
-                var cookie_val = cookie.substring(cookie_length + 1);
-                if(parseInt(cookie_val, 10) !== token) { continue; }
-
-                // clear waiter
-                clearInterval(self.backup_timer);
-                // clear cookie
-                document.cookie = _.sprintf("%s=;expires=%s;path=/",
-                    cookie_name, new Date().toGMTString());
-
-                if (cleanup) { cleanup(); }
-            }
-        }, 200);
-    },
     do_backup: function() {
         var self = this;
-       	self.$option_id.html(QWeb.render("BackupDB", self));
-
-        self.$option_id.find("form[name=backup_db_form]").validate({
+       	self.$option_id
+            .html(QWeb.render("BackupDB", self))
+            .find("form[name=backup_db_form]").validate({
             submitHandler: function (form) {
                 $.blockUI({message:'<img src="/base/static/src/img/throbber2.gif">'});
-                // need to detect when the file is done downloading (not used
-                // yet, but we'll need it to fix the UI e.g. with a throbber
-                // while dump is being generated), iframe load event only fires
-                // when the iframe content loads, so we need to go smarter:
-                // http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
-                var $target = $('#backup-target'),
-                      token = new Date().getTime();
-                if (!$target.length) {
-                    $target = $('<iframe id="backup-target" style="display: none;">')
-                        .appendTo(document.body)
-                        .load(function () {
-                            $.unblockUI();
-                            clearInterval(self.backup_timer);
-                            var error = this.contentDocument.body
-                                    .firstChild.data
-                                    .split('|');
-                            self.display_error({
-                                title: error[0],
-                                error: error[1]
-                            });
+                self.session.getFile({
+                    form: form,
+                    success: function () {
+                        $.unblockUI();
+                    },
+                    error: function (body) {
+                        $.unblockUI();
+                        var error = body.firstChild.data.split('|');
+                        self.display_error({
+                            title: error[0],
+                            error: error[1]
                         });
-                }
-                $(form).find('input[name=token]').val(token);
-                form.submit();
-
-                self.wait_for_file(token, function () {
-                    $.unblockUI();
+                    }
                 });
             }
         });
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 57b3a8cb637..88b880e469f 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -613,6 +613,50 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
                 this.module_loaded[mod] = true;
             }
         }
+    },
+    getFile: function (options) {
+        // need to detect when the file is done downloading (not used
+        // yet, but we'll need it to fix the UI e.g. with a throbber
+        // while dump is being generated), iframe load event only fires
+        // when the iframe content loads, so we need to go smarter:
+        // http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
+        var timer, token = new Date().getTime(),
+            cookie_name = 'fileToken', cookie_length = cookie_name.length,
+            self = this, CHECK_INTERVAL = 100, id = _.uniqueId('get_file_frame');
+        var complete = function () { clearTimeout(timer); $target.remove(); };
+        var $target = $('<iframe style="display: none;">')
+            .attr({id: id, name: id})
+            .appendTo(document.body)
+            .load(function () {
+                if (options.error) {
+                    options.error(this.contentDocument.body)
+                }
+                complete();
+            });
+        $(options.form)
+            .append('<input type="hidden" name="token" value="' + token +'">')
+            .attr('target', id)
+            .get(0).submit();
+
+        var waitLoop = function () {
+            var cookies = document.cookie.split(';');
+            // setup next check
+            timer = setTimeout(waitLoop, CHECK_INTERVAL);
+            for (var i=0; i<cookies.length; ++i) {
+                var cookie = cookies[i].replace(/^\s*/, '');
+                if (!cookie.indexOf(cookie_name === 0)) { continue; }
+                var cookie_val = cookie.substring(cookie_length + 1);
+                if (parseInt(cookie_val, 10) !== token) { continue; }
+
+                // clear cookie
+                document.cookie = _.sprintf("%s=;expires=%s;path=/",
+                    cookie_name, new Date().toGMTString());
+                if (options.success) { options.success(); }
+                complete();
+                return;
+            }
+        };
+        timer = setTimeout(waitLoop, CHECK_INTERVAL);
     }
 });
 
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9908606bf53..d3e91f281f0 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -147,7 +147,6 @@
 <t t-name="BackupDB">
     <form name="backup_db_form" class="oe_forms" method="POST" target="backup-target"
           action="/base/database/backup">
-        <input type="hidden" name="token"/>
         <table width="100%">
             <tr>
                 <td class="option_string">

From 79fb169fc761ae5cc8fa2660242e8115572c3212 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 11:05:14 +0200
Subject: [PATCH 10/47] [FIX] breakage in case of repeated calls to getFile for
 the same form: remove token after download has completed (or errored out)

also add some documentation for openerp.base.Session.getFile

bzr revid: xmo@openerp.com-20110830090514-pa5lnxvee4qfg0zp
---
 addons/base/static/src/js/chrome.js |  7 ++-----
 addons/base/static/src/js/core.js   | 30 ++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 972cd7e2b6e..5475e8159b2 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -348,17 +348,14 @@ openerp.base.Database = openerp.base.Widget.extend({
                 $.blockUI({message:'<img src="/base/static/src/img/throbber2.gif">'});
                 self.session.getFile({
                     form: form,
-                    success: function () {
-                        $.unblockUI();
-                    },
                     error: function (body) {
-                        $.unblockUI();
                         var error = body.firstChild.data.split('|');
                         self.display_error({
                             title: error[0],
                             error: error[1]
                         });
-                    }
+                    },
+                    complete: $.unblockUI
                 });
             }
         });
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 88b880e469f..671462b107f 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -614,6 +614,24 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
             }
         }
     },
+    /**
+     * Cooperative file download implementation, for ajaxy APIs.
+     *
+     * Requires that the server side implements an httprequest correctly
+     * setting the `fileToken` cookie to the value provided as the `token`
+     * parameter. The cookie *must* be set on the `/` path and *must not* be
+     * `httpOnly`.
+     *
+     * It would probably also be a good idea for the response to use a
+     * `Content-Disposition: attachment` header, especially if the MIME is a
+     * "known" type (e.g. text/plain, or for some browsers application/json
+     *
+     * @param {Object} options
+     * @param {HTMLFormElement} options.form the form to submit in order to fetch the file
+     * @param {Function} [options.success] callback in case of download success
+     * @param {Function} [options.error] callback in case of request error, provided with the error body
+     * @param {Function} [options.complete] called after both ``success`` and ``error` callbacks have executed
+     */
     getFile: function (options) {
         // need to detect when the file is done downloading (not used
         // yet, but we'll need it to fix the UI e.g. with a throbber
@@ -622,8 +640,14 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         // http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
         var timer, token = new Date().getTime(),
             cookie_name = 'fileToken', cookie_length = cookie_name.length,
-            self = this, CHECK_INTERVAL = 100, id = _.uniqueId('get_file_frame');
-        var complete = function () { clearTimeout(timer); $target.remove(); };
+            self = this, CHECK_INTERVAL = 100, id = _.uniqueId('get_file_frame'),
+            $token = $('<input type="hidden" name="token" value="' + token +'">');
+        var complete = function () {
+            if (options.complete) { options.complete(); }
+            clearTimeout(timer);
+            $token.remove();
+            $target.remove();
+        };
         var $target = $('<iframe style="display: none;">')
             .attr({id: id, name: id})
             .appendTo(document.body)
@@ -634,7 +658,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
                 complete();
             });
         $(options.form)
-            .append('<input type="hidden" name="token" value="' + token +'">')
+            .append($token)
             .attr('target', id)
             .get(0).submit();
 

From 78b10fb5f4c07342346d2830352dd2660aa99f6d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 11:06:09 +0200
Subject: [PATCH 11/47] [REN] openerp.base.Session#getFile to
 openerp.base.Session#get_file: we're using python-style underscore_separated
 names for methods

bzr revid: xmo@openerp.com-20110830090609-xdmeuroca1p6zue1
---
 addons/base/static/src/js/chrome.js | 2 +-
 addons/base/static/src/js/core.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 5475e8159b2..cf3f4b0ae00 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -346,7 +346,7 @@ openerp.base.Database = openerp.base.Widget.extend({
             .find("form[name=backup_db_form]").validate({
             submitHandler: function (form) {
                 $.blockUI({message:'<img src="/base/static/src/img/throbber2.gif">'});
-                self.session.getFile({
+                self.session.get_file({
                     form: form,
                     error: function (body) {
                         var error = body.firstChild.data.split('|');
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 671462b107f..48c05c60854 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -632,7 +632,7 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
      * @param {Function} [options.error] callback in case of request error, provided with the error body
      * @param {Function} [options.complete] called after both ``success`` and ``error` callbacks have executed
      */
-    getFile: function (options) {
+    get_file: function (options) {
         // need to detect when the file is done downloading (not used
         // yet, but we'll need it to fix the UI e.g. with a throbber
         // while dump is being generated), iframe load event only fires

From 8448cdc63db8878db4093a7b85ec84355bab3b0e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 12:23:46 +0200
Subject: [PATCH 12/47] [IMP] reliability fix in token handling

bzr revid: xmo@openerp.com-20110830102346-b5a9wmx1uxjehp7z
---
 addons/base/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index cef15d76231..a0da55eb868 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -250,7 +250,7 @@ class Database(openerpweb.Controller):
                 req.session.proxy("db").dump(backup_pwd, backup_db))
             req.httpresponse.headers['Content-Type'] = "application/octet-stream; charset=binary"
             req.httpresponse.headers['Content-Disposition'] = 'attachment; filename="' + backup_db + '.dump"'
-            req.httpresponse.cookie['fileToken'] = token
+            req.httpresponse.cookie['fileToken'] = int(token)
             req.httpresponse.cookie['fileToken']['path'] = '/'
             return db_dump
         except xmlrpclib.Fault, e:

From c326d6942ca25782fbdcc67f5df33ecb8c5f9f08 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 13:02:04 +0200
Subject: [PATCH 13/47] [IMP] get export to work correctly with
 Session.get_file (so the user really downloads a file each time)

bzr revid: xmo@openerp.com-20110830110204-lf3qi2r5ck8avcs9
---
 addons/base/controllers/main.py          | 23 +++++++++----
 addons/base/static/src/js/core.js        | 41 ++++++++++++++++++------
 addons/base/static/src/js/data_export.js | 32 +++++++++---------
 3 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index a0da55eb868..e000affcf44 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1112,7 +1112,7 @@ def export_xls(fieldnames, table):
     data = fp.read()
     fp.close()
     #return data.decode('ISO-8859-1')
-    return base64.b64encode(data)
+    return data
 
 class Export(View):
     _cp_path = "/base/export"
@@ -1238,19 +1238,30 @@ class Export(View):
             return _fields
         return rec(fields)
 
-    @openerpweb.jsonrequest
-    def export_data(self, req, model, fields, ids, domain, import_compat=False, export_format="csv", context=None):
+    @openerpweb.httprequest
+    def export_data(self, req, data, token):
+        model, fields, ids, domain, import_compat, export_format = \
+            operator.itemgetter('model', 'fields', 'ids', 'domain',
+                                'import_compat', 'export_format')(
+                simplejson.loads(data))
+
         context = req.session.eval_context(req.context)
-        modle_obj = req.session.model(model)
-        ids = ids or modle_obj.search(domain, context=context)
+        Model = req.session.model(model)
+        ids = ids or Model.search(domain, context=context)
 
         field = fields.keys()
-        result = modle_obj.export_data(ids, field , context).get('datas',[])
+        result = Model.export_data(ids, field, context).get('datas',[])
 
         if not import_compat:
             field = [val.strip() for val in fields.values()]
 
+        req.httpresponse.headers['Content-Disposition'] = \
+            'attachment; filename="%s.%s"' % (model, export_format)
+        req.httpresponse.cookie['fileToken'] = int(token)
+        req.httpresponse.cookie['fileToken']['path'] = '/'
         if export_format == 'xls':
+            req.httpresponse.headers['Content-Type'] = 'application/vnd.mx-excel'
             return export_xls(field, result)
         else:
+            req.httpresponse.headers['Content-Type'] = 'text/csv;charset=utf8'
             return export_csv(field, result)
diff --git a/addons/base/static/src/js/core.js b/addons/base/static/src/js/core.js
index 48c05c60854..fab90427824 100644
--- a/addons/base/static/src/js/core.js
+++ b/addons/base/static/src/js/core.js
@@ -627,7 +627,9 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
      * "known" type (e.g. text/plain, or for some browsers application/json
      *
      * @param {Object} options
-     * @param {HTMLFormElement} options.form the form to submit in order to fetch the file
+     * @param {String} [options.url] used to dynamically create a form
+     * @param {Object} [options.data] data to add to the form submission. If can be used without a form, in which case a form is created from scratch. Otherwise, added to form data
+     * @param {HTMLFormElement} [options.form] the form to submit in order to fetch the file
      * @param {Function} [options.success] callback in case of download success
      * @param {Function} [options.error] callback in case of request error, provided with the error body
      * @param {Function} [options.complete] called after both ``success`` and ``error` callbacks have executed
@@ -640,25 +642,46 @@ openerp.base.Session = openerp.base.CallbackEnabled.extend( /** @lends openerp.b
         // http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
         var timer, token = new Date().getTime(),
             cookie_name = 'fileToken', cookie_length = cookie_name.length,
-            self = this, CHECK_INTERVAL = 100, id = _.uniqueId('get_file_frame'),
-            $token = $('<input type="hidden" name="token" value="' + token +'">');
+            CHECK_INTERVAL = 1000, id = _.uniqueId('get_file_frame'),
+            remove_form = false;
+
+        var $form, $form_data = $('<div>');
+
         var complete = function () {
             if (options.complete) { options.complete(); }
             clearTimeout(timer);
-            $token.remove();
+            $form_data.remove();
             $target.remove();
+            if (remove_form && $form) { $form.remove(); }
         };
         var $target = $('<iframe style="display: none;">')
             .attr({id: id, name: id})
             .appendTo(document.body)
             .load(function () {
-                if (options.error) {
-                    options.error(this.contentDocument.body)
-                }
+                if (options.error) { options.error(this.contentDocument.body); }
                 complete();
             });
-        $(options.form)
-            .append($token)
+
+        if (options.form) {
+            $form = $(options.form);
+        } else {
+            remove_form = true;
+            $form = $('<form>', {
+                action: options.url,
+                method: 'POST'
+            }).appendTo(document.body);
+        }
+
+        _(_.extend({}, options.data || {},
+                   {session_id: this.session_id, token: token}))
+            .each(function (value, key) {
+                $('<input type="hidden" name="' + key + '">')
+                    .val(value)
+                    .appendTo($form_data);
+            });
+
+        $form
+            .append($form_data)
             .attr('target', id)
             .get(0).submit();
 
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 6180ef80183..6ebd3f6843c 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -373,10 +373,10 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         return export_field;
     },
     on_click_export_data: function() {
-        var self = this;
+        $.blockUI(this.$element);
         var export_field = {};
         var flag = true;
-        self.$element.find("#fields_list option").each(function() {
+        this.$element.find("#fields_list option").each(function() {
             export_field[$(this).val()] = $(this).text();
             flag = false;
         });
@@ -385,22 +385,20 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             return;
         }
 
-        var import_comp = self.$element.find("#import_compat option:selected").val(),
-            export_format = self.$element.find("#export_format").val();
+        var import_comp = this.$element.find("#import_compat option:selected").val(),
+            export_format = this.$element.find("#export_format").val();
 
-        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) {
-            var mime = export_format === 'csv'
-                    ? 'text/csv;charset=utf8'
-                    : 'application/vnd.mx-excel;base64';
-            window.location = 'data:' + mime + ',' + data;
-            self.close();
+        this.session.get_file({
+            url: '/base/export/export_data',
+            data: {data: JSON.stringify({
+                model: this.dataset.model,
+                fields: export_field,
+                ids: this.dataset.ids,
+                domain: this.dataset.domain,
+                import_compat: parseInt(import_comp),
+                export_format: export_format
+            })},
+            complete: $.unblockUI
         });
     },
     close: function() {

From e0e1b1f246c0a02540689325fdd525ad81c5000b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 13:27:04 +0200
Subject: [PATCH 14/47] [IMP] simplify code collecting arguments to data export
 a bit, remove useless temp variables

bzr revid: xmo@openerp.com-20110830112704-xc19idvo4q90kqt6
---
 addons/base/static/src/js/data_export.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 6ebd3f6843c..0ac88d27c09 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -374,29 +374,25 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     on_click_export_data: function() {
         $.blockUI(this.$element);
-        var export_field = {};
-        var flag = true;
+        var exported_fields = {};
         this.$element.find("#fields_list option").each(function() {
-            export_field[$(this).val()] = $(this).text();
-            flag = false;
+            exported_fields[$(this).val()] = $(this).text();
         });
-        if (flag) {
+        if (_.isEmpty(exported_fields)) {
             alert('Please select fields to export...');
             return;
         }
 
-        var import_comp = this.$element.find("#import_compat option:selected").val(),
-            export_format = this.$element.find("#export_format").val();
-
         this.session.get_file({
             url: '/base/export/export_data',
             data: {data: JSON.stringify({
                 model: this.dataset.model,
-                fields: export_field,
+                fields: exported_fields,
                 ids: this.dataset.ids,
                 domain: this.dataset.domain,
-                import_compat: parseInt(import_comp),
-                export_format: export_format
+                import_compat: parseInt(
+                        this.$element.find("#import_compat").val(), 10),
+                export_format: this.$element.find("#export_format").val()
             })},
             complete: $.unblockUI
         });

From 33f5bf6a2bbfa247c4e932f827e9d0ee50df856c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 13:58:39 +0200
Subject: [PATCH 15/47] [IMP] make removing all fields selected for an export
 slightly more efficient (by emptying the whole select instead of removing
 options individually)

bzr revid: xmo@openerp.com-20110830115839-i5xfaqqmrg2m3w8u
---
 addons/base/static/src/js/data_export.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 0ac88d27c09..25bfccab055 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -43,7 +43,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             self.$element.find('#fields_list option:selected').remove();
         });
         self.$element.find('#remove_all_field').click(function() {
-            self.$element.find('#fields_list option').remove();
+            self.$element.find('#fields_list').empty();
         });
         self.$element.find('#export_new_list').click(function() {
             self.on_show_save_list();

From e53d25ef17f0b325d5ea1e0944e590bcbe7bcced Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 14:11:58 +0200
Subject: [PATCH 16/47] [IMP] remember to set base in parseInt

bzr revid: xmo@openerp.com-20110830121158-kmfs2x0tqj6c8v3b
---
 addons/base/static/src/js/data_export.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 25bfccab055..b2f9f4af2a0 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -50,7 +50,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         });
         var import_comp = self.$element.find('#import_compat option:selected').val(),
             params = {
-                import_compat: parseInt(import_comp)
+                import_compat: parseInt(import_comp, 10)
             };
         self.rpc('/base/export/get_fields', { model: self.dataset.model, params: params }, self.on_show_data);
 
@@ -60,7 +60,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             var import_comp = self.$element.find("#import_compat option:selected").val();
             if (import_comp) {
                 var params = {
-                    import_compat: parseInt(import_comp)
+                    import_compat: parseInt(import_comp, 10)
                 };
                 self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
             }

From c276c2d67c989a0031f19f6e41e1cb15134c1d89 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 15:06:32 +0200
Subject: [PATCH 17/47] [IMP] make export extensible

bzr revid: xmo@openerp.com-20110830130632-t96hsz4jxjp69crh
---
 addons/base/controllers/main.py          | 159 ++++++++++++++---------
 addons/base/static/src/js/data_export.js |   6 +-
 2 files changed, 101 insertions(+), 64 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index e000affcf44..5f391604eb9 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1063,57 +1063,6 @@ class TreeView(View):
             req,'action', 'tree_but_open',[(model, id)],
             False)
 
-def export_csv(fields, result):
-    fp = 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 xlwt
-
-    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()
-    workbook.save(fp)
-    fp.seek(0)
-    data = fp.read()
-    fp.close()
-    #return data.decode('ISO-8859-1')
-    return data
-
 class Export(View):
     _cp_path = "/base/export"
 
@@ -1238,11 +1187,34 @@ class Export(View):
             return _fields
         return rec(fields)
 
+    #noinspection PyPropertyDefinition
+    @property
+    def content_type(self):
+        """ Provides the format's content type """
+        raise NotImplementedError()
+
+    def filename(self, base):
+        """ Creates a valid filename for the format (with extension) from the
+         provided base name (exension-less)
+        """
+        raise NotImplementedError()
+
+    def from_data(self, fields, rows):
+        """ Conversion method from OpenERP's export data to whatever the
+        current export class outputs
+
+        :params list fields: a list of fields to export
+        :params list rows: a list of records to export
+        :returns:
+        :rtype: bytes
+        """
+        raise NotImplementedError()
+
     @openerpweb.httprequest
-    def export_data(self, req, data, token):
-        model, fields, ids, domain, import_compat, export_format = \
+    def index(self, req, data, token):
+        model, fields, ids, domain, import_compat = \
             operator.itemgetter('model', 'fields', 'ids', 'domain',
-                                'import_compat', 'export_format')(
+                                'import_compat')(
                 simplejson.loads(data))
 
         context = req.session.eval_context(req.context)
@@ -1256,12 +1228,77 @@ class Export(View):
             field = [val.strip() for val in fields.values()]
 
         req.httpresponse.headers['Content-Disposition'] = \
-            'attachment; filename="%s.%s"' % (model, export_format)
+            'attachment; filename="%s"' % self.filename(model)
         req.httpresponse.cookie['fileToken'] = int(token)
         req.httpresponse.cookie['fileToken']['path'] = '/'
-        if export_format == 'xls':
-            req.httpresponse.headers['Content-Type'] = 'application/vnd.mx-excel'
-            return export_xls(field, result)
-        else:
-            req.httpresponse.headers['Content-Type'] = 'text/csv;charset=utf8'
-            return export_csv(field, result)
+        req.httpresponse.headers['Content-Type'] = self.content_type
+        return self.from_data(field, result)
+
+class CSVExport(Export):
+    _cp_path = '/base/export/csv'
+
+    @property
+    def content_type(self):
+        return 'text/csv;charset=utf8'
+
+    def filename(self, base):
+        return base + '.csv'
+
+    def from_data(self, fields, rows):
+        fp = StringIO()
+        writer = csv.writer(fp, quoting=csv.QUOTE_ALL)
+
+        writer.writerow(fields)
+
+        for data in rows:
+            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
+
+class ExcelExport(Export):
+    _cp_path = '/base/export/xls'
+
+    @property
+    def content_type(self):
+        return 'application/vnd.ms-excel'
+
+    def filename(self, base):
+        return base + '.xls'
+
+    def from_data(self, fields, rows):
+        import xlwt
+
+        workbook = xlwt.Workbook()
+        worksheet = workbook.add_sheet('Sheet 1')
+
+        for i, fieldname in enumerate(fields):
+            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(rows):
+            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()
+        workbook.save(fp)
+        fp.seek(0)
+        data = fp.read()
+        fp.close()
+        return data
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index b2f9f4af2a0..1823dbd6ed2 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -383,16 +383,16 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             return;
         }
 
+        var export_format = this.$element.find("#export_format").val();
         this.session.get_file({
-            url: '/base/export/export_data',
+            url: '/base/export/' + export_format,
             data: {data: JSON.stringify({
                 model: this.dataset.model,
                 fields: exported_fields,
                 ids: this.dataset.ids,
                 domain: this.dataset.domain,
                 import_compat: parseInt(
-                        this.$element.find("#import_compat").val(), 10),
-                export_format: this.$element.find("#export_format").val()
+                        this.$element.find("#import_compat").val(), 10)
             })},
             complete: $.unblockUI
         });

From 9df1318f4fa204c1c831358458a4d1080fedda10 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 15:23:26 +0200
Subject: [PATCH 18/47] [IMP] have the export dialog fetch possible export
 formats from the server

bzr revid: xmo@openerp.com-20110830132326-ac0f7xs3h1jr3a7j
---
 addons/base/controllers/main.py          | 16 ++++++++++++++++
 addons/base/static/src/js/data_export.js |  9 +++++++++
 addons/base/static/src/xml/base.xml      |  7 ++-----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 5f391604eb9..ab583d9831c 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1066,6 +1066,20 @@ class TreeView(View):
 class Export(View):
     _cp_path = "/base/export"
 
+    @openerpweb.jsonrequest
+    def formats(self, req):
+        """ Returns all valid export formats
+
+        :returns: for each export format, a pair of identifier and printable name
+        :rtype: [(str, str)]
+        """
+        return sorted([
+            controller.fmt
+            for path, controller in openerpweb.controllers_path.iteritems()
+            if path.startswith(self._cp_path)
+            if hasattr(controller, 'fmt')
+        ], key=operator.itemgetter(1))
+
     def fields_get(self, req, model):
         Model = req.session.model(model)
         fields = Model.fields_get(False, req.session.eval_context(req.context))
@@ -1236,6 +1250,7 @@ class Export(View):
 
 class CSVExport(Export):
     _cp_path = '/base/export/csv'
+    fmt = ('csv', 'CSV')
 
     @property
     def content_type(self):
@@ -1270,6 +1285,7 @@ class CSVExport(Export):
 
 class ExcelExport(Export):
     _cp_path = '/base/export/xls'
+    fmt = ('xls', 'Excel')
 
     @property
     def content_type(self):
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 1823dbd6ed2..c555a3b7f3b 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -65,6 +65,15 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
             }
         });
+        self.rpc('/base/export/formats', {}, function (formats) {
+            self.setup_export_formats(formats);
+        });
+    },
+    setup_export_formats: function (formats) {
+        var $fmts = this.$element.find('#export_format');
+        _(formats).each(function (format) {
+            $fmts.append(new Option(format[1], format[0]));
+        });
     },
     on_show_exists_export_list: function() {
         var self = this;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index d3e91f281f0..75593d603e9 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1237,11 +1237,8 @@
                 <option value="0">Export all Data</option>
             </select>
 
-            <label for="export_format">Export Format</label>
-            <select id="export_format" name="export_format">
-                <option value="csv">CSV</option>
-                <option value="xls">Excel</option>
-            </select>
+            <label for="export_format">Export Formats</label>
+            <select id="export_format" name="export_format"></select>
         </td>
     </tr>
 

From 3b824c76e9dcd44d49369e48b7be686d1fd9287f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 15:43:05 +0200
Subject: [PATCH 19/47] [FIX] don't coerce values to str before writing them to
 the worksheet in excel export

especially since xlwt is perfectly able to deal with unicode instances without blowing up like a 'tard

bzr revid: xmo@openerp.com-20110830134305-iu354whbr0c0kvpw
---
 addons/base/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index ab583d9831c..85f8e7742e4 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1308,8 +1308,8 @@ class ExcelExport(Export):
 
         for row_index, row in enumerate(rows):
             for cell_index, cell_value in enumerate(row):
-                cell_value = str(cell_value)
-                cell_value = re.sub("\r", " ", cell_value)
+                if isinstance(cell_value, basestring):
+                    cell_value = re.sub("\r", " ", cell_value)
                 worksheet.write(row_index + 1, cell_index, cell_value, style)
 
         fp = StringIO()

From 972a191a33dadef1ac53ab9b240986510ff87f93 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 30 Aug 2011 15:43:53 +0200
Subject: [PATCH 20/47] [FIX] correctly return a deferred from
 openerp.base.DataExport.start, even though there probably is no need to do so

bzr revid: xmo@openerp.com-20110830134353-52y9p8tfx6aen84k
---
 addons/base/static/src/js/data_export.js | 46 ++++++++++++------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index c555a3b7f3b..bb3c2f16ab3 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -26,7 +26,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                },
             close: function(event, ui){ self.close();}
         });
-        self.on_show_exists_export_list();
         self.$element.removeClass('ui-dialog-content ui-widget-content');
         self.$element.find('#add_field').click(function() {
             if ($('#field-tree-structure tr.ui-selected')) {
@@ -45,43 +44,42 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         self.$element.find('#remove_all_field').click(function() {
             self.$element.find('#fields_list').empty();
         });
-        self.$element.find('#export_new_list').click(function() {
-            self.on_show_save_list();
-        });
-        var import_comp = self.$element.find('#import_compat option:selected').val(),
-            params = {
-                import_compat: parseInt(import_comp, 10)
-            };
-        self.rpc('/base/export/get_fields', { model: self.dataset.model, params: params }, self.on_show_data);
+        this.$element.find('#export_new_list').click(this.on_show_save_list);
 
-        self.$element.find('#import_compat').change(function() {
-            self.$element.find('#fields_list option').remove();
+        var got_fields = new $.Deferred();
+        this.$element.find('#import_compat').change(function() {
+            self.$element.find('#fields_list').empty();
             self.$element.find('#field-tree-structure').remove();
             var import_comp = self.$element.find("#import_compat option:selected").val();
             if (import_comp) {
-                var params = {
-                    import_compat: parseInt(import_comp, 10)
-                };
-                self.rpc("/base/export/get_fields", { model: self.dataset.model, params: params}, self.on_show_data);
+                self.rpc("/base/export/get_fields", {
+                    model: self.dataset.model,
+                    params: { import_compat: parseInt(import_comp, 10) }
+                }, function (records) {
+                    got_fields.resolve();
+                    self.on_show_data(records);
+                });
             }
-        });
-        self.rpc('/base/export/formats', {}, function (formats) {
-            self.setup_export_formats(formats);
-        });
+        }).change();
+
+        return $.when(
+            got_fields,
+            this.rpc('/base/export/formats', {}, this.do_setup_export_formats),
+            this.show_exports_list());
     },
-    setup_export_formats: function (formats) {
+    do_setup_export_formats: function (formats) {
         var $fmts = this.$element.find('#export_format');
         _(formats).each(function (format) {
             $fmts.append(new Option(format[1], format[0]));
         });
     },
-    on_show_exists_export_list: function() {
+    show_exports_list: function() {
         var self = this;
         if (self.$element.find('#saved_export_list').is(':hidden')) {
             self.$element.find('#ExistsExportList').show();
             return;
         }
-        this.exports.read_slice(['name'], {
+        return this.exports.read_slice(['name'], {
             domain: [['resource', '=', this.dataset.model]]
         }, function (export_list) {
             if (!export_list.length) {
@@ -155,10 +153,10 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 self.$element.find("#saved_export_list").append(
                         new Option(value, export_list_id));
             } else {
-                self.on_show_exists_export_list();
+                self.show_exports_list();
             }
             if (self.$element.find("#saved_export_list").is(":hidden")) {
-                self.on_show_exists_export_list();
+                self.show_exports_list();
             }
         });
         this.on_show_save_list();

From 4442c1f43b290739286364679ab0ca5a7b22a57c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 12:54:19 +0200
Subject: [PATCH 21/47] [IMP] does not seem to be any reason to use
 fields_view_get to get fields data, remove

bzr revid: xmo@openerp.com-20110831105419-2tmxdy7u4oxw0ynh
---
 addons/base/controllers/main.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 85f8e7742e4..b06474a49ef 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1157,7 +1157,7 @@ class Export(View):
     @openerpweb.jsonrequest
     def namelist(self,req,  model, export_id):
 
-        result = self.get_data(req, model, req.session.eval_context(req.context))
+        result = self.get_data(req, model)
         ir_export_obj = req.session.model("ir.exports")
         ir_export_line_obj = req.session.model("ir.exports.line")
 
@@ -1168,17 +1168,10 @@ class Export(View):
         [name_list.update({field['name']: result.get(field['name'])}) for field in fields]
         return name_list
 
-    def get_data(self, req, model, context=None):
-        context = context or {}
+    def get_data(self, req, model):
         fields_data = {}
-        proxy = req.session.model(model)
         fields = self.fields_get(req, model)
 
-        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):

From 781db2f3b3c9c80459e168c3d823a128b0ba1ac3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 13:04:39 +0200
Subject: [PATCH 22/47] [FIX] don't fuck up name ordering in exported file:
 match what was requested by the user

bzr revid: xmo@openerp.com-20110831110439-5q04tn4uqqu0ytf2
---
 addons/base/controllers/main.py          | 13 ++++++++-----
 addons/base/static/src/js/data_export.js |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index b06474a49ef..4e5a3b28849 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1228,18 +1228,21 @@ class Export(View):
         Model = req.session.model(model)
         ids = ids or Model.search(domain, context=context)
 
-        field = fields.keys()
-        result = Model.export_data(ids, field, context).get('datas',[])
+        field_names = map(operator.itemgetter('name'), fields)
+        import_data = Model.export_data(ids, field_names, context).get('datas',[])
+
+        if import_compat:
+            columns_headers = field_names
+        else:
+            columns_headers = [val['label'].strip() for val in fields]
 
-        if not import_compat:
-            field = [val.strip() for val in fields.values()]
 
         req.httpresponse.headers['Content-Disposition'] = \
             'attachment; filename="%s"' % self.filename(model)
         req.httpresponse.cookie['fileToken'] = int(token)
         req.httpresponse.cookie['fileToken']['path'] = '/'
         req.httpresponse.headers['Content-Type'] = self.content_type
-        return self.from_data(field, result)
+        return self.from_data(columns_headers, import_data)
 
 class CSVExport(Export):
     _cp_path = '/base/export/csv'
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index bb3c2f16ab3..6d8eb335e41 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -381,9 +381,9 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     on_click_export_data: function() {
         $.blockUI(this.$element);
-        var exported_fields = {};
+        var exported_fields = [];
         this.$element.find("#fields_list option").each(function() {
-            exported_fields[$(this).val()] = $(this).text();
+            exported_fields.push({name: $(this).val(), label: $(this).text()});
         });
         if (_.isEmpty(exported_fields)) {
             alert('Please select fields to export...');

From cf3a910e7396cb1baebb7713b742c49e1860be35 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 13:09:00 +0200
Subject: [PATCH 23/47] [REM] unused parameter field_parent on
 Export.get_fields

bzr revid: xmo@openerp.com-20110831110900-uocvplitkr10ob1r
---
 addons/base/controllers/main.py          | 2 +-
 addons/base/static/src/js/data_export.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 4e5a3b28849..af7031179da 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1086,7 +1086,7 @@ class Export(View):
         return fields
 
     @openerpweb.jsonrequest
-    def get_fields(self, req, model, prefix='', name= '', field_parent=None, params={}):
+    def get_fields(self, req, model, prefix='', name= '', params={}):
         import_compat = params.get("import_compat", False)
 
         fields = self.fields_get(req, model)
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 6d8eb335e41..932de2e1632 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -192,7 +192,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                                 model: model,
                                 prefix: prefix,
                                 name: name,
-                                field_parent : self.field_id,
                                 params: params
                             }, function(results) {
                                 self.on_show_data(results);

From cf4d17aa6042eb4674a0b018c146c362a7c90554 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 13:12:01 +0200
Subject: [PATCH 24/47] [IMP] lift import_compat and parent_field_type as
 direct kwargs to Export.get_fields, from contents to the params mapping

bzr revid: xmo@openerp.com-20110831111201-g0c5qpld5zjyafnk
---
 addons/base/controllers/main.py          | 6 ++----
 addons/base/static/src/js/data_export.js | 9 +++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index af7031179da..b976ec43fed 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1086,11 +1086,9 @@ class Export(View):
         return fields
 
     @openerpweb.jsonrequest
-    def get_fields(self, req, model, prefix='', name= '', params={}):
-        import_compat = params.get("import_compat", False)
-
+    def get_fields(self, req, model, prefix='', name= '',
+                   import_compat=True, field_parent_type=None):
         fields = self.fields_get(req, model)
-        field_parent_type = params.get("parent_field_type",False)
 
         if import_compat and field_parent_type and field_parent_type == "many2one":
             fields = {}
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 932de2e1632..40c1d90fd44 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -54,7 +54,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             if (import_comp) {
                 self.rpc("/base/export/get_fields", {
                     model: self.dataset.model,
-                    params: { import_compat: parseInt(import_comp, 10) }
+                    import_compat: parseInt(import_comp, 10)
                 }, function (records) {
                     got_fields.resolve();
                     self.on_show_data(records);
@@ -184,15 +184,12 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                     if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
                         if (model) {
                             var import_comp = self.$element.find("#import_compat option:selected").val();
-                            var params = {
-                                import_compat: parseInt(import_comp),
-                                parent_field_type : record['field_type']
-                            };
                             self.rpc("/base/export/get_fields", {
                                 model: model,
                                 prefix: prefix,
                                 name: name,
-                                params: params
+                                import_compat: parseInt(import_comp, 10),
+                                parent_field_type : record['field_type']
                             }, function(results) {
                                 self.on_show_data(results);
                             });

From e99c627d7fdd0e10c77671366bd6066e8c15546b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 13:28:54 +0200
Subject: [PATCH 25/47] [IMP] make 'import compatible' an actual boolean, not a
 boolean-ish non-bool

bzr revid: xmo@openerp.com-20110831112854-kczxaj3v79vx32ya
---
 addons/base/static/src/js/data_export.js | 26 +++++++++++-------------
 addons/base/static/src/xml/base.xml      |  4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 40c1d90fd44..2e3614acd26 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -50,16 +50,14 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         this.$element.find('#import_compat').change(function() {
             self.$element.find('#fields_list').empty();
             self.$element.find('#field-tree-structure').remove();
-            var import_comp = self.$element.find("#import_compat option:selected").val();
-            if (import_comp) {
-                self.rpc("/base/export/get_fields", {
-                    model: self.dataset.model,
-                    import_compat: parseInt(import_comp, 10)
-                }, function (records) {
-                    got_fields.resolve();
-                    self.on_show_data(records);
-                });
-            }
+            var import_comp = self.$element.find("#import_compat").val();
+            self.rpc("/base/export/get_fields", {
+                model: self.dataset.model,
+                import_compat: Boolean(import_comp)
+            }, function (records) {
+                got_fields.resolve();
+                self.on_show_data(records);
+            });
         }).change();
 
         return $.when(
@@ -183,12 +181,12 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 if (is_loaded == 0) {
                     if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
                         if (model) {
-                            var import_comp = self.$element.find("#import_compat option:selected").val();
+                            var import_comp = self.$element.find("#import_compat").val();
                             self.rpc("/base/export/get_fields", {
                                 model: model,
                                 prefix: prefix,
                                 name: name,
-                                import_compat: parseInt(import_comp, 10),
+                                import_compat: Boolean(import_comp),
                                 parent_field_type : record['field_type']
                             }, function(results) {
                                 self.on_show_data(results);
@@ -394,8 +392,8 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 fields: exported_fields,
                 ids: this.dataset.ids,
                 domain: this.dataset.domain,
-                import_compat: parseInt(
-                        this.$element.find("#import_compat").val(), 10)
+                import_compat: Boolean(
+                        this.$element.find("#import_compat").val())
             })},
             complete: $.unblockUI
         });
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 75593d603e9..b25c85d4874 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1233,8 +1233,8 @@
         <td colspan="3">
             <label for="import_compat">Export Type:</label>
             <select id="import_compat" name="import_compat">
-                <option value="1">Import Compatible Export</option>
-                <option value="0">Export all Data</option>
+                <option value="yes">Import Compatible Export</option>
+                <option value="">Export all Data</option>
             </select>
 
             <label for="export_format">Export Formats</label>

From c57b768d87989e7e0851dfd066e75ef92fd18e36 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:11:54 +0200
Subject: [PATCH 26/47] [IMP] remove not-very-useful test

bzr revid: xmo@openerp.com-20110831121154-mx7qeu9r7ehhujgc
---
 addons/base/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index b976ec43fed..ba44ae5e1d5 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1090,7 +1090,7 @@ class Export(View):
                    import_compat=True, field_parent_type=None):
         fields = self.fields_get(req, model)
 
-        if import_compat and field_parent_type and field_parent_type == "many2one":
+        if import_compat and field_parent_type == "many2one":
             fields = {}
 
         fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})

From 0e302b7cd5d261b2e78ba0448441da04c89311fa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:21:01 +0200
Subject: [PATCH 27/47] [IMP] simplify traversal of fields: remove unused
 enumerate, don't create a second collection for the keys (instead just sort
 the dict.iteritems() result correctly)

bzr revid: xmo@openerp.com-20110831122101-1sy2uruu9e8bmrv6
---
 addons/base/controllers/main.py | 35 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index ba44ae5e1d5..07060df636f 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1088,41 +1088,40 @@ class Export(View):
     @openerpweb.jsonrequest
     def get_fields(self, req, model, prefix='', name= '',
                    import_compat=True, field_parent_type=None):
-        fields = self.fields_get(req, model)
 
+        fields = self.fields_get(req, model)
         if import_compat 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]
-            if import_compat and value.get('readonly'):
+        fields_seq = sorted(fields.iteritems(),
+            key=lambda field: field[1].get('string', ''), reverse=True)
+
+        records = []
+        for field_name, field in fields_seq:
+            if import_compat and field.get('readonly'):
                 ok = False
-                for sl in value.get('states', {}).values():
+                for sl in field.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']
+            id = prefix + (prefix and '/'or '') + field_name
+            nm = name + (name and '/' or '') + field['string']
             record = {'id': id, 'string': nm, 'children': [],
-                      'field_type': value.get('type', False),
-                      'required': value.get('required', False)}
+                      'field_type': field.get('type', False),
+                      'required': field.get('required', False)}
             records.append(record)
 
-            if len(nm.split('/')) < 3 and value.get('relation'):
+            if len(nm.split('/')) < 3 and field.get('relation'):
                 if import_compat:
-                    ref = value.pop('relation')
+                    ref = field.pop('relation')
                     cfields = self.fields_get(req, ref)
-                    if value['type'] == 'many2many':
+                    if field['type'] == 'many2many':
                         record['children'] = []
                         record['params'] = {'model': ref, 'prefix': id, 'name': nm}
 
-                    elif value['type'] == 'many2one':
+                    elif field['type'] == 'many2one':
                         record['children'] = [id + '/id', id + '/.id']
                         record['params'] = {'model': ref, 'prefix': id, 'name': nm}
 
@@ -1137,7 +1136,7 @@ class Export(View):
                         record['children'] = children or []
                         record['params'] = {'model': ref, 'prefix': id, 'name': nm}
                 else:
-                    ref = value.pop('relation')
+                    ref = field.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', '')))

From 1d4553bfdd5546e7ae109d9ee51f60930d330665 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:22:00 +0200
Subject: [PATCH 28/47] [REM] to more useless uses of enumerate

bzr revid: xmo@openerp.com-20110831122200-mb5dgm2elyjg8ljr
---
 addons/base/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 07060df636f..c446f37042c 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1129,7 +1129,7 @@ class Export(View):
                         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):
+                        for fld in cfields_order:
                             cid = id + '/' + fld
                             cid = cid.replace(' ', '_')
                             children.append(cid)
@@ -1141,7 +1141,7 @@ class Export(View):
                     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):
+                    for fld in cfields_order:
                         cid = id + '/' + fld
                         cid = cid.replace(' ', '_')
                         children.append(cid)

From dbbae75ed56b413ab0219c6e52c21feac32b1968 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:28:44 +0200
Subject: [PATCH 29/47] [FIX] typo

bzr revid: xmo@openerp.com-20110831122844-hk17tcu051eztif7
---
 addons/base/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index c446f37042c..9a849a26760 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1087,10 +1087,10 @@ class Export(View):
 
     @openerpweb.jsonrequest
     def get_fields(self, req, model, prefix='', name= '',
-                   import_compat=True, field_parent_type=None):
+                   import_compat=True, parent_field_type=None):
 
         fields = self.fields_get(req, model)
-        if import_compat and field_parent_type == "many2one":
+        if import_compat and parent_field_type == "many2one":
             fields = {}
         fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
 

From 5be7b90758aceb7ff17e05bfa4b660e728ef214a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:28:59 +0200
Subject: [PATCH 30/47] [IMP] boolean tests/checks

bzr revid: xmo@openerp.com-20110831122859-txaxld168x237v6t
---
 addons/base/controllers/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 9a849a26760..7c0057803eb 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1109,11 +1109,11 @@ class Export(View):
             id = prefix + (prefix and '/'or '') + field_name
             nm = name + (name and '/' or '') + field['string']
             record = {'id': id, 'string': nm, 'children': [],
-                      'field_type': field.get('type', False),
-                      'required': field.get('required', False)}
+                      'field_type': field.get('type'),
+                      'required': field.get('required')}
             records.append(record)
 
-            if len(nm.split('/')) < 3 and field.get('relation'):
+            if len(nm.split('/')) < 3 and 'relation' in field:
                 if import_compat:
                     ref = field.pop('relation')
                     cfields = self.fields_get(req, ref)

From 1ca1f7ff0a6a0dc54d5c183fb62bcf0f92f5aa5e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:34:01 +0200
Subject: [PATCH 31/47] [IMP] deduplicate code in handling of relational fields
 for exports listing

bzr revid: xmo@openerp.com-20110831123401-o9rsbu4p9vux0ywf
---
 addons/base/controllers/main.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 7c0057803eb..eb7d654ab74 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1114,29 +1114,14 @@ class Export(View):
             records.append(record)
 
             if len(nm.split('/')) < 3 and 'relation' in field:
-                if import_compat:
-                    ref = field.pop('relation')
-                    cfields = self.fields_get(req, ref)
+                ref = field.pop('relation')
+                record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+                if import_compat and field['type'] in ('many2one', 'many2many'):
                     if field['type'] == 'many2many':
                         record['children'] = []
-                        record['params'] = {'model': ref, 'prefix': id, 'name': nm}
-
                     elif field['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 fld in 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 = field.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', '')))
@@ -1145,8 +1130,7 @@ class Export(View):
                         cid = id + '/' + fld
                         cid = cid.replace(' ', '_')
                         children.append(cid)
-                    record['children'] = children or []
-                    record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+                    record['children'] = children
 
         records.reverse()
         return records

From 9ec96027dcc143d877006a414d4cf27859819ead Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:35:09 +0200
Subject: [PATCH 32/47] [IMP] remove redundant code

bzr revid: xmo@openerp.com-20110831123509-8xc26diq35zd5h4m
---
 addons/base/controllers/main.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index eb7d654ab74..73a28beb095 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1117,9 +1117,8 @@ class Export(View):
                 ref = field.pop('relation')
                 record['params'] = {'model': ref, 'prefix': id, 'name': nm}
                 if import_compat and field['type'] in ('many2one', 'many2many'):
-                    if field['type'] == 'many2many':
-                        record['children'] = []
-                    elif field['type'] == 'many2one':
+                    # m2m remains childless
+                    if field['type'] == 'many2one':
                         record['children'] = [id + '/id', id + '/.id']
                 else:
                     cfields = self.fields_get(req, ref)

From ef13a10a13cea1c3cafe4e0f6b620d2bb22e8e53 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:43:45 +0200
Subject: [PATCH 33/47] [FIX] import compatible as a boolean value

bzr revid: xmo@openerp.com-20110831124345-0397wtygt5aozc89
---
 addons/base/static/src/js/data_export.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 2e3614acd26..cc9dcd736c1 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -203,7 +203,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     on_show_data: function(result) {
         var self = this;
-        var imp_cmpt = parseInt(self.$element.find("#import_compat option:selected").val());
+        var imp_cmpt = Boolean(self.$element.find("#import_compat").val());
         var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
         if (current_tr.length >= 1) {
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');

From 41d3a51c82be548116b46debf3b9328e43c3e544 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 14:44:35 +0200
Subject: [PATCH 34/47] [IMP] simplify sorting of subfields by using key= param
 to list.sort. Also, listcomp for serializing

bzr revid: xmo@openerp.com-20110831124435-8hwj517bhdpzaymv
---
 addons/base/controllers/main.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 73a28beb095..581382808e3 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1121,15 +1121,13 @@ class Export(View):
                     if field['type'] == 'many2one':
                         record['children'] = [id + '/id', id + '/.id']
                 else:
-                    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 fld in cfields_order:
-                        cid = id + '/' + fld
-                        cid = cid.replace(' ', '_')
-                        children.append(cid)
-                    record['children'] = children
+                    child_fields = self.fields_get(req, ref)
+                    cfield_keys = child_fields.keys()
+                    cfield_keys.sort(key=lambda field: child_fields[field].get('string', ''), reverse=True)
+
+                    record['children'] = [
+                        (id + '/' + field_name).replace(' ', '_')
+                        for field_name in cfield_keys]
 
         records.reverse()
         return records

From 5e64318f94015276c51799e02448c16640c74e20 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 15:11:41 +0200
Subject: [PATCH 35/47] [IMP] attempt to make handling of readonly &
 states.readonly slightly clearer

bzr revid: xmo@openerp.com-20110831131141-wu0f4p6etaou3xdl
---
 addons/base/controllers/main.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 581382808e3..606179e629a 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1100,11 +1100,10 @@ class Export(View):
         records = []
         for field_name, field in fields_seq:
             if import_compat and field.get('readonly'):
-                ok = False
-                for sl in field.get('states', {}).values():
-                    for s in sl:
-                        ok = ok or (s==['readonly',False])
-                if not ok: continue
+                # If none of the field's states unsets readonly, skip the field
+                if all(dict(attrs).get('readonly', True)
+                       for attrs in field.get('states', {}).values()):
+                    continue
 
             id = prefix + (prefix and '/'or '') + field_name
             nm = name + (name and '/' or '') + field['string']

From 8df853a53501f76ccb85dea52a9e7e5b4516703f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 15:29:50 +0200
Subject: [PATCH 36/47] [IMP] fix some variable names so they're a bit less
 cryptic

bzr revid: xmo@openerp.com-20110831132950-8bhb2lktzjuztlma
---
 addons/base/controllers/main.py          | 14 +++++++-------
 addons/base/static/src/js/data_export.js |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 606179e629a..0c8a7d2f1bf 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1086,7 +1086,7 @@ class Export(View):
         return fields
 
     @openerpweb.jsonrequest
-    def get_fields(self, req, model, prefix='', name= '',
+    def get_fields(self, req, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None):
 
         fields = self.fields_get(req, model)
@@ -1094,11 +1094,11 @@ class Export(View):
             fields = {}
         fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
 
-        fields_seq = sorted(fields.iteritems(),
+        fields_sequence = sorted(fields.iteritems(),
             key=lambda field: field[1].get('string', ''), reverse=True)
 
         records = []
-        for field_name, field in fields_seq:
+        for field_name, field in fields_sequence:
             if import_compat and field.get('readonly'):
                 # If none of the field's states unsets readonly, skip the field
                 if all(dict(attrs).get('readonly', True)
@@ -1106,15 +1106,15 @@ class Export(View):
                     continue
 
             id = prefix + (prefix and '/'or '') + field_name
-            nm = name + (name and '/' or '') + field['string']
-            record = {'id': id, 'string': nm, 'children': [],
+            name = parent_name + (parent_name and '/' or '') + field['string']
+            record = {'id': id, 'string': name, 'children': [],
                       'field_type': field.get('type'),
                       'required': field.get('required')}
             records.append(record)
 
-            if len(nm.split('/')) < 3 and 'relation' in field:
+            if len(name.split('/')) < 3 and 'relation' in field:
                 ref = field.pop('relation')
-                record['params'] = {'model': ref, 'prefix': id, 'name': nm}
+                record['params'] = {'model': ref, 'prefix': id, 'name': name}
                 if import_compat and field['type'] in ('many2one', 'many2many'):
                     # m2m remains childless
                     if field['type'] == 'many2one':
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index cc9dcd736c1..00346fada29 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -185,7 +185,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                             self.rpc("/base/export/get_fields", {
                                 model: model,
                                 prefix: prefix,
-                                name: name,
+                                parent_name: name,
                                 import_compat: Boolean(import_comp),
                                 parent_field_type : record['field_type']
                             }, function(results) {

From e04f42d2c4cc3469524b936af5c9f1154be4a2b6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 15:34:10 +0200
Subject: [PATCH 37/47] [IMP] remove double-reversing of fields in get_fields

bzr revid: xmo@openerp.com-20110831133410-nsmwg7orh396rlbp
---
 addons/base/controllers/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 0c8a7d2f1bf..d796ce515ae 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1095,7 +1095,7 @@ class Export(View):
         fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
 
         fields_sequence = sorted(fields.iteritems(),
-            key=lambda field: field[1].get('string', ''), reverse=True)
+            key=lambda field: field[1].get('string', ''))
 
         records = []
         for field_name, field in fields_sequence:
@@ -1128,7 +1128,6 @@ class Export(View):
                         (id + '/' + field_name).replace(' ', '_')
                         for field_name in cfield_keys]
 
-        records.reverse()
         return records
 
     @openerpweb.jsonrequest

From 2a63d1d635b60f1fbd7ed4ecf5ddb14306a21d36 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 16:03:05 +0200
Subject: [PATCH 38/47] [IMP] simplify handling of a field's subfields display
 in the export tree field

bzr revid: xmo@openerp.com-20110831140305-slj3719lkc0aoofc
---
 addons/base/controllers/main.py          |  12 +--
 addons/base/static/src/js/data_export.js | 107 ++++++++++-------------
 addons/base/static/src/xml/base.xml      |   2 +-
 3 files changed, 52 insertions(+), 69 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index d796ce515ae..172b1a58ef3 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1107,7 +1107,7 @@ class Export(View):
 
             id = prefix + (prefix and '/'or '') + field_name
             name = parent_name + (parent_name and '/' or '') + field['string']
-            record = {'id': id, 'string': name, 'children': [],
+            record = {'id': id, 'string': name, 'children': False,
                       'field_type': field.get('type'),
                       'required': field.get('required')}
             records.append(record)
@@ -1118,15 +1118,9 @@ class Export(View):
                 if import_compat and field['type'] in ('many2one', 'many2many'):
                     # m2m remains childless
                     if field['type'] == 'many2one':
-                        record['children'] = [id + '/id', id + '/.id']
+                        record['children'] = True
                 else:
-                    child_fields = self.fields_get(req, ref)
-                    cfield_keys = child_fields.keys()
-                    cfield_keys.sort(key=lambda field: child_fields[field].get('string', ''), reverse=True)
-
-                    record['children'] = [
-                        (id + '/' + field_name).replace(' ', '_')
-                        for field_name in cfield_keys]
+                    record['children'] = bool(self.fields_get(req, ref))
 
         return records
 
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 00346fada29..9df7097914b 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -160,52 +160,38 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         this.on_show_save_list();
         this.$element.find("#fields_list option").remove();
     },
-    on_click: function(id, result) {
+    on_click: function(id, record) {
         var self = this;
         self.field_id = id.split("-")[1];
-        var is_loaded = 0;
-        _.each(result, function(record) {
-            if (record['id'] == self.field_id && (record['children']).length >= 1) {
-                var model = record['params']['model'],
-                    prefix = record['params']['prefix'],
-                    name = record['params']['name'];
-                $(record['children']).each(function(e, childid) {
-                    if (self.$element.find("tr[id='treerow-" + childid + "']").length > 0) {
-                        if (self.$element.find("tr[id='treerow-" + childid + "']").is(':hidden')) {
-                            is_loaded = -1;
-                        } else {
-                            is_loaded++;
-                        }
-                    }
-                });
-                if (is_loaded == 0) {
-                    if (self.$element.find("tr[id='treerow-" + self.field_id +"']").find('img').attr('src') === '/base/static/src/img/expand.gif') {
-                        if (model) {
-                            var import_comp = self.$element.find("#import_compat").val();
-                            self.rpc("/base/export/get_fields", {
-                                model: model,
-                                prefix: prefix,
-                                parent_name: name,
-                                import_compat: Boolean(import_comp),
-                                parent_field_type : record['field_type']
-                            }, function(results) {
-                                self.on_show_data(results);
-                            });
-                        }
-                    }
-                } else if (is_loaded > 0) {
-                    self.showcontent(self.field_id, true);
-                } else {
-                    self.showcontent(self.field_id, false);
-                }
-            }
-        });
+        if (!record['children']) {
+            return;
+        }
+        var model = record['params']['model'],
+            prefix = record['params']['prefix'],
+            name = record['params']['name'];
+
+        if (!record.loaded) {
+            var import_comp = self.$element.find("#import_compat").val();
+            self.rpc("/base/export/get_fields", {
+                model: model,
+                prefix: prefix,
+                parent_name: name,
+                import_compat: Boolean(import_comp),
+                parent_field_type : record['field_type']
+            }, function(results) {
+                record.loaded = true;
+                self.on_show_data(results);
+            });
+        } else {
+            self.showcontent(self.field_id);
+        }
     },
     on_show_data: function(result) {
         var self = this;
         var imp_cmpt = Boolean(self.$element.find("#import_compat").val());
         var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
         if (current_tr.length >= 1) {
+            current_tr.addClass('open');
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
         } else {
@@ -221,7 +207,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 required_fld.addClass("oe_export_requiredfield");
             }
             self.$element.find("img[id='parentimg-" + record.id +"']").click(function() {
-                self.on_click(this.id, result);
+                self.on_click(this.id, record);
             });
 
             self.$element.find("tr[id='treerow-" + record.id + "']").click(function(e) {
@@ -277,8 +263,13 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 var arrow = {left: 37, up: 38, right: 39, down: 40 };
                 switch (keyCode) {
                     case arrow.left:
-                        if ($(this).find('img').attr('src') === '/base/static/src/img/collapse.gif') {
-                            self.on_click(this.id, result);
+                        if ($(this).hasClass('open')) {
+                            self.on_click(this.id, record);
+                        }
+                        break;
+                    case arrow.right:
+                        if (!$(this).hasClass('open')) {
+                            self.on_click(this.id, record);
                         }
                         break;
                     case arrow.up:
@@ -292,11 +283,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                         }
                         $(elem).prev().find('a').focus();
                         break;
-                    case arrow.right:
-                        if ($(this).find('img').attr('src') == '/base/static/src/img/expand.gif') {
-                            self.on_click(this.id, result);
-                        }
-                        break;
                     case arrow.down:
                         var elem = this;
                         $(elem).removeClass("ui-selected");
@@ -333,27 +319,30 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             }
         });
     },
-    showcontent: function(id, flag) {
+    showcontent: function(id) {
         // show & hide the contents
-        var first_child = this.$element.find("tr[id='treerow-" + id + "']").find('img');
-        if (flag) {
+        var $this = this.$element.find("tr[id='treerow-" + id + "']");
+        var is_open = $this.hasClass('open');
+        $this.toggleClass('open');
+
+        var first_child = $this.find('img');
+        if (is_open) {
             first_child.attr('src', '/base/static/src/img/expand.gif');
-        }
-        else {
+        } else {
             first_child.attr('src', '/base/static/src/img/collapse.gif');
         }
         var child_field = this.$element.find("tr[id^='treerow-" + id +"/']");
         var child_len = (id.split("/")).length + 1;
         for (var i = 0; i < child_field.length; i++) {
-            if (flag) {
-                $(child_field[i]).hide();
-            } else {
-                if (child_len == (child_field[i].id.split("/")).length) {
-                    if ($(child_field[i]).find('img').attr('src') == '/base/static/src/img/collapse.gif') {
-                        $(child_field[i]).find('img').attr('src', '/base/static/src/img/expand.gif');
-                    }
-                    $(child_field[i]).show();
+            var $child = $(child_field[i]);
+            if (is_open) {
+                $child.hide();
+            } else if (child_len == (child_field[i].id.split("/")).length) {
+                if ($child.hasClass('open')) {
+                    $child.removeClass('open');
+                    $child.find('img').attr('src', '/base/static/src/img/expand.gif');
                 }
+                $child.show();
             }
         }
     },
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index b25c85d4874..76336f447d0 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -1287,7 +1287,7 @@
                     </t>
                 </t>
                 <td valign="top" align="left" style="cursor: pointer;" width="18">
-                    <t t-if="(field.children).length >= 1">
+                    <t t-if="field.children">
                         <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>

From bc92fa4ef5a9643579d500b87b528249f9421dc4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 16:04:02 +0200
Subject: [PATCH 39/47] [IMP] don't fetch an m2o's subfields in import compat
 (we're just discarding them anyway, it's a waste of time)

bzr revid: xmo@openerp.com-20110831140402-9gs2m3nbt5tisv4x
---
 addons/base/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 172b1a58ef3..9d215cb2f82 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1089,9 +1089,11 @@ class Export(View):
     def get_fields(self, req, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None):
 
-        fields = self.fields_get(req, model)
+
         if import_compat and parent_field_type == "many2one":
             fields = {}
+        else:
+            fields = self.fields_get(req, model)
         fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
 
         fields_sequence = sorted(fields.iteritems(),

From b92e3792cf68b4aaac5651e9e6d82072cdc9fdf4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 16:30:02 +0200
Subject: [PATCH 40/47] [IMP] stop performing useless fields_get requests for
 every relational field of a model

bzr revid: xmo@openerp.com-20110831143002-dvsxq6aaf7dk04i1
---
 addons/base/controllers/main.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 9d215cb2f82..e18abc56d1e 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1117,12 +1117,10 @@ class Export(View):
             if len(name.split('/')) < 3 and 'relation' in field:
                 ref = field.pop('relation')
                 record['params'] = {'model': ref, 'prefix': id, 'name': name}
-                if import_compat and field['type'] in ('many2one', 'many2many'):
-                    # m2m remains childless
-                    if field['type'] == 'many2one':
-                        record['children'] = True
-                else:
-                    record['children'] = bool(self.fields_get(req, ref))
+
+                if not (import_compat and field['type'] == 'many2many'):
+                    # m2m field in import_compat is childless
+                    record['children'] = True
 
         return records
 

From 36182e95800871d34b9e1d14ea22d61883a9c29a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 31 Aug 2011 16:49:48 +0200
Subject: [PATCH 41/47] [IMP] remove insanity

bzr revid: xmo@openerp.com-20110831144948-rlrj1ib9xxho9ea5
---
 addons/base/static/src/js/data_export.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 9df7097914b..0a89b996de3 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -162,7 +162,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     on_click: function(id, record) {
         var self = this;
-        self.field_id = id.split("-")[1];
         if (!record['children']) {
             return;
         }
@@ -180,17 +179,18 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
                 parent_field_type : record['field_type']
             }, function(results) {
                 record.loaded = true;
-                self.on_show_data(results);
+                self.on_show_data(results, record.id);
             });
         } else {
-            self.showcontent(self.field_id);
+            self.showcontent(record.id);
         }
     },
-    on_show_data: function(result) {
+    on_show_data: function(result, after) {
         var self = this;
         var imp_cmpt = Boolean(self.$element.find("#import_compat").val());
-        var current_tr = self.$element.find("tr[id='treerow-" + self.field_id + "']");
-        if (current_tr.length >= 1) {
+
+        if (after) {
+            var current_tr = self.$element.find("tr[id='treerow-" + after + "']");
             current_tr.addClass('open');
             current_tr.find('img').attr('src','/base/static/src/img/collapse.gif');
             current_tr.after(QWeb.render('ExportTreeView-Secondary.children', {'fields': result}));
@@ -299,10 +299,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             self.$element.find("tr[id='treerow-" + record.id + "']").dblclick(function() {
                 var $o2m_selection = self.$element.find("tr[id^='treerow-" + record.id + "']").find('#tree-column');
                 if (!$o2m_selection.hasClass("oe_export_readonlyfield")) {
-                    var field_id = $(this).find("a").attr("id");
-                    if (field_id) {
-                       self.add_field(field_id.split('-')[1], $(this).find("a").attr("string"));
-                   }
+                   self.add_field(record.id, $(this).find("a").attr("string"));
                 }
             });
         });
@@ -348,7 +345,8 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     add_field: function(field_id, string) {
         var field_list = this.$element.find('#fields_list');
-        if (this.$element.find("#fields_list option[value='" + field_id + "']") && !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
+        if (this.$element.find("#fields_list option[value='" + field_id + "']")
+                && !this.$element.find("#fields_list option[value='" + field_id + "']").length) {
             field_list.append(new Option(string, field_id));
         }
     },

From 003d85bc8a8250e53d95bb40e0094c88ceb019f2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Sep 2011 08:42:59 +0200
Subject: [PATCH 42/47] [IMP] in export, selecting name yields the xml/external
 id

bzr revid: xmo@openerp.com-20110901064259-7j4z0upta98f6sqj
---
 addons/base/controllers/main.py          | 8 +++++---
 addons/base/static/src/js/data_export.js | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index e18abc56d1e..a833250829c 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1094,7 +1094,7 @@ class Export(View):
             fields = {}
         else:
             fields = self.fields_get(req, model)
-        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+        fields.update({'.id': {'string': 'ID'}})
 
         fields_sequence = sorted(fields.iteritems(),
             key=lambda field: field[1].get('string', ''))
@@ -1109,16 +1109,18 @@ class Export(View):
 
             id = prefix + (prefix and '/'or '') + field_name
             name = parent_name + (parent_name and '/' or '') + field['string']
-            record = {'id': id, 'string': name, 'children': False,
+            record = {'id': id, 'string': name,
+                      'value': id, 'children': False,
                       'field_type': field.get('type'),
                       'required': field.get('required')}
             records.append(record)
 
             if len(name.split('/')) < 3 and 'relation' in field:
                 ref = field.pop('relation')
+                record['value'] += '/id'
                 record['params'] = {'model': ref, 'prefix': id, 'name': name}
 
-                if not (import_compat and field['type'] == 'many2many'):
+                if not import_compat or field['type'] == 'one2many':
                     # m2m field in import_compat is childless
                     record['children'] = True
 
diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 0a89b996de3..63f7af20cd7 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -4,6 +4,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     dialog_title: 'Export Data',
     init: function(parent, dataset) {
         this._super(parent);
+        this.records = {};
         this.dataset = dataset;
         this.exports = new openerp.base.DataSetSearch(
             this, 'ir.exports', this.dataset.get_context());
@@ -198,6 +199,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             self.$element.find('#left_field_panel').append(QWeb.render('ExportTreeView-Secondary', {'fields': result}));
         }
         _.each(result, function(record) {
+            self.records[record.id] = record.value;
             if ((record.field_type == "one2many") && imp_cmpt) {
                 var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 o2m_fld.addClass("oe_export_readonlyfield");
@@ -362,9 +364,10 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
     },
     on_click_export_data: function() {
         $.blockUI(this.$element);
-        var exported_fields = [];
+        var exported_fields = [], self = this;
         this.$element.find("#fields_list option").each(function() {
-            exported_fields.push({name: $(this).val(), label: $(this).text()});
+            var fieldname = self.records[$(this).val()];
+            exported_fields.push({name: fieldname, label: $(this).text()});
         });
         if (_.isEmpty(exported_fields)) {
             alert('Please select fields to export...');

From 8abad264e5117a5f85da9572419f96c5abb2c380 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Sep 2011 08:47:13 +0200
Subject: [PATCH 43/47] [IMP] make o2m names selectable in import compatible
 mode

bzr revid: xmo@openerp.com-20110901064713-4cegd1chemwbvtso
---
 addons/base/static/src/js/data_export.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 63f7af20cd7..763e37c0334 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -200,10 +200,6 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
         }
         _.each(result, function(record) {
             self.records[record.id] = record.value;
-            if ((record.field_type == "one2many") && imp_cmpt) {
-                var o2m_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
-                o2m_fld.addClass("oe_export_readonlyfield");
-            }
             if (record.required) {
                 var required_fld = self.$element.find("tr[id='treerow-" + record.id + "']").find('#tree-column');
                 required_fld.addClass("oe_export_requiredfield");

From e5400290f41bcedf66ce9ecfbe234c49d81f16c5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Sep 2011 08:53:54 +0200
Subject: [PATCH 44/47] [IMP] always export the current record's external ID as
 first field

bzr revid: xmo@openerp.com-20110901065354-voczdshato8oizmr
---
 addons/base/static/src/js/data_export.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/js/data_export.js b/addons/base/static/src/js/data_export.js
index 763e37c0334..1c8cf1422d0 100644
--- a/addons/base/static/src/js/data_export.js
+++ b/addons/base/static/src/js/data_export.js
@@ -370,6 +370,7 @@ openerp.base.DataExport = openerp.base.Dialog.extend({
             return;
         }
 
+        exported_fields.unshift({name: 'id', label: 'External ID'});
         var export_format = this.$element.find("#export_format").val();
         this.session.get_file({
             url: '/base/export/' + export_format,

From 082860e1086ab5e1d634abd31dc2504631754030 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 1 Sep 2011 09:08:25 +0200
Subject: [PATCH 45/47] [FIX] issue with duplicate ID field for database id

bzr revid: xmo@openerp.com-20110901070825-xunwaqfo0h98mqrq
---
 addons/base/controllers/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index a833250829c..f650fe3eb47 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1089,12 +1089,11 @@ class Export(View):
     def get_fields(self, req, model, prefix='', parent_name= '',
                    import_compat=True, parent_field_type=None):
 
-
         if import_compat and parent_field_type == "many2one":
             fields = {}
         else:
             fields = self.fields_get(req, model)
-        fields.update({'.id': {'string': 'ID'}})
+        fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'}
 
         fields_sequence = sorted(fields.iteritems(),
             key=lambda field: field[1].get('string', ''))

From 9e2b4229637713d45dfc46aa61a04dcb99df6f3f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Sep 2011 11:38:37 +0200
Subject: [PATCH 46/47] [IMP] cleanup namelist code a bit

bzr revid: xmo@openerp.com-20110905093837-e2v5ebbjsmpat6tf
---
 addons/base/controllers/main.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index c015adda052..781206f1d3c 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1140,17 +1140,15 @@ class Export(View):
 
     @openerpweb.jsonrequest
     def namelist(self,req,  model, export_id):
+        export = req.session.model("ir.exports").read([export_id])[0]
+        export_fields_list = req.session.model("ir.exports.line").read(
+            export['export_fields'])
 
-        result = self.get_data(req, model)
-        ir_export_obj = req.session.model("ir.exports")
-        ir_export_line_obj = req.session.model("ir.exports.line")
+        fields_data = self.get_data(req, model)
 
-        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
+        return dict(
+            (field['name'], fields_data[field['name']])
+            for field in export_fields_list)
 
     def get_data(self, req, model):
         fields_data = {}

From f7e3e5a75f2b1a16057079268fdff33299f57ac8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 5 Sep 2011 15:05:38 +0200
Subject: [PATCH 47/47] [IMP] massive rewrite of the namelist export call, same
 interface, 20~40fold increase in speed for shorter lists

bzr revid: xmo@openerp.com-20110905130538-3pqkz9s0nrs0ulz0
---
 addons/base/controllers/main.py | 75 +++++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 781206f1d3c..6a46e9372a4 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -3,6 +3,7 @@
 import base64
 import csv
 import glob
+import itertools
 import operator
 import os
 import re
@@ -1140,41 +1141,71 @@ class Export(View):
 
     @openerpweb.jsonrequest
     def namelist(self,req,  model, export_id):
+        # TODO: namelist really has no reason to be in Python (although itertools.groupby helps)
         export = req.session.model("ir.exports").read([export_id])[0]
         export_fields_list = req.session.model("ir.exports.line").read(
             export['export_fields'])
 
-        fields_data = self.get_data(req, model)
+        fields_data = self.fields_info(
+            req, model, map(operator.itemgetter('name'), export_fields_list))
 
         return dict(
             (field['name'], fields_data[field['name']])
             for field in export_fields_list)
 
-    def get_data(self, req, model):
-        fields_data = {}
+    def fields_info(self, req, model, export_fields):
+        info = {}
         fields = self.fields_get(req, model)
+        fields['.id'] = fields.pop('id') if 'id' in fields else {'string': 'ID'}
 
-        fields.update({'id': {'string': 'ID'}, '.id': {'string': 'Database ID'}})
+        # To make fields retrieval more efficient, fetch all sub-fields of a
+        # given field at the same time. Because the order in the export list is
+        # arbitrary, this requires ordering all sub-fields of a given field
+        # together so they can be fetched at the same time
+        #
+        # Works the following way:
+        # * sort the list of fields to export, the default sorting order will
+        #   put the field itself (if present, for xmlid) and all of its
+        #   sub-fields right after it
+        # * then, group on: the first field of the path (which is the same for
+        #   a field and for its subfields and the length of splitting on the
+        #   first '/', which basically means grouping the field on one side and
+        #   all of the subfields on the other. This way, we have the field (for
+        #   the xmlid) with length 1, and all of the subfields with the same
+        #   base but a length "flag" of 2
+        # * if we have a normal field (length 1), just add it to the info
+        #   mapping (with its string) as-is
+        # * otherwise, recursively call fields_info via graft_subfields.
+        #   all graft_subfields does is take the result of fields_info (on the
+        #   field's model) and prepend the current base (current field), which
+        #   rebuilds the whole sub-tree for the field
+        #
+        # result: because we're not fetching the fields_get for half the
+        # database models, fetching a namelist with a dozen fields (including
+        # relational data) falls from ~6s to ~300ms (on the leads model).
+        # export lists with no sub-fields (e.g. import_compatible lists with
+        # no o2m) are even more efficient (from the same 6s to ~170ms, as
+        # there's a single fields_get to execute)
+        for (base, length), subfields in itertools.groupby(
+                sorted(export_fields),
+                lambda field: (field.split('/', 1)[0], len(field.split('/', 1)))):
+            subfields = list(subfields)
+            if length == 2:
+                # subfields is a seq of $base/*rest, and not loaded yet
+                info.update(self.graft_subfields(
+                    req, fields[base]['relation'], base, fields[base]['string'],
+                    subfields
+                ))
+            else:
+                info[base] = fields[base]['string']
 
-        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', '')))
+        return info
 
-                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)
+    def graft_subfields(self, req, model, prefix, prefix_string, fields):
+        export_fields = [field.split('/', 1)[1] for field in fields]
+        return (
+            (prefix + '/' + k, prefix_string + '/' + v)
+            for k, v in self.fields_info(req, model, export_fields).iteritems())
 
     #noinspection PyPropertyDefinition
     @property