Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward
This commit is contained in:
commit
76e545d488
|
@ -0,0 +1,6 @@
|
||||||
|
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
|
||||||
|
VALUES ('Province','*','WRITE','ALLOW','ROLE','administrative');
|
||||||
|
|
||||||
|
INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
|
||||||
|
VALUES ('Town','*','WRITE','ALLOW','ROLE','administrative');
|
||||||
|
|
|
@ -63,8 +63,7 @@ module.exports = Self => {
|
||||||
FROM tItemShelving ti
|
FROM tItemShelving ti
|
||||||
JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
|
JOIN tItemInSector tis ON tis.itemFk = ti.itemFk
|
||||||
JOIN vn.productionConfig pc
|
JOIN vn.productionConfig pc
|
||||||
WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created
|
WHERE ti.created + INTERVAL pc.itemOlderReviewHours HOUR < tis.created;`,
|
||||||
LIMIT 10;`,
|
|
||||||
[shelvingFk, shelvingFk], myOptions);
|
[shelvingFk, shelvingFk], myOptions);
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,6 +42,9 @@
|
||||||
},
|
},
|
||||||
"itemMaxSize": {
|
"itemMaxSize": {
|
||||||
"type": "number"
|
"type": "number"
|
||||||
|
},
|
||||||
|
"itemMaxLength": {
|
||||||
|
"type": "number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"relations": {
|
"relations": {
|
||||||
|
|
Loading…
Reference in New Issue