diff --git a/modules/monitor/front/index/orders/style.scss b/modules/monitor/front/index/orders/style.scss index f4d56010c..8a1c86032 100644 --- a/modules/monitor/front/index/orders/style.scss +++ b/modules/monitor/front/index/orders/style.scss @@ -2,7 +2,7 @@ vn-monitor-sales-orders { vn-table.scrollable { - height: 350px + max-height: 350px } vn-table a.vn-tbody { diff --git a/print/templates/reports/driver-route/sql/routes.sql b/print/templates/reports/driver-route/sql/routes.sql index bdbabedea..3fbe59b0d 100644 --- a/print/templates/reports/driver-route/sql/routes.sql +++ b/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(?) \ No newline at end of file