verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

6956-2410_devTest #2112

Merged
alexm merged 150 commits from 6956-2410_devTest into test 2024-02-29 09:17:58 +00:00
Conversation 0 Commits 150 Files Changed 52 +9 -9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5fe4f794cc - Show all commits

7
db/routines/vn/triggers/entry_beforeUpdate.sql
View File

@ -6,6 +6,7 @@ BEGIN
DECLARE vIsVirtual BOOL; DECLARE vIsVirtual BOOL;
DECLARE vPrintedCount INT; DECLARE vPrintedCount INT;
DECLARE vHasDistinctWarehouses BOOL; DECLARE vHasDistinctWarehouses BOOL;
DECLARE vHasAnyInvoiceBooked BOOL;
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
@ -49,15 +50,13 @@ BEGIN
END IF; END IF;
IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk)THEN IF NOT (NEW.invoiceInFk <=> OLD.invoiceInFk)THEN
DECLARE vHanAnyInvoiceBooked BOOL; SELECT COUNT(*) INTO vHasAnyInvoiceBooked
SELECT COUNT(*) INTO vHanAnyInvoiceBooked
FROM entry e FROM entry e
JOIN invoiceIn ii ON ii.id = e.invoiceInFk JOIN invoiceIn ii ON ii.id = e.invoiceInFk
WHERE e.id = NEW.id WHERE e.id = NEW.id
AND ii.isBooked; AND ii.isBooked;
IF vHanAnyInvoiceBooked THEN IF vHasAnyInvoiceBooked THEN
CALL util.throw('The travel has entries with booked invoices') CALL util.throw('The travel has entries with booked invoices')
END IF; END IF;
END IF; END IF;

7
db/routines/vn/triggers/travel_beforeUpdate.sql
View File

@ -3,6 +3,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`travel_beforeUpdate`
BEFORE UPDATE ON `travel` BEFORE UPDATE ON `travel`
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
DECLARE vHasAnyInvoiceBooked BOOL;
SET NEW.editorFk = account.myUser_getId(); SET NEW.editorFk = account.myUser_getId();
IF NOT (NEW.landed <=> OLD.landed) IF NOT (NEW.landed <=> OLD.landed)
@ -19,16 +21,15 @@ BEGIN
END IF; END IF;
IF NOT (NEW.awbFk <=> OLD.awbFk)THEN IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
DECLARE vHanAnyInvoiceBooked BOOL;
SELECT COUNT(*) INTO vHanAnyInvoiceBooked SELECT COUNT(*) INTO vHasAnyInvoiceBooked
FROM travel t FROM travel t
JOIN entry e ON e.travelFk =t.id JOIN entry e ON e.travelFk =t.id
JOIN invoiceIn ii ON ii.id = e.invoiceInFk JOIN invoiceIn ii ON ii.id = e.invoiceInFk
WHERE t.id = NEW.id WHERE t.id = NEW.id
AND ii.isBooked; AND ii.isBooked;
IF vHanAnyInvoiceBooked THEN IF vHasAnyInvoiceBooked THEN
CALL util.throw('The travel has entries with booked invoices') CALL util.throw('The travel has entries with booked invoices')
END IF; END IF;
END IF; END IF;