From 92d2c59751484ec434b9db15add8a673fa6a3843 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <mchambreuil@ursainfosystems.com>
Date: Fri, 9 Sep 2016 09:16:12 -0500
Subject: [PATCH] [FIX] Conflicts

---
 base_export_manager/static/src/js/base_export_manager.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/base_export_manager/static/src/js/base_export_manager.js b/base_export_manager/static/src/js/base_export_manager.js
index e48fd4f4c..a5a642e9b 100644
--- a/base_export_manager/static/src/js/base_export_manager.js
+++ b/base_export_manager/static/src/js/base_export_manager.js
@@ -13,6 +13,7 @@ odoo.define('base_export_manager.base_export_manager', function(require) {
     var Sidebar = require('web.Sidebar');
     var _t = core._t;
     var Session = require('web.Session');
+    var session = require('web.session');
 
 
     DataExport.include({
@@ -39,7 +40,7 @@ odoo.define('base_export_manager.base_export_manager', function(require) {
                 return $.when().resolve(false);
             }
             var Users = new Model('res.users');
-            var export_models = Users.call('get_export_models', []);
+            var export_models = Users.call('fetch_export_models', []);
             return export_models;
         },
     });
@@ -51,7 +52,7 @@ odoo.define('base_export_manager.base_export_manager', function(require) {
         },
         is_export_manager: function () {
             var self = this;
-            $.when(Session.get_export_models()).then(function
+            $.when(self.session.get_export_models()).then(function
             (export_models) {
                 self.export_models=export_models;
             });