[MIG] base_report_to_printer: Migration to v14

base_report_to_printer/__manifest__.py

@@ -7,7 +7,7 @@
 
 {
     "name": "Report to printer",
-    "version": "13.0.1.2.0",
+    "version": "14.0.1.0.0",
     "category": "Generic Modules/Base",
     "author": "Agile Business Group & Domsense, Pegueroles SCP, NaN,"
     " LasLabs, Camptocamp, Odoo Community Association (OCA),"

base_report_to_printer/data/printing_data.xml

@@ -20,12 +20,12 @@
     </record>
     <record forcecreate="True" id="ir_cron_update_printers" model="ir.cron">
         <field name="name">Update Printers Jobs</field>
-        <field eval="True" name="active" />
+        <field name="active" eval="True" />
         <field name="user_id" ref="base.user_root" />
         <field name="interval_number">1</field>
         <field name="interval_type">minutes</field>
         <field name="numbercall">-1</field>
-        <field eval="False" name="doall" />
+        <field name="doall" eval="False" />
         <field name="model_id" ref="base_report_to_printer.model_printing_server" />
         <field name="state">code</field>
         <field name="code">model.action_update_jobs()</field>

base_report_to_printer/i18n/am.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/base_report_to_printer.pot

@@ -35,7 +35,6 @@ 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 ""

base_report_to_printer/i18n/bg.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/ca.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/de.po

@@ -41,7 +41,6 @@ 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"

base_report_to_printer/i18n/el_GR.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/i18n/es.po

@@ -41,7 +41,6 @@ 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"

base_report_to_printer/i18n/es_AR.po

@@ -38,7 +38,6 @@ 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"
@@ -595,6 +594,7 @@ 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"

base_report_to_printer/i18n/es_ES.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/i18n/fi.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/fr.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/gl.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/hr.po

@@ -41,7 +41,6 @@ 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"

base_report_to_printer/i18n/hr_HR.po

@@ -42,7 +42,6 @@ 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 ""

base_report_to_printer/i18n/it.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/nl.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/nl_NL.po

@@ -41,7 +41,6 @@ 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"

base_report_to_printer/i18n/pt.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/pt_BR.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/i18n/pt_PT.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/i18n/sl.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/i18n/tr.po

@@ -40,7 +40,6 @@ 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 ""

base_report_to_printer/i18n/zh_CN.po

@@ -41,7 +41,6 @@ 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 ""

base_report_to_printer/models/ir_actions_report.py

@@ -135,9 +135,7 @@ class IrActionsReport(models.Model):
         If the action configured on the report is server, it prints the
         generated document as well.
         """
-        document, doc_format = super(IrActionsReport, self).render_qweb_pdf(
+        document, doc_format = super().render_qweb_pdf(res_ids=res_ids, data=data)
-            res_ids=res_ids, data=data
-        )
 
         behaviour = self.behaviour()
         printer = behaviour.pop("printer", None)

base_report_to_printer/models/printing_printer.py

@@ -169,8 +169,8 @@ class PrintingPrinter(models.Model):
         options = self.print_options(report=report, **print_opts)
 
         _logger.debug(
-            "Sending job to CUPS printer %s on %s"
+            "Sending job to CUPS printer %s on %s with options %s"
-            % (self.system_name, self.server_id.address)
+            % (self.system_name, self.server_id.address, options)
         )
         connection.printFile(self.system_name, file_name, file_name, options=options)
         _logger.info(

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.with_context(active_test=False):
+        for server in servers:
             connection = server._open_connection(raise_on_error=raise_on_error)
             if not connection:
                 server.printer_ids.write({"status": "server-error"})
@@ -71,7 +71,8 @@ class PrintingServer(models.Model):
             # Update Printers
             printers = connection.getPrinters()
             existing_printers = {
-                printer.system_name: printer for printer in server.printer_ids
+                printer.system_name: printer
+                for printer in server.with_context(active_test=False).printer_ids
             }
             updated_printers = []
             for name, printer_info in printers.items():

base_report_to_printer/security/security.xml

@@ -103,7 +103,6 @@
         <field eval="0" name="perm_write" />
         <field eval="0" name="perm_create" />
     </record>
-    <!--Ported from printing_tray -->
     <record id="access_printing_tray_all" model="ir.model.access">
         <field name="name">Printing Tray User</field>
         <field name="model_id" ref="model_printing_tray" />
@@ -122,4 +121,13 @@
         <field eval="1" name="perm_write" />
         <field eval="1" name="perm_create" />
     </record>
+    <record id="access_printing_printer_update_wizard" model="ir.model.access">
+        <field name="name">Update printer wizard</field>
+        <field name="model_id" ref="model_printing_printer_update_wizard" />
+        <field name="group_id" ref="printing_group_manager" />
+        <field eval="1" name="perm_read" />
+        <field eval="1" name="perm_unlink" />
+        <field eval="1" name="perm_write" />
+        <field eval="1" name="perm_create" />
+    </record>
 </odoo>

base_report_to_printer/tests/test_printing_server.py

@@ -89,19 +89,6 @@ 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 """

base_report_to_printer/views/ir_actions_report.xml

@@ -5,7 +5,7 @@
         <field name="model">ir.actions.report</field>
         <field name="inherit_id" ref="base.act_report_xml_view" />
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='security']" position="before">
+            <page name="security" position="before">
                 <page string="Print" name="print">
                     <group>
                         <field name="property_printing_action_id" />
@@ -15,7 +15,7 @@
                     <separator string="Specific actions per user" />
                     <field name="printing_action_ids" />
                 </page>
-            </xpath>
+            </page>
         </field>
     </record>
 </odoo>

base_report_to_printer/views/printing_printer.xml

@@ -113,6 +113,11 @@
                 <field name="system_name" />
                 <field name="location" />
                 <field name="status" />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active', '=', False)]"
+                />
             </search>
         </field>
     </record>

base_report_to_printer/views/res_users.xml

@@ -5,12 +5,12 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='preferences']/ancestor::page" position="inside">
+            <group name="preferences" position="after">
                 <group string="Printing" name="printing">
                     <field name="printing_action" />
                     <field name="printing_printer_id" options="{'no_create': True}" />
                 </group>
-            </xpath>
+            </group>
         </field>
     </record>
     <record model="ir.ui.view" id="view_users_form_simple_modif">
@@ -18,8 +18,8 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form_simple_modif" />
         <field name="arch" type="xml">
-            <footer position="before">
+            <group name="preferences" position="inside">
-                <group string="Printing" name="printing">
+                <group name="printing">
                     <field name="printing_action" readonly="0" />
                     <field
                         name="printing_printer_id"
@@ -27,7 +27,7 @@
                         options="{'no_create': True}"
                     />
                 </group>
-            </footer>
+            </group>
         </field>
     </record>
 </odoo>

base_report_to_printer/wizards/printing_printer_update_wizard_view.xml

@@ -5,27 +5,25 @@
         <field name="model">printing.printer.update.wizard</field>
         <field name="arch" type="xml">
             <form string="Update Printers from CUPS">
-                <label
+                <div name="introduction">
-                    string="This process will create all missing printers from the current CUPS server."
+                    <p>
-                    colspan="2"
+                    This process will create all missing printers from the current CUPS server."
-                    for=""
+                    </p>
-                />
+                </div>
                 <footer>
                     <button
                         name="action_ok"
                         string="Ok"
                         type="object"
-                        class="oe_highlight"
+                        class="btn-primary"
                     />
-                    or
+                    <button string="Cancel" class="btn-default" special="cancel" />
-                    <button string="Cancel" class="oe_link" special="cancel" />
                 </footer>
             </form>
         </field>
     </record>
     <record id="action_printer_update_wizard" model="ir.actions.act_window">
         <field name="name">Update Printers from CUPS</field>
-        <field name="type">ir.actions.act_window</field>
         <field name="res_model">printing.printer.update.wizard</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>