Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
6487497638
114
CHANGELOG.md
114
CHANGELOG.md
|
|
@ -1,3 +1,117 @@
|
||||||
|
# Version 24.48 - 2024-11-25
|
||||||
|
|
||||||
|
### Added 🆕
|
||||||
|
|
||||||
|
- feat: refs #4948 Added ticket_selfConsumptionPackaging by:guillermo
|
||||||
|
- feat: refs #6818 add config table by:jorgep
|
||||||
|
- feat: refs #6818 add records by:jorgep
|
||||||
|
- feat: refs #6818 saysimple integration by:jorgep
|
||||||
|
- feat: refs #6845 userInterface by:sergiodt
|
||||||
|
- feat: refs #6869 add back by:jorgep
|
||||||
|
- feat: refs #6869 define model by:jorgep
|
||||||
|
- feat: refs #6869 refs#6869 itemShelving_get (origin/6869-createGetDetails) by:sergiodt
|
||||||
|
- feat: refs #7006 itemTypeLog by:guillermo
|
||||||
|
- feat: refs #7006 itemTypeLog created by:guillermo
|
||||||
|
- feat: refs #7006 Requested changes by:guillermo
|
||||||
|
- feat: refs #7193 added scope in parking model by:Jon
|
||||||
|
- feat: refs #7244 Requested changes by:guillermo
|
||||||
|
- feat: refs #7266 Added details and improvements in item label reports by:guillermo
|
||||||
|
- feat: refs #7266 buyFkForPrint by:sergiodt
|
||||||
|
- feat: refs #7266 First commit by:guillermo
|
||||||
|
- feat: refs #7266 Item label barcode by:guillermo
|
||||||
|
- feat: refs #7266 Item label QR by:guillermo
|
||||||
|
- feat: refs #7266 Item label QR finished by:guillermo
|
||||||
|
- feat: refs #7266 Minor change by:guillermo
|
||||||
|
- feat: refs #7266 Print corrections by:guillermo
|
||||||
|
- feat: refs #7266 Requested changes and improvements by:guillermo
|
||||||
|
- feat: refs #7266 Requested changes and query optimization by:guillermo
|
||||||
|
- feat: refs #7266 Version by:guillermo
|
||||||
|
- feat: refs #7289 #7289 apply option 1 by:Javier Segarra
|
||||||
|
- feat: refs #7289 #7289 remove bad translation by:Javier Segarra
|
||||||
|
- feat: refs #7524 restrict fields by:jorgep
|
||||||
|
- feat: refs #7641 fine tunning by:jorgep
|
||||||
|
- feat: refs #7641 improve style by:jorgep
|
||||||
|
- feat: refs #7743 add simple spec for sendMail by:pablone
|
||||||
|
- feat: refs #7743 add try catch stmt to the test by:pablone
|
||||||
|
- feat: refs #7874 add default type by:jorgep
|
||||||
|
- feat: refs #7874 use name by:jorgep
|
||||||
|
- feat: refs #7920 Added ItemShelving in shelvingLog by:guillermo
|
||||||
|
- feat: refs #7921 refs#7921 sendLostExpedition by:sergiodt
|
||||||
|
- feat: refs #7922 refs #792 scanOrder by:sergiodt
|
||||||
|
- feat: refs #7943 quitar lectura en metodos comunes by:jgallego
|
||||||
|
- feat: refs #7943 return just the required content by:jorgep
|
||||||
|
- feat: refs #7943 usa back con permisos by:jgallego
|
||||||
|
- feat: refs #8020 machineWorkerDeprecated by:sergiodt
|
||||||
|
- feat: refs #8057 Added data updates by:guillermo
|
||||||
|
- feat: refs #8057 Added data updates (origin/8057-geoFk) by:guillermo
|
||||||
|
- feat: refs #8057 Added geoFk columns by:guillermo
|
||||||
|
- feat: refs #8057 Fix version by:guillermo
|
||||||
|
- feat: refs #8057 More precision in getGeo by:guillermo
|
||||||
|
- feat: refs #8057 Requested changes by:guillermo
|
||||||
|
- feat: refs #8071 quitar esquema by:robert
|
||||||
|
- feat: refs #8071 travel_weeklyClone by:robert
|
||||||
|
- feat: refs #8080 Added column comment by:guillermo
|
||||||
|
- feat: refs #8083 add prop by:jorgep
|
||||||
|
- feat: refs #8087 Traspasar redadas a travels by:Carlos Andrés
|
||||||
|
- feat: refs #8099 refs#8099 addComplmentSalary by:sergiodt
|
||||||
|
- feat: refs #8124 Enrutadores nuevos requerimientos by:Carlos Andrés
|
||||||
|
- feat: refs #8124 Enrutadores nuevos requerimientos (origin/8124-enrutadoresNuevosRequerimientos) by:Carlos Andrés
|
||||||
|
- feat: refs #8127 entry_getCommission by:robert
|
||||||
|
- feat: refs #8127 quitar esquemas by:robert
|
||||||
|
- feat: refs #8135 refs#8135 updateTicketACL (origin/8135-ticketACL) by:sergiodt
|
||||||
|
- feat: refs #8143 deprecate recoverPass and sync from account.user by:ivanm
|
||||||
|
- feat: refs #8150 movExpeditions by:sergiodt
|
||||||
|
- feat: refs #8151 Added test by:guillermo
|
||||||
|
- feat: refs #8151 moveExpeditions by:guillermo
|
||||||
|
- feat: refs #8151 Requested changes by:guillermo
|
||||||
|
- feat(Supplier): refs #6828 add companySize by:alexm
|
||||||
|
- refactor: refs #7641 entry report style by:jorgep
|
||||||
|
|
||||||
|
### Changed 📦
|
||||||
|
|
||||||
|
- refactor: refs #6920 add correct role by:alexm
|
||||||
|
- refactor: refs #7242 Deleted select column by:guillermo
|
||||||
|
- refactor: refs #7457 Added from param if not exists by:guillermo
|
||||||
|
- refactor: refs #7641 entry report style by:jorgep
|
||||||
|
- refactor: refs #7715 Deleted hasNewLabelMrwMethod column by:guillermo
|
||||||
|
- refactor: refs #7920 Fix tests by:guillermo
|
||||||
|
- refactor: refs #7920 Fix version by:guillermo
|
||||||
|
- refactor: refs #7920 itemShelvingLog by:guillermo
|
||||||
|
- refactor: refs #7920 Main change by:guillermo
|
||||||
|
- refactor: refs #7920 Major changes by:guillermo
|
||||||
|
- refactor: refs #7920 No changes in itemShelvingLog table by:guillermo
|
||||||
|
- refactor: refs #7920 Requested changes by:guillermo
|
||||||
|
- refactor: refs #7950 Created cmr model (7950-cmrModelUnify) by:guillermo
|
||||||
|
- refactor: refs #7950 Requested changes by:guillermo
|
||||||
|
- refactor: refs #8153 Optimized order_getTax by:guillermo
|
||||||
|
|
||||||
|
### Fixed 🛠️
|
||||||
|
|
||||||
|
- fix: clean deletes also zoneEvent range records by:jgallego
|
||||||
|
- fix: more data for fixture.before by:Pako
|
||||||
|
- fix: refs #4948 Tests by:guillermo
|
||||||
|
- fix: refs #6644 email and translations by:carlossa
|
||||||
|
- fix: refs #6818 add config by:jorgep
|
||||||
|
- fix: refs #6818 add defaultChannel by:jorgep
|
||||||
|
- fix: refs #6818 use right col type by:jorgep
|
||||||
|
- fix: refs #6869 use id as primaryKey by:jorgep
|
||||||
|
- fix: refs #7244 Added collection ACL by:guillermo
|
||||||
|
- fix: refs #7283 item filters by:carlossa
|
||||||
|
- fix: refs #7283 remove by:carlossa
|
||||||
|
- fix: refs #7283 remove tests by:carlossa
|
||||||
|
- fix: refs #7283 tback by:carlossa
|
||||||
|
- fix: refs #7323 add remaining fields (origin/7323-warfix-addRemainingFields) by:jorgep
|
||||||
|
- fix: refs #7457 add with on select to reduce by:pablone
|
||||||
|
- fix: refs #7457 empty commit for gitea by:pablone
|
||||||
|
- fix: refs #7457 error on empty from param and add translate by:pablone
|
||||||
|
- fix: refs #7457 remove group by calc time reduce bellow 1s by:pablone
|
||||||
|
- fix: refs #7457 remove translate and use param definition for restriction by:pablone
|
||||||
|
- fix: refs #7641 align columns by:jorgep
|
||||||
|
- fix: refs #7641 drop boilerplate code by:jorgep
|
||||||
|
- fix: refs #7920 refs#7920 itemShelvingLog by:sergiodt
|
||||||
|
- fix: refs #8153 Version by:guillermo
|
||||||
|
- revert cd7ed6987a88e00275b562d3248f368b6333620c by:Javier Segarra
|
||||||
|
|
||||||
# Version 24.38 - 2024-09-17
|
# Version 24.38 - 2024-09-17
|
||||||
|
|
||||||
### Added 🆕
|
### Added 🆕
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`expedition_selfConsum
|
||||||
vSelf INT,
|
vSelf INT,
|
||||||
vAction ENUM('add', 'remove')
|
vAction ENUM('add', 'remove')
|
||||||
)
|
)
|
||||||
BEGIN
|
proc:BEGIN
|
||||||
/**
|
/**
|
||||||
* Maneja el consumo de cajas para autoconsumo, permitiendo
|
* Maneja el consumo de cajas para autoconsumo, permitiendo
|
||||||
* añadir o quitar cajas utilizadas según la acción indicada.
|
* añadir o quitar cajas utilizadas según la acción indicada.
|
||||||
|
|
@ -37,14 +37,14 @@ BEGIN
|
||||||
vWarehouseFk,
|
vWarehouseFk,
|
||||||
vCreated
|
vCreated
|
||||||
FROM expedition e
|
FROM expedition e
|
||||||
JOIN packaging p ON p.id = e.packagingFk
|
LEFT JOIN packaging p ON p.id = e.packagingFk
|
||||||
JOIN item i ON i.id = p.itemFk
|
LEFT JOIN item i ON i.id = p.itemFk
|
||||||
JOIN ticket t ON t.id = e.ticketFk
|
JOIN ticket t ON t.id = e.ticketFk
|
||||||
JOIN productionConfig pc
|
JOIN productionConfig pc
|
||||||
WHERE e.id = vSelf;
|
WHERE e.id = vSelf;
|
||||||
|
|
||||||
IF vClientFk IS NULL OR vAddressFk IS NULL THEN
|
IF vClientFk IS NULL OR vItemFk IS NULL THEN
|
||||||
CALL util.throw('Some config parameters are not set');
|
LEAVE proc;
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SET vCreated = DATE(vCreated);
|
SET vCreated = DATE(vCreated);
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ BEGIN
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN vehicle v ON v.id = r.vehicleFk
|
JOIN vehicle v ON v.id = r.vehicleFk
|
||||||
JOIN routeConfig rc
|
JOIN routeConfig rc
|
||||||
LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
|
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
|
||||||
WHERE r.id = vSelf
|
WHERE r.id = vSelf
|
||||||
AND r.workerFk
|
AND r.workerFk
|
||||||
AND r.commissionWorkCenterFk;
|
AND r.commissionWorkCenterFk;
|
||||||
|
|
@ -103,7 +103,7 @@ BEGIN
|
||||||
FROM route r
|
FROM route r
|
||||||
JOIN vehicle v ON v.id = r.vehicleFk
|
JOIN vehicle v ON v.id = r.vehicleFk
|
||||||
JOIN routeConfig rc
|
JOIN routeConfig rc
|
||||||
LEFT JOIN workCenterCommission wc ON wc.workCenter = r.workCenterFk
|
LEFT JOIN workCenterCommission wc ON wc.workCenterFk = r.commissionWorkCenterFk
|
||||||
WHERE r.id = vSelf
|
WHERE r.id = vSelf
|
||||||
AND r.kmStart
|
AND r.kmStart
|
||||||
AND r.kmEnd
|
AND r.kmEnd
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,10 @@ BEGIN
|
||||||
CALL travel_throwAwb(NEW.travelFk);
|
CALL travel_throwAwb(NEW.travelFk);
|
||||||
END IF;
|
END IF;
|
||||||
|
|
||||||
SELECT isRaid INTO vIsRaid
|
SELECT t.isRaid INTO vIsRaid
|
||||||
FROM travel t
|
FROM travel t
|
||||||
JOIN entry e ON e.travelFk = t.id
|
JOIN entry e ON e.travelFk = t.id
|
||||||
WHERE entryFk = NEW.id;
|
WHERE e.id = NEW.id;
|
||||||
|
|
||||||
SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
|
SELECT NOT (o.warehouseInFk <=> n.warehouseInFk)
|
||||||
OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
|
OR NOT (o.warehouseOutFk <=> n.warehouseOutFk)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue