[PORT] Finalize move of printer_tray to base_report_to_printer,

fix tests as report param is not a string but recordset

base_report_to_printer/models/printing_printer.py

@@ -63,9 +63,20 @@ class PrintingPrinter(models.Model):
 
     @api.multi
     def _prepare_update_from_cups(self, cups_connection, cups_printer):
-        vals = super(PrintingPrinter, self)._prepare_update_from_cups(
-            cups_connection, cups_printer)
-
+        mapping = {
+            3: 'available',
+            4: 'printing',
+            5: 'error'
+        }
+        vals = {
+            'name': cups_printer['printer-info'],
+            'model': cups_printer.get('printer-make-and-model', False),
+            'location': cups_printer.get('printer-location', False),
+            'uri': cups_printer.get('device-uri', False),
+            'status': mapping.get(cups_printer.get(
+                'printer-state'), 'unknown'),
+            'status_message': cups_printer.get('printer-state-message', ''),
+        }
         printer_uri = cups_printer['printer-uri-supported']
         printer_system_name = printer_uri[printer_uri.rfind('/') + 1:]
         ppd_info = cups_connection.getPPD3(printer_system_name)
@@ -104,25 +115,6 @@ class PrintingPrinter(models.Model):
             for tray in self.tray_ids.filtered(
                 lambda record: record.system_name not in cups_trays.keys())
         ])
-
-        return vals
-
-    @api.multi
-    def _prepare_update_from_cups(self, cups_connection, cups_printer):
-        mapping = {
-            3: 'available',
-            4: 'printing',
-            5: 'error'
-        }
-        vals = {
-            'name': cups_printer['printer-info'],
-            'model': cups_printer.get('printer-make-and-model', False),
-            'location': cups_printer.get('printer-location', False),
-            'uri': cups_printer.get('device-uri', False),
-            'status': mapping.get(cups_printer.get(
-                'printer-state'), 'unknown'),
-            'status_message': cups_printer.get('printer-state-message', ''),
-        }
         return vals
 
     @api.multi