verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

8062-testToMaster_2 #3059

Merged
alexm merged 293 commits from 8062-testToMaster_2 into master 2024-10-03 05:43:41 +00:00
Conversation 0 Commits 293 Files Changed 158 +10 -2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76e545d488 - Show all commits

6
db/versions/11256-grayFern/00-firstScript.sql Normal file
View File

@ -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');

3
modules/item/back/methods/item-shelving/getListItemNewer.js
View File

@ -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;
}; };

3
modules/zone/back/models/zone.json
View File

@ -42,6 +42,9 @@
}, },
"itemMaxSize": { "itemMaxSize": {
"type": "number" "type": "number"
},
"itemMaxLength": {
"type": "number"
} }
}, },
"relations": { "relations": {