[MIG] Use safe_eval wrapped time module. Fix deprecation warnings.

Co-authored-by: Alexis de Lattre <alexis.delattre@akretion.com>
This commit is contained in:
Elmeri Niemelä
2021-02-02 08:14:54 +02:00
parent ec4a6ad6ec
commit c2db522568
4 changed files with 7 additions and 7 deletions

View File

@@ -2,12 +2,11 @@
# Copyright 2018 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import logging
import time
from odoo import _, api, fields, models
from odoo.exceptions import ValidationError
from odoo.tools.misc import find_in_path
from odoo.tools.safe_eval import safe_eval
from odoo.tools.safe_eval import safe_eval, time
logger = logging.getLogger(__name__)
@@ -180,7 +179,7 @@ class IrActionsReport(models.Model):
report = self.get_from_report_name(self.report_name, self.report_type)
if report.print_report_name and not len(res_ids) > 1:
obj = self.env[self.model].browse(res_ids)
return safe_eval(report.print_report_name, {"object": obj,})
return safe_eval(report.print_report_name, {"object": obj, "time": time})
return "{}.{}".format(self.name, self.py3o_filetype)
def _get_attachments(self, res_ids):

View File

@@ -279,7 +279,7 @@ class Py3oReport(models.TransientModel):
self.ensure_one()
attachment = existing_reports_attachment.get(model_instance.id)
if attachment and self.ir_actions_report_id.attachment_use:
content = base64.decodestring(attachment.datas)
content = base64.b64decode(attachment.datas)
report_file = tempfile.mktemp("." + self.ir_actions_report_id.py3o_filetype)
with open(report_file, "wb") as f:
f.write(content)