From 460238e6b7fd0bdea0579b9eba362ae4d9a4e978 Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com>
Date: Wed, 21 Aug 2019 13:57:13 +0200
Subject: [PATCH] Adapt module sql_export_mail to be compatible with multiple
 file format

---
 sql_export/wizard/wizard_file.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sql_export/wizard/wizard_file.py b/sql_export/wizard/wizard_file.py
index 25031b2f7..c62b9041f 100644
--- a/sql_export/wizard/wizard_file.py
+++ b/sql_export/wizard/wizard_file.py
@@ -69,9 +69,13 @@ class SqlFileWizard(models.TransientModel):
                 else:
                     variable_dict[field.name] = self[field.name]
         if "%(company_id)s" in sql_export.query:
-            variable_dict['company_id'] = self.env.user.company_id.id
+            company_id = self.env.context.get(
+                'force_company', self.env.user.company_id.id)
+            variable_dict['company_id'] = company_id
         if "%(user_id)s" in sql_export.query:
-            variable_dict['user_id'] = self.env.uid
+            user_id = self.env.context.get(
+                'force_user', self._uid)
+            variable_dict['user_id'] = user_id
 
         # Execute Request
         res = sql_export._execute_sql_request(