From 0c71369303ea22b76abd81f68bfde4fe9755d2a5 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 12 Nov 2021 16:55:55 +0100 Subject: [PATCH] [14.0][MIG] printer_zpl2 --- printer_zpl2/__manifest__.py | 2 +- printer_zpl2/models/printing_label_zpl2.py | 23 +++++++++++++++++----- printer_zpl2/readme/CONTRIBUTORS.rst | 1 + printer_zpl2/security/ir.model.access.csv | 10 ++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/printer_zpl2/__manifest__.py b/printer_zpl2/__manifest__.py index 6eb910e..7d3d916 100644 --- a/printer_zpl2/__manifest__.py +++ b/printer_zpl2/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Printer ZPL II", - "version": "13.0.1.0.1", + "version": "14.0.1.0.0", "category": "Printer", "summary": "Add a ZPL II label printing feature", "author": "SUBTENO-IT, FLorent de Labarre, " diff --git a/printer_zpl2/models/printing_label_zpl2.py b/printer_zpl2/models/printing_label_zpl2.py index 92ecd3a..dfd860a 100644 --- a/printer_zpl2/models/printing_label_zpl2.py +++ b/printer_zpl2/models/printing_label_zpl2.py @@ -2,11 +2,9 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import base64 -import datetime import io import itertools import logging -import time from collections import defaultdict import requests @@ -14,7 +12,7 @@ from PIL import Image, ImageOps from odoo import _, api, exceptions, fields, models from odoo.exceptions import ValidationError -from odoo.tools.safe_eval import safe_eval +from odoo.tools.safe_eval import safe_eval, wrap_module _logger = logging.getLogger(__name__) @@ -36,6 +34,7 @@ class PrintingLabelZpl2(models.Model): comodel_name="ir.model", string="Model", required=True, + ondelete="cascade", help="Model used to print this label.", ) origin_x = fields.Integer( @@ -149,8 +148,22 @@ class PrintingLabelZpl2(models.Model): "object": record, "page_number": str(page_number + 1), "page_count": str(page_count), - "time": time, - "datetime": datetime, + "time": wrap_module( + __import__("time"), ["time", "strptime", "strftime"] + ), + "datetime": wrap_module( + __import__("datetime"), + [ + "date", + "datetime", + "time", + "timedelta", + "timezone", + "tzinfo", + "MAXYEAR", + "MINYEAR", + ], + ), } ) data = self._get_component_data(record, component, eval_args) diff --git a/printer_zpl2/readme/CONTRIBUTORS.rst b/printer_zpl2/readme/CONTRIBUTORS.rst index aac53d8..8c9e753 100644 --- a/printer_zpl2/readme/CONTRIBUTORS.rst +++ b/printer_zpl2/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Jos De Graeve * Rod Schouteden * Miquel Raïch +* Lois Rilo diff --git a/printer_zpl2/security/ir.model.access.csv b/printer_zpl2/security/ir.model.access.csv index acd4271..74d17c1 100644 --- a/printer_zpl2/security/ir.model.access.csv +++ b/printer_zpl2/security/ir.model.access.csv @@ -1,5 +1,7 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"printing_label_zpl2_user","Printing Label ZPL2 User","model_printing_label_zpl2","base_report_to_printer.printing_group_user",1,0,0,0 -"printing_label_zpl2_manager","Printing Label ZPL2 Manager","model_printing_label_zpl2","base_report_to_printer.printing_group_manager",1,1,1,1 -"printing_label_zpl2_component_user","Printing Label ZPL2 Component User","model_printing_label_zpl2_component","base_report_to_printer.printing_group_user",1,0,0,0 -"printing_label_zpl2_component_manager","Printing Label ZPL2 Component Manager","model_printing_label_zpl2_component","base_report_to_printer.printing_group_manager",1,1,1,1 +printing_label_zpl2_user,Printing Label ZPL2 User,model_printing_label_zpl2,base_report_to_printer.printing_group_user,1,0,0,0 +printing_label_zpl2_manager,Printing Label ZPL2 Manager,model_printing_label_zpl2,base_report_to_printer.printing_group_manager,1,1,1,1 +printing_label_zpl2_component_user,Printing Label ZPL2 Component User,model_printing_label_zpl2_component,base_report_to_printer.printing_group_user,1,0,0,0 +printing_label_zpl2_component_manager,Printing Label ZPL2 Component Manager,model_printing_label_zpl2_component,base_report_to_printer.printing_group_manager,1,1,1,1 +access_wizard_print_record_label_user,Print Record Label user,model_wizard_print_record_label,base_report_to_printer.printing_group_user,1,1,1,1 +access_wizard_import_zpl2_user,Import ZPL2 user,model_wizard_import_zpl2,base_report_to_printer.printing_group_user,1,1,1,1