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

7806_devToTest_2332 #2801

Merged
alexm merged 126 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:09 +00:00
Conversation 0 Commits 126 Files Changed 120 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ff8f340978 - Show all commits

1
db/routines/vn/procedures/itemShelvingSale_addBySale.sql
View File

@ -98,6 +98,7 @@ proc: BEGIN
itemShelvingFk, itemShelvingFk,
saleFk, saleFk,
quantity, quantity,
userFk,
isPicked) isPicked)
SELECT vItemShelvingFk, SELECT vItemShelvingFk,
vSaleFk, vSaleFk,

2
db/versions/11168-redFern/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.calendar
ADD CONSTRAINT calendar_user_FK FOREIGN KEY (editorFk) REFERENCES account.`user`(id);

5
modules/worker/back/models/calendar.json
View File

@ -1,9 +1,8 @@
{ {
"name": "Calendar", "name": "Calendar",
"base": "VnModel", "base": "VnModel",
"log": { "mixins": {
"model": "WorkerLog", "Loggable": true
"relation": "labour"
}, },
"options": { "options": {
"mysql": { "mysql": {