From 0585080303f72750987698c299e4d716ca13890f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 20 Jul 2023 09:26:40 +0200
Subject: [PATCH] refs #6011 deploy 2330 version

---
 CHANGELOG.md                                    | 5 +++++
 db/changes/232401/00-ACLgetVehiclesSorted.sql   | 3 ---
 db/changes/{232801 => 233001}/00-roadmap.sql    | 2 --
 db/changes/{232801 => 233001}/00-roadmapACL.sql | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 db/changes/232401/00-ACLgetVehiclesSorted.sql
 rename db/changes/{232801 => 233001}/00-roadmap.sql (69%)
 rename db/changes/{232801 => 233001}/00-roadmapACL.sql (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76527ac83..847275825 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2330.01] - 2023-07-27
 
 ### Added
+- (Artículos -> Vista Previa) Añadido campo "Plástico reciclado"
+- (Rutas -> Troncales) Nueva sección
+- (Tickets -> Opciones) Opción establecer peso
 
 ### Changed
+- (General -> Iconos) Añadidos nuevos iconos
+
 
 ### Fixed
 
diff --git a/db/changes/232401/00-ACLgetVehiclesSorted.sql b/db/changes/232401/00-ACLgetVehiclesSorted.sql
deleted file mode 100644
index 6625f0d5c..000000000
--- a/db/changes/232401/00-ACLgetVehiclesSorted.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalId`)
-    VALUES
-        ('Vehicle','sorted','WRITE','ALLOW','employee');
\ No newline at end of file
diff --git a/db/changes/232801/00-roadmap.sql b/db/changes/233001/00-roadmap.sql
similarity index 69%
rename from db/changes/232801/00-roadmap.sql
rename to db/changes/233001/00-roadmap.sql
index a2835160f..9b5db54eb 100644
--- a/db/changes/232801/00-roadmap.sql
+++ b/db/changes/233001/00-roadmap.sql
@@ -6,5 +6,3 @@ ALTER TABLE `vn`.`roadmap` CHANGE name name varchar(45) CHARACTER SET utf8mb3 CO
 ALTER TABLE `vn`.`roadmap` MODIFY COLUMN etd datetime NOT NULL;
 
 ALTER TABLE `vn`.`expeditionTruck` COMMENT='Distintas paradas que hacen los trocales';
-ALTER TABLE `vn`.`expeditionTruck` DROP FOREIGN KEY expeditionTruck_FK_2;
-ALTER TABLE `vn`.`expeditionTruck` ADD CONSTRAINT expeditionTruck_FK_2 FOREIGN KEY (roadmapFk) REFERENCES vn.roadmap(id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/db/changes/232801/00-roadmapACL.sql b/db/changes/233001/00-roadmapACL.sql
similarity index 100%
rename from db/changes/232801/00-roadmapACL.sql
rename to db/changes/233001/00-roadmapACL.sql