Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

print/templates/reports/driver-route/sql/routes.sql

@@ -7,10 +7,12 @@ SELECT
     v.tradeMark vehicleTradeMark,
     v.model vehicleModel,
     v.numberPlate plateNumber,
-    am.name agencyName
+    IFNULL(s.name, am.name) AS agencyName
 FROM route r
     LEFT JOIN vehicle v ON v.id = r.vehicleFk
     LEFT JOIN worker w ON w.id = r.workerFk
     LEFT JOIN account.user u ON u.id = w.userFk
     LEFT JOIN agencyMode am ON am.id = r.agencyModeFk
+    LEFT JOIN agency a ON a.id = am.agencyFk
+    LEFT JOIN supplier s ON s.id = a.supplierFk
 WHERE r.id IN(?)