[IMP] base_report_to_printer: Add printer option to launch reports in new thread

This commit is contained in:
sergio-teruel
2024-10-26 23:32:27 +02:00
committed by trisdoan
parent 92723f3b7c
commit b719f7e3ea
9 changed files with 75 additions and 20 deletions

View File

@@ -89,9 +89,8 @@ this will not be displayed by CUPS web interface or in Odoo. To see this
information, you need to change the configuration of your CUPS server information, you need to change the configuration of your CUPS server
and set the JobPrivateValue directive to "none" (or some other list of and set the JobPrivateValue directive to "none" (or some other list of
values which does not include "job-name") , and reload the server. See values which does not include "job-name") , and reload the server. See
cupsd.conf(5) cupsd.conf(5) <https://www.cups.org/doc/man-cupsd.conf.html> for
<`https://www.cups.org/doc/man-cupsd.conf.html\\> <https://www.cups.org/doc/man-cupsd.conf.html\>>`__ details.
for details.
Usage Usage
===== =====

View File

@@ -3,10 +3,12 @@
# Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>) # Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
# Copyright (C) 2011 Domsense srl (<http://www.domsense.com>) # Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
# Copyright (C) 2013-2014 Camptocamp (<http://www.camptocamp.com>) # Copyright (C) 2013-2014 Camptocamp (<http://www.camptocamp.com>)
# Copyright 2024 Tecnativa - Sergio Teruel
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import threading
from time import time from time import time
from odoo import _, api, exceptions, fields, models from odoo import _, api, exceptions, fields, models, registry
from odoo.tools.safe_eval import safe_eval from odoo.tools.safe_eval import safe_eval
REPORT_TYPES = {"qweb-pdf": "pdf", "qweb-text": "text"} REPORT_TYPES = {"qweb-pdf": "pdf", "qweb-text": "text"}
@@ -66,9 +68,9 @@ class IrActionsReport(models.Model):
return dict( return dict(
action=user.printing_action or "client", action=user.printing_action or "client",
printer=user.printing_printer_id or printer_obj.get_default(), printer=user.printing_printer_id or printer_obj.get_default(),
tray=str(user.printer_tray_id.system_name) tray=(
if user.printer_tray_id str(user.printer_tray_id.system_name) if user.printer_tray_id else False
else False, ),
) )
def _get_report_default_print_behaviour(self): def _get_report_default_print_behaviour(self):
@@ -119,6 +121,29 @@ class IrActionsReport(models.Model):
result["printer_exception"] = True result["printer_exception"] = True
return result return result
def print_document_client_action(self, record_ids, data=None):
behaviour = self.behaviour()
printer = behaviour.pop("printer", None)
if printer.multi_thread:
@self.env.cr.postcommit.add
def _launch_print_thread():
threaded_calculation = threading.Thread(
target=self.print_document_threaded,
args=(self.id, record_ids, data),
)
threaded_calculation.start()
return True
else:
return self.print_document(record_ids, data=data)
def print_document_threaded(self, report_id, record_ids, data):
with registry(self._cr.dbname).cursor() as cr:
self = self.with_env(self.env(cr=cr))
report = self.env["ir.actions.report"].browse(report_id)
report.print_document(record_ids, data)
def print_document(self, record_ids, data=None): def print_document(self, record_ids, data=None):
"""Print a document, do not return the document file""" """Print a document, do not return the document file"""
report_type = REPORT_TYPES.get(self.report_type) report_type = REPORT_TYPES.get(self.report_type)

View File

@@ -12,7 +12,7 @@ import logging
import os import os
from tempfile import mkstemp from tempfile import mkstemp
from odoo import fields, models from odoo import api, fields, models
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -67,6 +67,14 @@ class PrintingPrinter(models.Model):
tray_ids = fields.One2many( tray_ids = fields.One2many(
comodel_name="printing.tray", inverse_name="printer_id", string="Paper Sources" comodel_name="printing.tray", inverse_name="printer_id", string="Paper Sources"
) )
multi_thread = fields.Boolean(
compute="_compute_multi_thread", readonly=False, store=True
)
@api.depends("server_id.multi_thread")
def _compute_multi_thread(self):
for printer in self:
printer.multi_thread = printer.server_id.multi_thread
def _prepare_update_from_cups(self, cups_connection, cups_printer): def _prepare_update_from_cups(self, cups_connection, cups_printer):
mapping = {3: "available", 4: "printing", 5: "error"} mapping = {3: "available", 4: "printing", 5: "error"}

View File

@@ -41,6 +41,7 @@ class PrintingServer(models.Model):
string="Printers List", string="Printers List",
help="List of printers available on this server.", help="List of printers available on this server.",
) )
multi_thread = fields.Boolean()
def _open_connection(self, raise_on_error=False): def _open_connection(self, raise_on_error=False):
self.ensure_one() self.ensure_one()

View File

@@ -8,10 +8,11 @@
/* /*
:Author: David Goodger (goodger@python.org) :Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain. :Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils. Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet. customize this style sheet.
@@ -274,7 +275,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ; margin-left: 2em ;
margin-right: 2em } margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */ pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee } pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 } pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@ span.option {
span.pre { span.pre {
white-space: pre } white-space: pre }
span.problematic { span.problematic, pre.problematic {
color: red } color: red }
span.section-subtitle { span.section-subtitle {
@@ -438,9 +439,8 @@ this will not be displayed by CUPS web interface or in Odoo. To see this
information, you need to change the configuration of your CUPS server information, you need to change the configuration of your CUPS server
and set the JobPrivateValue directive to “none” (or some other list of and set the JobPrivateValue directive to “none” (or some other list of
values which does not include “job-name”) , and reload the server. See values which does not include “job-name”) , and reload the server. See
cupsd.conf(5) cupsd.conf(5) &lt;<a class="reference external" href="https://www.cups.org/doc/man-cupsd.conf.html">https://www.cups.org/doc/man-cupsd.conf.html</a>&gt; for
&lt;<a class="reference external" href="https://www.cups.org/doc/man-cupsd.conf.html&gt;">https://www.cups.org/doc/man-cupsd.conf.html\&gt;</a> details.</p>
for details.</p>
</div> </div>
<div class="section" id="usage"> <div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1> <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
@@ -523,7 +523,9 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
<div class="section" id="maintainers"> <div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2> <h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p> <p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a> <a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use.</p> promote its widespread use.</p>

View File

@@ -16,11 +16,11 @@ async function cupsReportActionHandler(action, options, env) {
print_action.action === "server" && print_action.action === "server" &&
!print_action.printer_exception !print_action.printer_exception
) { ) {
const result = await orm.call("ir.actions.report", "print_document", [ const result = await orm.call(
action.id, "ir.actions.report",
action.context.active_ids, "print_document_client_action",
action.data, [action.id, action.context.active_ids, action.data]
]); );
if (result) { if (result) {
env.services.notification.add(_t("Successfully sent to printer!"), { env.services.notification.add(_t("Successfully sent to printer!"), {
type: "success", type: "success",

View File

@@ -295,3 +295,21 @@ class TestIrActionsReportXml(TransactionCase):
self.assertEqual(action.printer_tray_id, tray) self.assertEqual(action.printer_tray_id, tray)
action.onchange_printing_printer_id() action.onchange_printing_printer_id()
self.assertFalse(action.printer_tray_id) self.assertFalse(action.printer_tray_id)
def test_print_in_new_thread(self):
"""It should return the action and printer from printing action in other
thread"""
report = self.Model.search([], limit=1)
self.env.user.printing_action = "server"
printing_action = self.new_printing_action()
printing_action.user_id = self.env.user
printing_action.printer_id = self.new_printer()
printing_action.printer_id.multi_thread = True
self.assertEqual(
report.behaviour(),
{
"action": printing_action.action,
"printer": printing_action.printer_id,
"tray": False,
},
)

View File

@@ -78,6 +78,7 @@
<field name="location" /> <field name="location" />
<field name="status" /> <field name="status" />
<field name="status_message" /> <field name="status_message" />
<field name="multi_thread" />
</group> </group>
<group string="Trays" name="trays"> <group string="Trays" name="trays">
<field name="tray_ids" nolabel="1" colspan="2"> <field name="tray_ids" nolabel="1" colspan="2">

View File

@@ -32,6 +32,7 @@
<field name="user" /> <field name="user" />
<field name="password" /> <field name="password" />
<field name="encryption_policy" /> <field name="encryption_policy" />
<field name="multi_thread" />
</group> </group>
</group> </group>
<separator name="printers" string="Printers" /> <separator name="printers" string="Printers" />