diff --git a/base_report_to_printer/__manifest__.py b/base_report_to_printer/__manifest__.py index 7092003..de84530 100644 --- a/base_report_to_printer/__manifest__.py +++ b/base_report_to_printer/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Report to printer", - "version": "13.0.1.1.0", + "version": "13.0.1.2.0", "category": "Generic Modules/Base", "author": "Agile Business Group & Domsense, Pegueroles SCP, NaN," " LasLabs, Camptocamp, Odoo Community Association (OCA)," diff --git a/base_report_to_printer/i18n/am.po b/base_report_to_printer/i18n/am.po index 875028e..5f7573f 100644 --- a/base_report_to_printer/i18n/am.po +++ b/base_report_to_printer/i18n/am.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/base_report_to_printer.pot b/base_report_to_printer/i18n/base_report_to_printer.pot index a82d82d..48f6769 100644 --- a/base_report_to_printer/i18n/base_report_to_printer.pot +++ b/base_report_to_printer/i18n/base_report_to_printer.pot @@ -35,6 +35,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/bg.po b/base_report_to_printer/i18n/bg.po index c40bdc6..159c683 100644 --- a/base_report_to_printer/i18n/bg.po +++ b/base_report_to_printer/i18n/bg.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/ca.po b/base_report_to_printer/i18n/ca.po index b386c99..5c31d3d 100644 --- a/base_report_to_printer/i18n/ca.po +++ b/base_report_to_printer/i18n/ca.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/de.po b/base_report_to_printer/i18n/de.po index 450131b..5fe45b5 100644 --- a/base_report_to_printer/i18n/de.po +++ b/base_report_to_printer/i18n/de.po @@ -41,6 +41,7 @@ msgstr "Aktionen" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "Aktiv" diff --git a/base_report_to_printer/i18n/el_GR.po b/base_report_to_printer/i18n/el_GR.po index 52b1fb7..67c4c8a 100644 --- a/base_report_to_printer/i18n/el_GR.po +++ b/base_report_to_printer/i18n/el_GR.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/es.po b/base_report_to_printer/i18n/es.po index a3a05ae..0301592 100644 --- a/base_report_to_printer/i18n/es.po +++ b/base_report_to_printer/i18n/es.po @@ -41,6 +41,7 @@ msgstr "Acciones" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "Activo" diff --git a/base_report_to_printer/i18n/es_AR.po b/base_report_to_printer/i18n/es_AR.po index b215ee9..1601d8e 100644 --- a/base_report_to_printer/i18n/es_AR.po +++ b/base_report_to_printer/i18n/es_AR.po @@ -38,6 +38,7 @@ msgstr "Acciones" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "Activo" @@ -275,8 +276,8 @@ msgstr "Error enviando el documento a la impresora " #: code:addons/base_report_to_printer/models/printing_server.py:0 #, python-format msgid "" -"Failed to connect to the CUPS server on %s:%s. Check that the CUPS server is" -" running and that you can reach it from the Odoo server." +"Failed to connect to the CUPS server on %s:%s. Check that the CUPS server is " +"running and that you can reach it from the Odoo server." msgstr "" "Ha fallado la conexión al servidor CUPS %s:%s. Comprueba que el servidor " "CUPS está funcionando y que el servidor de Odoo puede comunicarse con él." @@ -594,7 +595,6 @@ msgstr "Motivo del estado actual del trabajo." #. module: base_report_to_printer #. openerp-web #: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.js:0 -#: code:addons/base_report_to_printer/static/src/js/qweb_action_manager.js:0 #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_report_xml_action__report_id #, python-format msgid "Report" diff --git a/base_report_to_printer/i18n/es_ES.po b/base_report_to_printer/i18n/es_ES.po index ce572df..f30a515 100644 --- a/base_report_to_printer/i18n/es_ES.po +++ b/base_report_to_printer/i18n/es_ES.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/fi.po b/base_report_to_printer/i18n/fi.po index 31354d2..89ee05d 100644 --- a/base_report_to_printer/i18n/fi.po +++ b/base_report_to_printer/i18n/fi.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/fr.po b/base_report_to_printer/i18n/fr.po index 497dcb3..597a76e 100644 --- a/base_report_to_printer/i18n/fr.po +++ b/base_report_to_printer/i18n/fr.po @@ -40,6 +40,7 @@ msgstr "Actions" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/gl.po b/base_report_to_printer/i18n/gl.po index 2d23ced..001f39e 100644 --- a/base_report_to_printer/i18n/gl.po +++ b/base_report_to_printer/i18n/gl.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/hr.po b/base_report_to_printer/i18n/hr.po index d07e3e8..a805af0 100644 --- a/base_report_to_printer/i18n/hr.po +++ b/base_report_to_printer/i18n/hr.po @@ -41,6 +41,7 @@ msgstr "Akcije" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "Aktivno" diff --git a/base_report_to_printer/i18n/hr_HR.po b/base_report_to_printer/i18n/hr_HR.po index f9e9e2c..c13d8a9 100644 --- a/base_report_to_printer/i18n/hr_HR.po +++ b/base_report_to_printer/i18n/hr_HR.po @@ -42,6 +42,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/it.po b/base_report_to_printer/i18n/it.po index 390b121..c017319 100644 --- a/base_report_to_printer/i18n/it.po +++ b/base_report_to_printer/i18n/it.po @@ -40,6 +40,7 @@ msgstr "Azioni" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/nl.po b/base_report_to_printer/i18n/nl.po index 8a59c4c..22ad75e 100644 --- a/base_report_to_printer/i18n/nl.po +++ b/base_report_to_printer/i18n/nl.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/nl_NL.po b/base_report_to_printer/i18n/nl_NL.po index bbe5ada..5539bff 100644 --- a/base_report_to_printer/i18n/nl_NL.po +++ b/base_report_to_printer/i18n/nl_NL.po @@ -41,6 +41,7 @@ msgstr "Acties" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "Actief" diff --git a/base_report_to_printer/i18n/pt.po b/base_report_to_printer/i18n/pt.po index 539e40e..19e15fe 100644 --- a/base_report_to_printer/i18n/pt.po +++ b/base_report_to_printer/i18n/pt.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/pt_BR.po b/base_report_to_printer/i18n/pt_BR.po index 6822905..0c717b8 100644 --- a/base_report_to_printer/i18n/pt_BR.po +++ b/base_report_to_printer/i18n/pt_BR.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/pt_PT.po b/base_report_to_printer/i18n/pt_PT.po index 562dd50..3423c0d 100644 --- a/base_report_to_printer/i18n/pt_PT.po +++ b/base_report_to_printer/i18n/pt_PT.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/sl.po b/base_report_to_printer/i18n/sl.po index e20dc31..5d1f5c2 100644 --- a/base_report_to_printer/i18n/sl.po +++ b/base_report_to_printer/i18n/sl.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/tr.po b/base_report_to_printer/i18n/tr.po index 2668bed..cb38908 100644 --- a/base_report_to_printer/i18n/tr.po +++ b/base_report_to_printer/i18n/tr.po @@ -40,6 +40,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/i18n/zh_CN.po b/base_report_to_printer/i18n/zh_CN.po index 6032d2f..78fd1a6 100644 --- a/base_report_to_printer/i18n/zh_CN.po +++ b/base_report_to_printer/i18n/zh_CN.po @@ -41,6 +41,7 @@ msgstr "" #. module: base_report_to_printer #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_job__active +#: model:ir.model.fields,field_description:base_report_to_printer.field_printing_printer__active #: model:ir.model.fields,field_description:base_report_to_printer.field_printing_server__active msgid "Active" msgstr "" diff --git a/base_report_to_printer/models/printing_printer.py b/base_report_to_printer/models/printing_printer.py index 3966270..df9b9ca 100644 --- a/base_report_to_printer/models/printing_printer.py +++ b/base_report_to_printer/models/printing_printer.py @@ -31,6 +31,7 @@ class PrintingPrinter(models.Model): _order = "name" name = fields.Char(required=True, index=True) + active = fields.Boolean(default=True) server_id = fields.Many2one( comodel_name="printing.server", string="Server", diff --git a/base_report_to_printer/models/printing_server.py b/base_report_to_printer/models/printing_server.py index 126795c..ad84029 100644 --- a/base_report_to_printer/models/printing_server.py +++ b/base_report_to_printer/models/printing_server.py @@ -61,7 +61,7 @@ class PrintingServer(models.Model): servers = self.search(domain) res = True - for server in servers: + for server in servers.with_context(active_test=False): connection = server._open_connection(raise_on_error=raise_on_error) if not connection: server.printer_ids.write({"status": "server-error"}) diff --git a/base_report_to_printer/tests/test_printing_server.py b/base_report_to_printer/tests/test_printing_server.py index f7c444e..d529e4a 100644 --- a/base_report_to_printer/tests/test_printing_server.py +++ b/base_report_to_printer/tests/test_printing_server.py @@ -89,6 +89,18 @@ class TestPrintingServer(TransactionCase): self.Model.action_update_printers() self.assertEqual("unavailable", rec_id.status) + @mock.patch("%s.cups" % model) + def test_update_archived_printers(self, cups): + """ It should update status even if printer is archived """ + rec_id = self.new_printer() + rec_id.toggle_active() + self.server.refresh() + cups.Connection().getPrinters().get.return_value = False + self.Model.action_update_printers() + self.assertEqual( + "unavailable", rec_id.status, + ) + @mock.patch("%s.cups" % model) def test_update_jobs_cron(self, cups): """ It should get all jobs from CUPS server """ diff --git a/base_report_to_printer/views/printing_printer.xml b/base_report_to_printer/views/printing_printer.xml index e09da05..852280d 100644 --- a/base_report_to_printer/views/printing_printer.xml +++ b/base_report_to_printer/views/printing_printer.xml @@ -33,6 +33,13 @@ /> + +