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 +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

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

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