From 5ba61cb127764edb2143986740832caa4496fb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Roche?= Date: Wed, 17 Feb 2021 13:50:17 +0100 Subject: [PATCH] [MIG] account_export_csv: Migration to 14.0 --- account_export_csv/__manifest__.py | 4 +++- .../security/.~lock.ir.model.access.csv# | 1 + .../security/ir.model.access.csv | 2 ++ .../tests/test_account_export_csv.py | 2 +- .../wizard/account_export_csv.py | 22 +++++++++---------- 5 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 account_export_csv/security/.~lock.ir.model.access.csv# create mode 100644 account_export_csv/security/ir.model.access.csv diff --git a/account_export_csv/__manifest__.py b/account_export_csv/__manifest__.py index 4f939c0c..dd3dcdc7 100644 --- a/account_export_csv/__manifest__.py +++ b/account_export_csv/__manifest__.py @@ -1,11 +1,12 @@ # Copyright 2013 Camptocamp SA # Copyright 2017 ACSONE SA/NV +# Copyright 2017 Akretion # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Account Export CSV", "summary": "Adds accounting CSV export", - "version": "12.0.1.2.0", + "version": "14.0.0.0.1", "depends": [ "account", "date_range", @@ -14,6 +15,7 @@ "website": "https://github.com/OCA/account-financial-reporting", "license": "AGPL-3", "data": [ + "security/ir.model.access.csv", "wizard/account_export_csv_view.xml", ], "installable": True, diff --git a/account_export_csv/security/.~lock.ir.model.access.csv# b/account_export_csv/security/.~lock.ir.model.access.csv# new file mode 100644 index 00000000..24dcf947 --- /dev/null +++ b/account_export_csv/security/.~lock.ir.model.access.csv# @@ -0,0 +1 @@ +Kévin Roche,kevin,kevin-Ubuntu-7B16,12.02.2021 22:22,file:///home/kevin/.config/libreoffice/4; \ No newline at end of file diff --git a/account_export_csv/security/ir.model.access.csv b/account_export_csv/security/ir.model.access.csv new file mode 100644 index 00000000..f56a01d0 --- /dev/null +++ b/account_export_csv/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_account_csv_export,access_account_csv_export,model_account_csv_export,base.group_user,1,1,1,1 diff --git a/account_export_csv/tests/test_account_export_csv.py b/account_export_csv/tests/test_account_export_csv.py index 77f885a0..26338c83 100644 --- a/account_export_csv/tests/test_account_export_csv.py +++ b/account_export_csv/tests/test_account_export_csv.py @@ -45,7 +45,7 @@ class TestAccountExportCsv(TransactionCase): } ) report_wizard.action_manual_export_journal_entries() - res = base64.decodestring(report_wizard.data) + res = base64.decodebytes(report_wizard.data) line_number = self.env["account.move.line"].search_count([]) # check the number of lines in file: include header + EOF line self.assertEqual(len(res.decode().split("\r\n")), line_number + 2) diff --git a/account_export_csv/wizard/account_export_csv.py b/account_export_csv/wizard/account_export_csv.py index 57c7da2a..a3b7d94f 100644 --- a/account_export_csv/wizard/account_export_csv.py +++ b/account_export_csv/wizard/account_export_csv.py @@ -106,7 +106,7 @@ class AccountCSVExport(models.TransientModel): writer = AccountingWriter(file_data) writer.writerows(rows) file_value = file_data.getvalue() - self.write({"data": base64.encodestring(file_value)}) + self.write({"data": base64.encodebytes(file_value)}) finally: file_data.close() return { @@ -162,7 +162,7 @@ class AccountCSVExport(models.TransientModel): writer = AccountingWriter(file_data) writer.writerows(rows) file_value = file_data.getvalue() - self.write({"data": base64.encodestring(file_value)}) + self.write({"data": base64.encodebytes(file_value)}) finally: file_data.close() return { @@ -223,17 +223,14 @@ class AccountCSVExport(models.TransientModel): Memory We also write the data to the wizard with SQL query as write seems to use too much memory as well. - Those improvements permitted to improve the export from a 100k line to 200k lines with default `limit_memory_hard = 805306368` (768MB) with more lines, you might encounter a MemoryError when trying to download the file even if it has been generated. - To be able to export bigger volume of data, it is advised to set limit_memory_hard to 2097152000 (2 GB) to generate the file and let Odoo load it in the wizard when trying to download it. - Tested with up to a generation of 700k entry lines """ self.ensure_one() @@ -245,13 +242,14 @@ class AccountCSVExport(models.TransientModel): file_data.seek(0) base64.encode(file_data, base64_data) base64_data.seek(0) - self.env.cr.execute( - """ - UPDATE account_csv_export - SET data = %s - WHERE id = %s""", - (base64_data.read(), self.id), - ) + self.write({"data": base64_data.read()}) + # self.env.cr.execute( + # """ + # UPDATE account_csv_export + # SET data = %s + # WHERE id = %s""", + # (base64_data.read(), self.id), + # ) return { "type": "ir.actions.act_window", "res_model": "account.csv.export",