From 831c5ff9b2ab51bef1ec09c5d2f88ec5d04ae9bb Mon Sep 17 00:00:00 2001 From: Jaime Arroyo Date: Tue, 29 Sep 2020 12:45:51 +0200 Subject: [PATCH] [IMP] base_report_to_printer_mail: black, isort, prettier --- base_report_to_printer_mail/__manifest__.py | 24 ++-- .../models/mail_template.py | 6 +- .../tests/test_mail.py | 118 +++++++++--------- 3 files changed, 75 insertions(+), 73 deletions(-) diff --git a/base_report_to_printer_mail/__manifest__.py b/base_report_to_printer_mail/__manifest__.py index 0ee0fc3..356d88e 100644 --- a/base_report_to_printer_mail/__manifest__.py +++ b/base_report_to_printer_mail/__manifest__.py @@ -1,18 +1,14 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': "Report to printer - Mail extension", - 'version': '12.0.1.0.0', - 'category': 'Generic Modules/Base', - 'author': "DynApps NV, Odoo Community Association (OCA)", - 'website': 'https://github.com/OCA/report-print-send', - 'license': 'AGPL-3', - "depends": [ - 'mail', - 'base_report_to_printer', - ], - 'data': [ - ], - 'installable': True, - 'auto_install': True, + "name": "Report to printer - Mail extension", + "version": "12.0.1.0.0", + "category": "Generic Modules/Base", + "author": "DynApps NV, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/report-print-send", + "license": "AGPL-3", + "depends": ["mail", "base_report_to_printer"], + "data": [], + "installable": True, + "auto_install": True, } diff --git a/base_report_to_printer_mail/models/mail_template.py b/base_report_to_printer_mail/models/mail_template.py index 6acfd3e..0a8f13a 100644 --- a/base_report_to_printer_mail/models/mail_template.py +++ b/base_report_to_printer_mail/models/mail_template.py @@ -5,6 +5,6 @@ class MailTemplate(models.Model): _inherit = "mail.template" def generate_email(self, res_ids, fields=None): - return super(MailTemplate, self.with_context( - must_skip_send_to_printer=True - )).generate_email(res_ids, fields=fields) + return super( + MailTemplate, self.with_context(must_skip_send_to_printer=True) + ).generate_email(res_ids, fields=fields) diff --git a/base_report_to_printer_mail/tests/test_mail.py b/base_report_to_printer_mail/tests/test_mail.py index 8149ccd..c8bf45e 100644 --- a/base_report_to_printer_mail/tests/test_mail.py +++ b/base_report_to_printer_mail/tests/test_mail.py @@ -1,6 +1,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import mock + from odoo.tests import common @@ -9,74 +10,79 @@ from odoo.tests import common class TestMail(common.HttpCase): def setUp(self): super(TestMail, self).setUp() - self.Model = self.env['ir.model'] - self.report_obj = self.env['ir.actions.report'] - self.partner_obj = self.env['res.partner'] - self.mail_template_obj = self.env['mail.template'] - self.res_partner_model = \ - self.Model.search([('model', '=', 'res.partner')]) - self.server = self.env['printing.server'].create({}) - self.report_imd = self.env["ir.model.data"].create({ - "name": "test", - "module": "base_report_to_printer", - "model": "ir.ui.view", - }) - self.report_view = self.env["ir.ui.view"].create({ - "name": "Test", - "type": "qweb", - "xml_id": "base_report_to_printer.test", - "model_data_id": self.report_imd.id, - "arch": """ + self.Model = self.env["ir.model"] + self.report_obj = self.env["ir.actions.report"] + self.partner_obj = self.env["res.partner"] + self.mail_template_obj = self.env["mail.template"] + self.res_partner_model = self.Model.search([("model", "=", "res.partner")]) + self.server = self.env["printing.server"].create({}) + self.report_imd = self.env["ir.model.data"].create( + {"name": "test", "module": "base_report_to_printer", "model": "ir.ui.view"} + ) + self.report_view = self.env["ir.ui.view"].create( + { + "name": "Test", + "type": "qweb", + "xml_id": "base_report_to_printer.test", + "model_data_id": self.report_imd.id, + "arch": """
Test
""", - }) + } + ) self.report_imd.res_id = self.report_view.id - self.report = self.report_obj.create({ - "name": "Test", - "report_type": "qweb-pdf", - "model": "res.partner", - "report_name": "base_report_to_printer.test", - }) - self.test_partner = self.partner_obj.create({ - 'name': 'TestingPartner', - 'city': 'OrigCity', - }) - self.email_template = self.mail_template_obj.create({ - 'name': 'TestTemplate', - 'email_from': 'myself@example.com', - 'email_to': 'brigitte@example.com', - 'partner_to': '%s' % self.test_partner.id, - 'model_id': self.res_partner_model.id, - 'subject': 'About ${object.name}', - 'body_html': - '

Dear ${object.name}, ' - 'your parent is ${object.parent_id and ' + self.report = self.report_obj.create( + { + "name": "Test", + "report_type": "qweb-pdf", + "model": "res.partner", + "report_name": "base_report_to_printer.test", + } + ) + self.test_partner = self.partner_obj.create( + {"name": "TestingPartner", "city": "OrigCity"} + ) + self.email_template = self.mail_template_obj.create( + { + "name": "TestTemplate", + "email_from": "myself@example.com", + "email_to": "brigitte@example.com", + "partner_to": "%s" % self.test_partner.id, + "model_id": self.res_partner_model.id, + "subject": "About ${object.name}", + "body_html": "

Dear ${object.name}, " + "your parent is ${object.parent_id and " 'object.parent_id.name or "False"}

', - 'report_template': self.report.id, - }) + "report_template": self.report.id, + } + ) def new_printer(self): - return self.env['printing.printer'].create({ - 'name': 'Printer', - 'server_id': self.server.id, - 'system_name': 'Sys Name', - 'default': True, - 'status': 'unknown', - 'status_message': 'Msg', - 'model': 'res.users', - 'location': 'Location', - 'uri': 'URI', - }) + return self.env["printing.printer"].create( + { + "name": "Printer", + "server_id": self.server.id, + "system_name": "Sys Name", + "default": True, + "status": "unknown", + "status_message": "Msg", + "model": "res.users", + "location": "Location", + "uri": "URI", + } + ) def test_generate_email(self): """ It should NOT print the report, regardless of the defined behaviour """ - self.report.property_printing_action_id.action_type = 'server' + self.report.property_printing_action_id.action_type = "server" self.report.printing_printer_id = self.new_printer() - with mock.patch('odoo.addons.base_report_to_printer.models.' - 'printing_printer.PrintingPrinter.' - 'print_document') as print_document: + with mock.patch( + "odoo.addons.base_report_to_printer.models." + "printing_printer.PrintingPrinter." + "print_document" + ) as print_document: self.email_template.generate_email(self.test_partner.id) print_document.assert_not_called()