Merge branch 'dev' into 7884-AddLabelerField

CHANGELOG.md

@@ -1,3 +1,89 @@
+# Version 24.38 - 2024-09-17
+
+### Added 🆕
+
+- chore: refs #7323 filter data  by:jorgep
+- chore: refs #7323 fix test  by:jorgep
+- chore: refs #7323 worker changes  by:jorgep
+- chore: refs #7323 worker changes wip  by:jorgep
+- chore: refs #7524 add select limit  by:jorgep
+- feat(AccessToken&ACL): refs #7547 upgrade security  by:alexm
+- feat: deleted code and redirect to Lilium  by:Jon
+- feat: refs #4515 New throw buy_checkItem  by:guillermo
+- feat: refs #6650 Added saleGroupLog  by:guillermo
+- feat: refs #6650 new itemShelvingLog  by:guillermo
+- feat: refs #6760 refs #actualiza campo nickname  by:jgallego
+- feat: refs #7277 fdescribe  by:jgallego
+- feat: refs #7277 fit  by:jgallego
+- feat: refs #7277 refundInvoices  by:jgallego
+- feat: refs #7277 test with warehouse  by:jgallego
+- feat: refs #7277 traducciones  by:jgallego
+- feat: refs #7277 transfer addressFk  by:jgallego
+- feat: refs #7532 Requested changes  by:guillermo
+- feat: refs #7564 Added proc  by:guillermo
+- feat: refs #7564 Added ticket_setVolumeItemCost  by:guillermo
+- feat: refs #7564 Added volume column  by:guillermo
+- feat: refs #7564 Fix version  by:guillermo
+- feat: refs #7564 Requested changes  by:guillermo
+- feat: refs #7615 setDeleted  by:robert
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- feat: refs #7650 Fix tests  by:guillermo
+- feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval  by:ivanm
+- feat: refs #7759 Changed defined only of vn objects  by:guillermo
+- feat: refs #7759 Changed definer root to vn-admin  by:guillermo
+- feat: refs #7759 Changed name  by:guillermo
+- feat: refs #7759 Deleted version 11163-maroonEucalyptus  by:guillermo
+- feat: refs #7759 Revoke routine grants vn  by:guillermo
+- feat: refs #7811 Added comment  by:guillermo
+- feat: refs #7811 Added new params in datasources.json  by:guillermo
+- feat: refs #7898 Add column "floor" in vn.parking  by:ivanm
+- feat: refs #7898 Modify default  by:ivanm
+- feat: refs #7905 Added new method getBuysCsv  by:guillermo
+- feat: refs #7905 Added param toCsv  by:guillermo
+- feat: refs #7938 remove unnecessary insert in clientLog  by:alexm
+- feat: refs #7953 pullinfo  (7953-devToTest_2438) by:alexm
+- feat(salix): #7671 define isDestiny field in model  by:Javier Segarra
+- feat(salix): refs #7896 update version and changelog  (origin/7896_down_devToTest_2436) by:Javier Segarra
+- feat(salix): refs #7905 #7905 use getBuys toCSV flattened  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates to present  by:Javier Segarra
+- feat: ticket 215005 Changed acl show transferClient  by:guillermo
+
+### Changed 📦
+
+- perf: refs #7671 improve showBadDates  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refactor: deleted e2e & added back descriptor and summary  by:Jon
+
+### Fixed 🛠️
+
+- chore: refs #7323 fix test  by:jorgep
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- fix  by:guillermo
+- fixes: refs #7760 collection problems  by:Carlos Andrés
+- fix merge dev  (7407-workerMedical) by:alexm
+- fix: refs #6727 No delete log tables data in clean procedures  by:guillermo
+- fix: refs #6897 back and tests  by:carlossa
+- fix: refs #6897 back  by:carlossa
+- fix: refs #6897 fix filter  by:carlossa
+- fix: refs #6897 fix json  by:carlossa
+- fix: refs #6897 travel filter  by:carlossa
+- fix: refs #6897 error test  by:jgallego
+- fix: refs #7323 fetch from right source  by:jorgep
+- fix: refs #7564 Deleted query  by:guillermo
+- fix: refs #7759 Added user 'vn'@'localhost' & grants  by:guillermo
+- fix: refs #7760 collection problems  by:Carlos Andrés
+- fix: refs #7760 tmp.ticketIPT  by:Carlos Andrés
+- fix: refs #7905 added comments to flatten.js  by:guillermo
+- fix: refs ##7905 Handle error  by:guillermo
+- fix(salix): refs #7905 #7905 use right fn to flatten data  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refs #6898 fix supplier remove  by:carlossa
+- refs #7407 fix acls fixtures  by:carlossa
+- test: fix connections e2e  (7547-accessToken-security) by:alexm
+- test: refs #7277 fix test proposal  by:Javier Segarra
+- test(salix): refs #7671 #7671 improve and revert where changes  by:Javier Segarra
+
 # Version 24.36 - 2024-09-03
 
 ### Added 🆕

db/dump/dump.after.sql

@@ -4,7 +4,9 @@ GRANT SELECT,
         INSERT,
         UPDATE,
         DELETE,
+        DROP,
         CREATE TEMPORARY TABLES,
         EXECUTE,
+        EVENT,
         TRIGGER
     ON *.* TO 'vn'@'localhost';

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -73,14 +73,16 @@ BEGIN
 		SET s.ticketFk = stm.ticketFk
 		WHERE stm.ticketFk;
 
-	DROP TEMPORARY TABLE tSalesToMove;
-
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
 		ticketFk INT,
 		itemPackingTypeFk VARCHAR(1)
-	) ENGINE=MEMORY;
+	) ENGINE=MEMORY
 		SELECT ticketFk, itemPackingTypeFk
 			FROM tSalesToMove
-			GROUP BY ticketFk;
+			GROUP BY ticketFk
+		UNION
+		SELECT vSelf, vOriginalItemPackingTypeFk;
+
+	DROP TEMPORARY TABLE tSalesToMove;
 END$$
 DELIMITER ;

db/versions/11088-bronzeAspidistra/00-firstScript.sql

@@ -1,10 +1,10 @@
 ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY IF EXISTS collectionWagonTicket_tray;
 ALTER TABLE vn.wagonConfig DROP FOREIGN KEY IF EXISTS wagonConfig_wagonTypeColor_FK;
 CREATE OR REPLACE TABLE vn.wagonTypeTray (
-	id INT(11) UNSIGNED,
-	wagonTypeFk INT(11) unsigned NULL,
+	id INT(11) UNSIGNED auto_increment,
+	wagonTypeFk INT(11) UNSIGNED NULL,
 	height INT(11) UNSIGNED NULL,
-	wagonTypeColorFk int(11) unsigned NULL,
+	wagonTypeColorFk int(11) UNSIGNED NULL,
 	CONSTRAINT wagonTypeTray_pk PRIMARY KEY (id),
 	CONSTRAINT wagonTypeTray_wagonType_FK FOREIGN KEY (wagonTypeFk) REFERENCES vn.wagonType(id) ON DELETE CASCADE ON UPDATE RESTRICT,
 	CONSTRAINT wagonTypeTray_wagonTypeColor_FK FOREIGN KEY (wagonTypeColorFk) REFERENCES vn.wagonTypeColor(id)
@@ -14,6 +14,6 @@ DEFAULT CHARSET=utf8mb3
 COLLATE=utf8mb3_unicode_ci;
 
 ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultHeight INT UNSIGNED DEFAULT 0 NULL COMMENT 'Default height in cm for a base tray';
-ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultTrayColorFk int(11) unsigned NULL COMMENT 'Default color for a base tray';
+ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultTrayColorFk int(11) UNSIGNED NULL COMMENT 'Default color for a base tray';
 ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_wagonTypeColor_FK FOREIGN KEY (defaultTrayColorFk) REFERENCES vn.wagonTypeColor(id);
 ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_tray FOREIGN KEY (trayFk) REFERENCES vn.wagonTypeTray(id);

db/versions/11235-purpleCordyline/00-firstScript.sql

@@ -0,0 +1,12 @@
+ALTER TABLE vn.collectionWagon DROP FOREIGN KEY IF EXISTS collectionWagon_FK_1;
+ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY IF EXISTS collectionWagonTicket_FK_1;
+ALTER TABLE vn.wagonVolumetry DROP FOREIGN KEY IF EXISTS wagonVolumetry_FK_1;
+
+ALTER TABLE vn.wagon MODIFY COLUMN id int(11) unsigned auto_increment NOT NULL COMMENT '26 letras de alfabeto inglés';
+ALTER TABLE vn.collectionWagon MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+ALTER TABLE vn.collectionWagonTicket MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+ALTER TABLE vn.wagonVolumetry MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+
+ALTER TABLE vn.collectionWagon ADD CONSTRAINT collectionWagon_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.wagonVolumetry ADD CONSTRAINT wagonVolumetry_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;