Merge branch 'dev' into 3304-export_database

modules/claim/front/search-panel/index.html

@@ -28,7 +28,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                where="{role: 'salesPerson'}"
+                where="{role: {inq: ['salesPerson', 'officeBoss']}}"
                 label="Salesperson">
                 <tpl-item>{{firstName}} {{name}}</tpl-item>
             </vn-autocomplete>

modules/item/front/request-search-panel/index.html

@@ -20,7 +20,7 @@
                 url="Workers/activeWithRole"
                 search-function="{firstName: $search}"
                 value-field="id"
-                wwhere="{role: {inq: ['logistic', 'buyer']}}"
+                where="{role: {inq: ['logistic', 'buyer']}}"
                 label="Atender">
                 <tpl-item>{{nickname}}</tpl-item>
             </vn-autocomplete>

modules/order/back/methods/order/filter.js

@@ -172,11 +172,11 @@ module.exports = Self => {
                 LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
 
         stmt.merge(conn.makeWhere(filter.where));
+        stmt.merge(`GROUP BY id`);
         stmt.merge(conn.makePagination(filter));
         stmts.push(stmt);
 
         stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
-        stmt.merge(`GROUP BY id`);
         stmt.merge(conn.makeOrderBy(filter.order));
         const ordersIndex = stmts.push(stmt) - 1;