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

8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
Conversation 0 Commits 262 Files Changed 156 +3 -7
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 615f57b2e6 - Show all commits

8
db/routines/vn/procedures/ticket_canAdvance.sql
View File

@ -95,12 +95,8 @@ BEGIN
CAST(COUNT(*) AS DECIMAL(10,0)) `lines`, CAST(COUNT(*) AS DECIMAL(10,0)) `lines`,
st.classColor, st.classColor,
CONCAT_WS(':', CONCAT_WS(':',
IF(HOUR(t.shipped), COALESCE(HOUR(t.shipped), HOUR(zc.hour), HOUR(z.hour)),
HOUR(t.shipped), COALESCE(MINUTE(t.shipped), MINUTE(zc.hour), MINUTE(z.hour))
COALESCE(HOUR(zc.hour),HOUR(z.hour))),
IF(MINUTE(t.shipped),
MINUTE(t.shipped),
COALESCE(MINUTE(zc.hour),MINUTE(z.hour)))
) preparation ) preparation
FROM ticket t FROM ticket t
JOIN sale s ON s.ticketFk = t.id JOIN sale s ON s.ticketFk = t.id