From c6c0ef3fd4d86e97dd845828926d18e489f9baeb Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Tue, 20 Apr 2021 15:20:22 +0200 Subject: [PATCH] [IMP] report_label: black, isort, prettier --- report_label/__manifest__.py | 40 +++++++++---------- report_label/data/paperformat_label.xml | 32 +++++++-------- report_label/demo/demo.xml | 32 ++++++++++----- report_label/models/ir_actions_report.py | 3 +- report_label/models/ir_actions_server.py | 40 +++++++++---------- .../models/report_paperformat_label.py | 2 +- report_label/readme/DESCRIPTION.rst | 2 +- report_label/readme/ROADMAP.rst | 4 +- report_label/readme/USAGE.rst | 2 +- report_label/reports/report_label.xml | 33 ++++++++------- report_label/tests/test_report_label.py | 7 ++-- report_label/views/ir_actions_server.xml | 17 +++++--- .../views/report_paperformat_label.xml | 33 +++++++-------- report_label/wizards/report_label_wizard.py | 16 +++++--- report_label/wizards/report_label_wizard.xml | 28 ++++++++----- setup/report_label/odoo/addons/report_label | 1 + setup/report_label/setup.py | 6 +++ 17 files changed, 167 insertions(+), 131 deletions(-) create mode 120000 setup/report_label/odoo/addons/report_label create mode 100644 setup/report_label/setup.py diff --git a/report_label/__manifest__.py b/report_label/__manifest__.py index e1e7cf481..c3c5cbd2e 100644 --- a/report_label/__manifest__.py +++ b/report_label/__manifest__.py @@ -1,26 +1,24 @@ { - 'name': 'Report Labels', - 'version': '12.0.1.0.0', - 'summary': 'Print configurable self-adhesive labels reports', - 'author': 'Iván Todorovich, Moka Tourisme, Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/reporting-engine', - 'license': 'AGPL-3', - 'category': 'Reporting', - 'maintainers': [ - 'ivantodorovich' + "name": "Report Labels", + "version": "12.0.1.0.0", + "summary": "Print configurable self-adhesive labels reports", + "author": "Iván Todorovich, Moka Tourisme, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/reporting-engine", + "license": "AGPL-3", + "category": "Reporting", + "maintainers": ["ivantodorovich"], + "depends": [ + "base", ], - 'depends': [ - 'base', + "data": [ + "security/ir.model.access.csv", + "data/paperformat_label.xml", + "views/ir_actions_server.xml", + "views/report_paperformat_label.xml", + "reports/report_label.xml", + "wizards/report_label_wizard.xml", ], - 'data': [ - 'security/ir.model.access.csv', - 'data/paperformat_label.xml', - 'views/ir_actions_server.xml', - 'views/report_paperformat_label.xml', - 'reports/report_label.xml', - 'wizards/report_label_wizard.xml', + "demo": [ + "demo/demo.xml", ], - 'demo': [ - 'demo/demo.xml', - ] } diff --git a/report_label/data/paperformat_label.xml b/report_label/data/paperformat_label.xml index e6e8ec814..7da0a7058 100644 --- a/report_label/data/paperformat_label.xml +++ b/report_label/data/paperformat_label.xml @@ -1,4 +1,4 @@ - + @@ -6,21 +6,21 @@ Label: Agipa 114016 A5 Portrait - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/report_label/demo/demo.xml b/report_label/demo/demo.xml index 39a7794cc..ea2263707 100644 --- a/report_label/demo/demo.xml +++ b/report_label/demo/demo.xml @@ -1,4 +1,4 @@ - + - + Partner Label A4 - - - - - - + + + + + + Print Address Labels report_label - - + + report_label.label_template_partner_address - + diff --git a/report_label/models/ir_actions_report.py b/report_label/models/ir_actions_report.py index 7394bf98c..c4241de2e 100644 --- a/report_label/models/ir_actions_report.py +++ b/report_label/models/ir_actions_report.py @@ -10,5 +10,6 @@ class IrActionsReport(models.Model): res = super().get_paperformat() if self.env.context.get("paperformat_id"): res = self.env["report.paperformat"].browse( - self.env.context.get("paperformat_id")) + self.env.context.get("paperformat_id") + ) return res diff --git a/report_label/models/ir_actions_server.py b/report_label/models/ir_actions_server.py index 45962d2a0..0d3d1dcd8 100644 --- a/report_label/models/ir_actions_server.py +++ b/report_label/models/ir_actions_server.py @@ -1,4 +1,4 @@ -from odoo import api, models, fields +from odoo import api, fields, models class IrActionsServer(models.Model): @@ -10,43 +10,41 @@ class IrActionsServer(models.Model): label_template = fields.Char( "Label QWeb Template", help="The QWeb template key to render the labels", - states={ - "report_label": [("required", True)] - } + states={"report_label": [("required", True)]}, ) label_paperformat_id = fields.Many2one( "report.paperformat.label", "Label Paper Format", - states={ - "report_label": [("required", True)] - } + states={"report_label": [("required", True)]}, ) @api.multi def report_label_associated_view(self): - """ View the associated qweb templates """ + """View the associated qweb templates""" self.ensure_one() - action = self.env.ref('base.action_ui_view', raise_if_not_found=False) - if not action or len(self.label_template.split('.')) < 2: + action = self.env.ref("base.action_ui_view", raise_if_not_found=False) + if not action or len(self.label_template.split(".")) < 2: return False res = action.read()[0] - res['domain'] = [ - ('type', '=', 'qweb'), - '|', - ('name', 'ilike', self.label_template.split('.')[1]), - ('key', '=', self.label_template), + res["domain"] = [ + ("type", "=", "qweb"), + "|", + ("name", "ilike", self.label_template.split(".")[1]), + ("key", "=", self.label_template), ] return res @api.model def run_action_report_label_multi(self, action, eval_context=None): - """ Show report label wizard """ + """Show report label wizard""" context = dict(self.env.context) - context.update({ - "label_template": action.label_template, - "label_paperformat_id": action.label_paperformat_id.id, - "res_model_id": action.model_id.id, - }) + context.update( + { + "label_template": action.label_template, + "label_paperformat_id": action.label_paperformat_id.id, + "res_model_id": action.model_id.id, + } + ) return { "name": action.name, "type": "ir.actions.act_window", diff --git a/report_label/models/report_paperformat_label.py b/report_label/models/report_paperformat_label.py index b77b2c088..7c2afb19a 100644 --- a/report_label/models/report_paperformat_label.py +++ b/report_label/models/report_paperformat_label.py @@ -1,4 +1,4 @@ -from odoo import models, fields +from odoo import fields, models class ReportPaperformatLabel(models.Model): diff --git a/report_label/readme/DESCRIPTION.rst b/report_label/readme/DESCRIPTION.rst index 0beb29c68..7be00e255 100644 --- a/report_label/readme/DESCRIPTION.rst +++ b/report_label/readme/DESCRIPTION.rst @@ -1 +1 @@ -This module allows you to create self-adhesive label printing actions on any model. \ No newline at end of file +This module allows you to create self-adhesive label printing actions on any model. diff --git a/report_label/readme/ROADMAP.rst b/report_label/readme/ROADMAP.rst index 899438053..7a2e85e5c 100644 --- a/report_label/readme/ROADMAP.rst +++ b/report_label/readme/ROADMAP.rst @@ -1,3 +1,3 @@ -* `wkhtmltopdf` doesn't always respect dpi, and mm measures don't match. For - this matter, it's recommended to use this module along with +* `wkhtmltopdf` doesn't always respect dpi, and mm measures don't match. For + this matter, it's recommended to use this module along with `report_wkhtmltopdf_param` and enable `--disable-smart-shrinking`. diff --git a/report_label/readme/USAGE.rst b/report_label/readme/USAGE.rst index f6aa7893a..72b0c113a 100644 --- a/report_label/readme/USAGE.rst +++ b/report_label/readme/USAGE.rst @@ -2,4 +2,4 @@ 2. Click *Action* and your label report action name. 3. Select the number of labels per record to print, and click Print. -.. image:: ../static/description/label_wizard.png \ No newline at end of file +.. image:: ../static/description/label_wizard.png diff --git a/report_label/reports/report_label.xml b/report_label/reports/report_label.xml index 254fa6e8a..5c62bdb79 100644 --- a/report_label/reports/report_label.xml +++ b/report_label/reports/report_label.xml @@ -1,20 +1,20 @@ - +