Merge branch 'master' into test

2024-07-25 09:40:33 +02:00 · 2024-07-25 09:40:33 +02:00 · 10dbc53acc
parent 3e0e43da2f 25464f8a96
commit 10dbc53acc
3 changed files with 5 additions and 3 deletions
--- a/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
+++ b/db/routines/vn/procedures/itemShelvingSale_addBySale.sql
@ -98,6 +98,7 @@ proc: BEGIN
 					itemShelvingFk,
 					saleFk,
 					quantity,
+					userFk,
 					isPicked)
 				SELECT vItemShelvingFk, 
 					vSaleFk, 
--- a/db/versions/11168-redFern/00-firstScript.sql
+++ b/db/versions/11168-redFern/00-firstScript.sql
@ -0,0 +1,2 @@
+ALTER TABLE vn.calendar
+    ADD CONSTRAINT calendar_user_FK FOREIGN KEY (editorFk) REFERENCES account.`user`(id);
--- a/modules/worker/back/models/calendar.json
+++ b/modules/worker/back/models/calendar.json
@ -1,9 +1,8 @@
 {
    "name": "Calendar",
    "base": "VnModel",
-    "log": {
-        "model": "WorkerLog",
-        "relation": "labour"
+    "mixins": {
+        "Loggable": true
    },
    "options": {
        "mysql": {