Merge pull request 'refs #6106 hotFix: getTickets' (!2449) from 6106_getTickets into master
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2449 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
b3170245d1
|
@ -87,10 +87,6 @@ module.exports = Self => {
|
|||
|
||||
const where = filter.where;
|
||||
where['r.id'] = filter.id;
|
||||
where.and = [{or: [
|
||||
{'t.packages': {gt: 0}},
|
||||
{and: [{'ot.code': 'delivery'}, {'tob.observationTypeFk': {neq: null}}]}
|
||||
]}];
|
||||
|
||||
stmt.merge(conn.makeWhere(filter.where));
|
||||
stmt.merge(conn.makeGroupBy('t.id'));
|
||||
|
|
Loading…
Reference in New Issue