[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 3903 revid:dle@openerp.com-20140221120519-1pj3wc8kqgkr5uda

bzr revid: dle@openerp.com-20140221120632-dn3ll7yrjkax17q5
2014-02-21 13:06:32 +01:00
parent 67866db5b6 acb010a985
commit e84aaa7d74
1 changed files with 2 additions and 2 deletions
@@ -1596,8 +1596,8 @@ class Export(http.Controller):
            model, map(operator.itemgetter('name'), export_fields_list))

        return [
-            {'name': field_name, 'label': fields_data[field_name]}
-            for field_name in fields_data.keys()
+            {'name': field['name'], 'label': fields_data[field['name']]}
+            for field in export_fields_list
        ]

    def fields_info(self, model, export_fields):