#7864 - 7864_testToMaster_2434 #2867

Merged
jsegarra merged 139 commits from 7864_testToMaster_2434 into master 2024-08-20 06:33:22 +00:00
1 changed files with 3 additions and 4 deletions
Showing only changes of commit e53b12d51b - Show all commits

View File

@ -20,6 +20,7 @@ BEGIN
DECLARE vItemFk INT;
DECLARE vConcept VARCHAR(30);
DECLARE vAmount INT;
DECLARE vAvailable INT;
DECLARE vPrice DECIMAL(10,2);
DECLARE vSaleFk INT;
DECLARE vRowFk INT;
@ -48,7 +49,6 @@ BEGIN
i.name,
r.amount,
r.price,
i.itemPackingTypeFk,
i.isFloramondo
FROM orderRow r
JOIN vn.item i ON i.id = r.itemFk
@ -130,7 +130,7 @@ BEGIN
JOIN vn.saleGroupDetail sgd ON sgd.saleFk = s.id
JOIN vn.ticket t ON t.id = s.ticketFk
WHERE t.shipped BETWEEN vShipment AND util.dayend(vShipment)
),
)
SELECT t.id INTO vTicketFk
FROM vn.ticket t
JOIN vn.alertLevel al ON al.code = 'FREE'
@ -174,7 +174,7 @@ BEGIN
FROM tItemPackingTypeTicket iptt
JOIN tItemPackingTypeOrder ipto
WHERE INSTR(iptt.distinctItemPackingTypes, ipto.distinctItemPackingTypes)
LIMIT 1
LIMIT 1;
END IF;
-- Crea el ticket en el caso de no existir uno adecuado
@ -224,7 +224,6 @@ BEGIN
vConcept,
vAmount,
vPrice,
vItemPackingTypeFk,
vIsLogifloraItem;
IF vDone THEN