From 8ea3c98a13a01c2992237aa2ca30ce3c8e1e60e4 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 29 Jan 2024 09:12:29 +0100
Subject: [PATCH 01/15] refs #6372 feat: vn2008 to vn

---
 .../triggers/movement_label_afterUpdate.sql   |   8 -
 db/routines/vn2008/views/Rutas_Master         |  24 ---
 .../vn2008/views/financialProductType.sql     |   4 +
 db/routines/vn2008/views/flight.sql           |  13 ++
 db/routines/vn2008/views/gastos_resumen.sql   |  11 ++
 db/routines/vn2008/views/integra2.sql         |   9 +
 .../vn2008/views/integra2_province.sql        |   8 +
 db/routines/vn2008/views/link.sql             |   8 +
 db/routines/vn2008/views/warehouse_pickup.sql |   9 +
 .../01-financialProductType.sql               |   1 +
 db/versions/10836-limeCordyline/02-flight.sql |   7 +
 .../10836-limeCordyline/03-gastos_resumen.sql |  17 ++
 .../10836-limeCordyline/04-integra2.sql       |  10 ++
 .../05-integra2_province.sql                  |   4 +
 .../06-intervalos__delete.sql                 |   1 +
 db/versions/10836-limeCordyline/09-link.sql   |  11 ++
 .../10-mail_templates__delete.sql             |   1 +
 .../12-ticket_location__delete.sql            |   1 +
 .../10836-limeCordyline/13-turn__delete.sql   |   1 +
 .../25-warehouse_pickup.sql                   |   5 +
 db/versions/10836-limeCordyline/29-kk.sql     | 155 ++++++++++++++++++
 .../10836-limeCordyline/30-permissions.sql    |  36 ++++
 22 files changed, 312 insertions(+), 32 deletions(-)
 delete mode 100644 db/routines/vn2008/triggers/movement_label_afterUpdate.sql
 delete mode 100644 db/routines/vn2008/views/Rutas_Master
 create mode 100644 db/routines/vn2008/views/financialProductType.sql
 create mode 100644 db/routines/vn2008/views/flight.sql
 create mode 100644 db/routines/vn2008/views/gastos_resumen.sql
 create mode 100644 db/routines/vn2008/views/integra2.sql
 create mode 100644 db/routines/vn2008/views/integra2_province.sql
 create mode 100644 db/routines/vn2008/views/link.sql
 create mode 100644 db/routines/vn2008/views/warehouse_pickup.sql
 create mode 100644 db/versions/10836-limeCordyline/01-financialProductType.sql
 create mode 100644 db/versions/10836-limeCordyline/02-flight.sql
 create mode 100644 db/versions/10836-limeCordyline/03-gastos_resumen.sql
 create mode 100644 db/versions/10836-limeCordyline/04-integra2.sql
 create mode 100644 db/versions/10836-limeCordyline/05-integra2_province.sql
 create mode 100644 db/versions/10836-limeCordyline/06-intervalos__delete.sql
 create mode 100644 db/versions/10836-limeCordyline/09-link.sql
 create mode 100644 db/versions/10836-limeCordyline/10-mail_templates__delete.sql
 create mode 100644 db/versions/10836-limeCordyline/12-ticket_location__delete.sql
 create mode 100644 db/versions/10836-limeCordyline/13-turn__delete.sql
 create mode 100644 db/versions/10836-limeCordyline/25-warehouse_pickup.sql
 create mode 100644 db/versions/10836-limeCordyline/29-kk.sql
 create mode 100644 db/versions/10836-limeCordyline/30-permissions.sql

diff --git a/db/routines/vn2008/triggers/movement_label_afterUpdate.sql b/db/routines/vn2008/triggers/movement_label_afterUpdate.sql
deleted file mode 100644
index 364568fb3..000000000
--- a/db/routines/vn2008/triggers/movement_label_afterUpdate.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`movement_label_afterUpdate`
-	AFTER UPDATE ON `movement_label`
-	FOR EACH ROW
-IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
-	UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
-END IF$$
-DELIMITER ;
diff --git a/db/routines/vn2008/views/Rutas_Master b/db/routines/vn2008/views/Rutas_Master
deleted file mode 100644
index 03b9cfc21..000000000
--- a/db/routines/vn2008/views/Rutas_Master
+++ /dev/null
@@ -1,24 +0,0 @@
-
-CREATE OR REPLACE DEFINER = `root`@`localhost`
-    SQL SECURITY DEFINER
-    VIEW `vn2008`.`Rutas_Master` 
-AS SELECT 
-    `rm`.`id` AS `id`,
-    `rm`.`warehoseFk` AS `warehouse_id`,
-    `rm`.`km` AS `km`,
-    `rm`.`packages` AS `bultos`,
-    `rm`.`vehicleCost` AS `vehiculos_coste`,
-    `rm`.`staffCost` AS `personal_coste`,
-    `rm`.`vehicle` AS `vehiculos_numero`,
-    `rm`.`staff` AS `personal_numero`,
-    `rm`.`fuel` AS `gasoil`,
-    `rm`.`freelancers` AS `autonomos`,
-    `rm`.`year` AS `año`,
-    `rm`.`mounth` AS `mes`,
-    `rm`.`expense` AS `gastos`,
-    `rm`.`freelancersPackages` AS `bultos_autonomos`,
-    `rm`.`kmCost` AS `coste_km`,
-    `rm`.`packageCost` AS `coste_bulto`,
-    `rm`.`freelancerPackageCost` AS `coste_bulto_autonomo` ,
-    `rm`.`created` AS `odbc_date`
-    FROM `vn`.`routeMaster` `rm`
\ No newline at end of file
diff --git a/db/routines/vn2008/views/financialProductType.sql b/db/routines/vn2008/views/financialProductType.sql
new file mode 100644
index 000000000..89a063856
--- /dev/null
+++ b/db/routines/vn2008/views/financialProductType.sql
@@ -0,0 +1,4 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`financialProductType`AS 
+    SELECT * FROM vn.financialProductType;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/flight.sql b/db/routines/vn2008/views/flight.sql
new file mode 100644
index 000000000..e671801c0
--- /dev/null
+++ b/db/routines/vn2008/views/flight.sql
@@ -0,0 +1,13 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`flight` 
+AS SELECT
+	`f`.`id` AS `flight_id`,
+	`f`.`duration` AS `duration`,
+	`f`.`route` AS `route`,
+	`f`.`days` AS `days`,
+	`f`.`airlineFk` AS `airline_id`,
+	`f`.`airportOutFk` AS `airport_out`,
+	`f`.`airportInFk` AS `airport_in`
+FROM
+	`vn`.`flight` `f`;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/gastos_resumen.sql b/db/routines/vn2008/views/gastos_resumen.sql
new file mode 100644
index 000000000..1b6b6d877
--- /dev/null
+++ b/db/routines/vn2008/views/gastos_resumen.sql
@@ -0,0 +1,11 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`gastos_resumen` 
+AS SELECT
+	`es`.`expenseFk` AS `Id_Gasto`,
+	`es`.`year` AS `year`,
+	`es`.`month` AS `month`,
+	`es`.`amount` AS `importe`,
+	`es`.`companyFk` AS `empresa_id`
+FROM
+	`vn`.`expenseSummary` `es`;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/integra2.sql b/db/routines/vn2008/views/integra2.sql
new file mode 100644
index 000000000..05840d6bb
--- /dev/null
+++ b/db/routines/vn2008/views/integra2.sql
@@ -0,0 +1,9 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`integra2` 
+AS SELECT
+	`i2`.`postCode` AS `postal_code`,
+	`i2`.`frequency` AS `frequency`,
+	`i2`.`warehouseFk` AS `warehouse_id`
+FROM
+	`vn`.`integra2` `i2`;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/integra2_province.sql b/db/routines/vn2008/views/integra2_province.sql
new file mode 100644
index 000000000..bc099adb3
--- /dev/null
+++ b/db/routines/vn2008/views/integra2_province.sql
@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`integra2_province` 
+AS SELECT
+	`ip`.`provinceFk` AS `province_id`,
+	`ip`.`franchise` AS `franquicia`
+FROM
+	`vn`.`integra2Province` `ip`;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/link.sql b/db/routines/vn2008/views/link.sql
new file mode 100644
index 000000000..f5fb9bd2b
--- /dev/null
+++ b/db/routines/vn2008/views/link.sql
@@ -0,0 +1,8 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`link` 
+AS SELECT
+	`l`.`clientFk` AS `Id_Cliente`,
+	`l`.`supplierFk` AS `Id_Proveedor`
+FROM
+	`vn`.`link` `l`;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/warehouse_pickup.sql b/db/routines/vn2008/views/warehouse_pickup.sql
new file mode 100644
index 000000000..c3a7268a1
--- /dev/null
+++ b/db/routines/vn2008/views/warehouse_pickup.sql
@@ -0,0 +1,9 @@
+
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`warehouse_pickup` 
+AS SELECT
+	`wp`.`warehouseFk` AS `warehouse_id`,
+	`wp`.`agencyModeFk` AS `agency_id`
+FROM
+	`vn`.`warehousePickup` `wp`;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/01-financialProductType.sql b/db/versions/10836-limeCordyline/01-financialProductType.sql
new file mode 100644
index 000000000..c5d51e015
--- /dev/null
+++ b/db/versions/10836-limeCordyline/01-financialProductType.sql
@@ -0,0 +1 @@
+ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;
diff --git a/db/versions/10836-limeCordyline/02-flight.sql b/db/versions/10836-limeCordyline/02-flight.sql
new file mode 100644
index 000000000..37849d037
--- /dev/null
+++ b/db/versions/10836-limeCordyline/02-flight.sql
@@ -0,0 +1,7 @@
+ALTER TABLE IF EXISTS `vn2008`.`flight` RENAME `vn`.`flight`;
+
+ALTER TABLE IF EXISTS `vn`.`flight` 
+CHANGE COLUMN IF EXISTS `flight_id` `id` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_out` `airportOutFk` varchar(3) NOT NULL,
+CHANGE COLUMN IF EXISTS `airport_in` `airportInFk` varchar(3) NOT NULL;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/03-gastos_resumen.sql b/db/versions/10836-limeCordyline/03-gastos_resumen.sql
new file mode 100644
index 000000000..bfec006fa
--- /dev/null
+++ b/db/versions/10836-limeCordyline/03-gastos_resumen.sql
@@ -0,0 +1,17 @@
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseSummary`;
+
+ALTER TABLE IF EXISTS `vn`.`expenseSummary` 
+CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary COLLATE=utf8mb3_general_ci;
+
+ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN companyFk int(10) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_company_FK FOREIGN KEY (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10836-limeCordyline/04-integra2.sql b/db/versions/10836-limeCordyline/04-integra2.sql
new file mode 100644
index 000000000..663b28d78
--- /dev/null
+++ b/db/versions/10836-limeCordyline/04-integra2.sql
@@ -0,0 +1,10 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2` RENAME `vn`.`integra2`;
+
+ALTER TABLE IF EXISTS `vn`.`integra2` 
+CHANGE COLUMN IF EXISTS `postal_code` `postCode` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `frequency` `frequency` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(6) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.integra2 ADD CONSTRAINT integra2_warehouse_FK 
+FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10836-limeCordyline/05-integra2_province.sql b/db/versions/10836-limeCordyline/05-integra2_province.sql
new file mode 100644
index 000000000..31f8f4156
--- /dev/null
+++ b/db/versions/10836-limeCordyline/05-integra2_province.sql
@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS `vn2008`.`integra2_province` RENAME `vn`.`integra2Province`;
+ALTER TABLE IF EXISTS `vn`.`integra2Province` 
+CHANGE COLUMN IF EXISTS `franquicia` `franchise` varchar(65) NOT NULL,
+CHANGE COLUMN IF EXISTS `province_id` `provinceFk` smallint(6) unsigned NOT NULL;
diff --git a/db/versions/10836-limeCordyline/06-intervalos__delete.sql b/db/versions/10836-limeCordyline/06-intervalos__delete.sql
new file mode 100644
index 000000000..18d4f57ca
--- /dev/null
+++ b/db/versions/10836-limeCordyline/06-intervalos__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.intervalos__;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/09-link.sql b/db/versions/10836-limeCordyline/09-link.sql
new file mode 100644
index 000000000..a1a671270
--- /dev/null
+++ b/db/versions/10836-limeCordyline/09-link.sql
@@ -0,0 +1,11 @@
+ALTER TABLE IF EXISTS `vn2008`.`link` RENAME `vn`.`link`;
+
+ALTER TABLE IF EXISTS `vn`.`link` 
+CHANGE COLUMN IF EXISTS `Id_Cliente` `clientFk` int(11) NOT NULL,
+CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(11) NOT NULL;
+
+ALTER TABLE IF EXISTS vn.link MODIFY COLUMN supplierFk int(10) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.link ADD CONSTRAINT link_client_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE IF EXISTS vn.link ADD CONSTRAINT link_supplier_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10836-limeCordyline/10-mail_templates__delete.sql b/db/versions/10836-limeCordyline/10-mail_templates__delete.sql
new file mode 100644
index 000000000..e30aae925
--- /dev/null
+++ b/db/versions/10836-limeCordyline/10-mail_templates__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.mail_templates__;
diff --git a/db/versions/10836-limeCordyline/12-ticket_location__delete.sql b/db/versions/10836-limeCordyline/12-ticket_location__delete.sql
new file mode 100644
index 000000000..a7dbbfb95
--- /dev/null
+++ b/db/versions/10836-limeCordyline/12-ticket_location__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.ticket_location__;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/13-turn__delete.sql b/db/versions/10836-limeCordyline/13-turn__delete.sql
new file mode 100644
index 000000000..7aa69e57d
--- /dev/null
+++ b/db/versions/10836-limeCordyline/13-turn__delete.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vn2008.turn__;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/25-warehouse_pickup.sql b/db/versions/10836-limeCordyline/25-warehouse_pickup.sql
new file mode 100644
index 000000000..1a2479a43
--- /dev/null
+++ b/db/versions/10836-limeCordyline/25-warehouse_pickup.sql
@@ -0,0 +1,5 @@
+ALTER TABLE IF EXISTS `vn2008`.`warehouse_pickup` RENAME `vn`.`warehousePickup`;
+
+ALTER TABLE IF EXISTS `vn`.`warehousePickup` 
+CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(5) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/29-kk.sql b/db/versions/10836-limeCordyline/29-kk.sql
new file mode 100644
index 000000000..c21980da9
--- /dev/null
+++ b/db/versions/10836-limeCordyline/29-kk.sql
@@ -0,0 +1,155 @@
+ALTER TABLE IF EXISTS vn2008.template_bionic_component RENAME vn2008.template_bionic_component__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_component__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot RENAME vn2008.template_bionic_lot__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_lot__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.template_bionic_price RENAME vn2008.template_bionic_price__;
+ALTER TABLE IF EXISTS vn2008.template_bionic_price__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS RENAME vn2008.tmpNEWTARIFAS__;
+ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter RENAME vn2008.unaryScanFilter__;
+ALTER TABLE IF EXISTS vn2008.unaryScanFilter__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.unary_source RENAME vn2008.unary_source__;
+ALTER TABLE IF EXISTS vn2008.unary_source__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.viaxpress RENAME vn2008.viaxpress__;
+ALTER TABLE IF EXISTS vn2008.viaxpress__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro RENAME vn2008.warehouse_filtro__;
+ALTER TABLE IF EXISTS vn2008.warehouse_filtro__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_group RENAME vn2008.warehouse_group__;
+ALTER TABLE IF EXISTS vn2008.warehouse_group__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_joined RENAME vn2008.warehouse_joined__;
+ALTER TABLE IF EXISTS vn2008.warehouse_joined__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.warehouse_lc RENAME vn2008.warehouse_lc__;
+ALTER TABLE IF EXISTS vn2008.warehouse_lc__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.wh_selection RENAME vn2008.wh_selection__;
+ALTER TABLE IF EXISTS vn2008.wh_selection__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.trolley RENAME vn2008.trolley__;
+ALTER TABLE IF EXISTS vn2008.trolley__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.zones RENAME vn2008.zones__;
+ALTER TABLE IF EXISTS vn2008.zones__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tblIVA RENAME vn2008.tblIVA__;
+ALTER TABLE IF EXISTS vn2008.tblIVA__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.filtros RENAME vn2008.filtros__;
+ALTER TABLE IF EXISTS vn2008.filtros__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.form_query RENAME vn2008.form_query__;
+ALTER TABLE IF EXISTS vn2008.form_query__ COMMENT='refs #6372 @deprecated 2023-11-21;';
+
+ALTER TABLE IF EXISTS vn2008.guillen RENAME vn2008.guillen__;
+ALTER TABLE IF EXISTS vn2008.guillen__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.guillen_carry RENAME vn2008.guillen_carry__;
+ALTER TABLE IF EXISTS vn2008.guillen_carry__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.integra2_escala RENAME vn2008.integra2_escala__;
+ALTER TABLE IF EXISTS vn2008.integra2_escala__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.invoice_observation RENAME vn2008.invoice_observation__;
+ALTER TABLE IF EXISTS vn2008.invoice_observation__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.nichos RENAME vn2008.nichos__;
+ALTER TABLE IF EXISTS vn2008.nichos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones RENAME vn2008.payroll_bonificaciones__;
+ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_daRENAMEs RENAME vn2008.payroll_daRENAMEs__;
+ALTER TABLE IF EXISTS vn2008.payroll_daRENAMEs__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_embargos RENAME vn2008.payroll_embargos__;
+ALTER TABLE IF EXISTS vn2008.payroll_embargos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess RENAME vn2008.payroll_tipobasess__;
+ALTER TABLE IF EXISTS vn2008.payroll_tipobasess__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.preparation_exception RENAME vn2008.preparation_exception__;
+ALTER TABLE IF EXISTS vn2008.preparation_exception__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial RENAME vn2008.payrroll_apEmpresarial__;
+ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rec_translaRENAMEr RENAME vn2008.rec_translaRENAMEr__;
+ALTER TABLE IF EXISTS vn2008.rec_translaRENAMEr__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.recibida_agricola RENAME vn2008.recibida_agricola__;
+ALTER TABLE IF EXISTS vn2008.recibida_agricola__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.rounding RENAME vn2008.rounding__;
+ALTER TABLE IF EXISTS vn2008.rounding__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.scanTree RENAME vn2008.scanTree__;
+ALTER TABLE IF EXISTS vn2008.scanTree__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesRENAME RENAME vn2008.sort_merge_results_ernesRENAME__;
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesRENAME__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.route RENAME vn2008.route__;
+ALTER TABLE IF EXISTS vn2008.route__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+
+ALTER TABLE IF EXISTS vn2008.travel_reserve RENAME vn2008.travel_reserve__;
+ALTER TABLE IF EXISTS vn2008.travel_reserve__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.wks RENAME vn2008.wks__;
+ALTER TABLE IF EXISTS vn2008.wks__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary RENAME vn2008.unary__;
+ALTER TABLE IF EXISTS vn2008.unary__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
+ALTER TABLE IF EXISTS vn2008.unary_scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.widget RENAME vn2008.widget__;
+ALTER TABLE IF EXISTS vn2008.widget__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan RENAME vn2008.scan__;
+ALTER TABLE IF EXISTS vn2008.scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.scan_line RENAME vn2008.scan_line__;
+ALTER TABLE IF EXISTS vn2008.scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.tipsa RENAME vn2008.tipsa__;
+ALTER TABLE IF EXISTS vn2008.tipsa__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.payroll_basess RENAME vn2008.payroll_basess__;
+ALTER TABLE IF EXISTS vn2008.payroll_basess__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.movement_label RENAME vn2008.movement_label__;
+ALTER TABLE IF EXISTS vn2008.movement_label__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.pago_sdc RENAME vn2008.pago_sdc__;
+ALTER TABLE IF EXISTS vn2008.pago_sdc__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.transport RENAME vn2008.transport__;
+ALTER TABLE IF EXISTS vn2008.transport__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.travel_pattern RENAME vn2008.travel_pattern__;
+ALTER TABLE IF EXISTS vn2008.travel_pattern__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.jerarquia RENAME vn2008.jerarquia__;
+ALTER TABLE IF EXISTS vn2008.jerarquia__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.language RENAME vn2008.language__;
+ALTER TABLE IF EXISTS vn2008.language__ COMMENT='refs #6372 @deprecated 2023-12-13;';
diff --git a/db/versions/10836-limeCordyline/30-permissions.sql b/db/versions/10836-limeCordyline/30-permissions.sql
new file mode 100644
index 000000000..c27ee1e88
--- /dev/null
+++ b/db/versions/10836-limeCordyline/30-permissions.sql
@@ -0,0 +1,36 @@
+-- flight
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`flight` AS 
+    SELECT 1;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn2008.flight TO `logistic`;
+GRANT SELECT, INSERT, UPDATE ON TABLE vn.flight TO `logistic`;
+-- integra2_province
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`integra2_province` AS 
+    SELECT 1;
+GRANT SELECT ON TABLE vn2008.integra2_province TO `employee`;
+GRANT SELECT ON TABLE vn.integra2Province TO `employee`;
+-- link
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`link` AS 
+    SELECT 1;
+GRANT SELECT ON TABLE vn2008.link TO `administrative`;
+GRANT SELECT ON TABLE vn.link TO `administrative`;
+GRANT SELECT ON TABLE vn2008.link TO `hr`;
+GRANT SELECT ON TABLE vn.link TO `hr`;
+-- warehouse_pickup
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+VIEW `vn2008`.`warehouse_pickup` AS 
+    SELECT 1;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `logistic`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `logistic`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `claimManager`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `claimManager`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `employee`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `employee`;
+GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `deliveryAssistant`;
+GRANT SELECT ON TABLE vn.warehousePickup TO `deliveryAssistant`;

From abbda268f5b3e7d91adae658d0df0e82c95db08a Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 29 Jan 2024 09:18:11 +0100
Subject: [PATCH 02/15] refs #6372 feat: vn2008 to vn

---
 db/dump/fixtures.after.sql | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/db/dump/fixtures.after.sql b/db/dump/fixtures.after.sql
index 57ccb8626..c8ed8a84a 100644
--- a/db/dump/fixtures.after.sql
+++ b/db/dump/fixtures.after.sql
@@ -139,9 +139,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
 INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
     VALUES (1, 24, 'Ranged weapon longbow 2m', 1.00, NULL, 8.07, 0, 0.00, 0, 0, 0, '2022-07-06 00:00:00', 0);
 */
-INSERT INTO vn2008.zones (zone_id,name,printingOrder)
-    VALUES (1,'zone Test',1);
-
 -- XXX: lab
 
 INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)

From bad00167fa4224169b3685e94386bc72d59e4574 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Wed, 31 Jan 2024 14:50:56 +0100
Subject: [PATCH 03/15] refs #6372 feat: vn2008 to vn

---
 db/routines/vn2008/views/flight.sql           | 6 +++---
 db/versions/10836-limeCordyline/02-flight.sql | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/db/routines/vn2008/views/flight.sql b/db/routines/vn2008/views/flight.sql
index e671801c0..2df5362f7 100644
--- a/db/routines/vn2008/views/flight.sql
+++ b/db/routines/vn2008/views/flight.sql
@@ -4,10 +4,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT
 	`f`.`id` AS `flight_id`,
 	`f`.`duration` AS `duration`,
-	`f`.`route` AS `route`,
+	`f`.`flightPath` AS `route`,
 	`f`.`days` AS `days`,
 	`f`.`airlineFk` AS `airline_id`,
-	`f`.`airportOutFk` AS `airport_out`,
-	`f`.`airportInFk` AS `airport_in`
+	`f`.`airportArrivalFk` AS `airport_out`,
+	`f`.`airportDepartureFk` AS `airport_in`
 FROM
 	`vn`.`flight` `f`;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/02-flight.sql b/db/versions/10836-limeCordyline/02-flight.sql
index 37849d037..657fa2aa1 100644
--- a/db/versions/10836-limeCordyline/02-flight.sql
+++ b/db/versions/10836-limeCordyline/02-flight.sql
@@ -3,5 +3,6 @@ ALTER TABLE IF EXISTS `vn2008`.`flight` RENAME `vn`.`flight`;
 ALTER TABLE IF EXISTS `vn`.`flight` 
 CHANGE COLUMN IF EXISTS `flight_id` `id` varchar(10) NOT NULL,
 CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
-CHANGE COLUMN IF EXISTS `airport_out` `airportOutFk` varchar(3) NOT NULL,
-CHANGE COLUMN IF EXISTS `airport_in` `airportInFk` varchar(3) NOT NULL;
\ No newline at end of file
+CHANGE COLUMN IF EXISTS `route` `flightPath` varchar(20) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `airport_out` `airportArrivalFk` varchar(3) NOT NULL,
+CHANGE COLUMN IF EXISTS `airport_in` `airportDepartureFk` varchar(3) NOT NULL;
\ No newline at end of file

From b7bb1b97847885c24502645a9f01c9454014536f Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Tue, 6 Feb 2024 07:37:33 +0100
Subject: [PATCH 04/15] refs #6372 feat: vn2008 to vn

---
 db/routines/vn2008/views/link.sql                  |  8 --------
 db/versions/10836-limeCordyline/09-link.sql        | 11 -----------
 db/versions/10836-limeCordyline/29-kk.sql          |  3 +++
 db/versions/10836-limeCordyline/30-permissions.sql | 12 ++++--------
 4 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 db/routines/vn2008/views/link.sql
 delete mode 100644 db/versions/10836-limeCordyline/09-link.sql

diff --git a/db/routines/vn2008/views/link.sql b/db/routines/vn2008/views/link.sql
deleted file mode 100644
index f5fb9bd2b..000000000
--- a/db/routines/vn2008/views/link.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`link` 
-AS SELECT
-	`l`.`clientFk` AS `Id_Cliente`,
-	`l`.`supplierFk` AS `Id_Proveedor`
-FROM
-	`vn`.`link` `l`;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/09-link.sql b/db/versions/10836-limeCordyline/09-link.sql
deleted file mode 100644
index a1a671270..000000000
--- a/db/versions/10836-limeCordyline/09-link.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE IF EXISTS `vn2008`.`link` RENAME `vn`.`link`;
-
-ALTER TABLE IF EXISTS `vn`.`link` 
-CHANGE COLUMN IF EXISTS `Id_Cliente` `clientFk` int(11) NOT NULL,
-CHANGE COLUMN IF EXISTS `Id_Proveedor` `supplierFk` int(11) NOT NULL;
-
-ALTER TABLE IF EXISTS vn.link MODIFY COLUMN supplierFk int(10) unsigned NOT NULL;
-
-ALTER TABLE IF EXISTS vn.link ADD CONSTRAINT link_client_FK FOREIGN KEY (clientFk) REFERENCES vn.client(id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE IF EXISTS vn.link ADD CONSTRAINT link_supplier_FK FOREIGN KEY (supplierFk) REFERENCES vn.supplier(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
diff --git a/db/versions/10836-limeCordyline/29-kk.sql b/db/versions/10836-limeCordyline/29-kk.sql
index c21980da9..9ec27358f 100644
--- a/db/versions/10836-limeCordyline/29-kk.sql
+++ b/db/versions/10836-limeCordyline/29-kk.sql
@@ -153,3 +153,6 @@ ALTER TABLE IF EXISTS vn2008.jerarquia__ COMMENT='refs #6372 @deprecated 2023-12
 
 ALTER TABLE IF EXISTS vn2008.language RENAME vn2008.language__;
 ALTER TABLE IF EXISTS vn2008.language__ COMMENT='refs #6372 @deprecated 2023-12-13;';
+
+ALTER TABLE IF EXISTS vn2008.link RENAME vn2008.link__;
+ALTER TABLE IF EXISTS vn2008.link__ COMMENT='refs #6372 @deprecated 2023-12-13;';
diff --git a/db/versions/10836-limeCordyline/30-permissions.sql b/db/versions/10836-limeCordyline/30-permissions.sql
index c27ee1e88..fd7c6c58e 100644
--- a/db/versions/10836-limeCordyline/30-permissions.sql
+++ b/db/versions/10836-limeCordyline/30-permissions.sql
@@ -13,14 +13,10 @@ VIEW `vn2008`.`integra2_province` AS
 GRANT SELECT ON TABLE vn2008.integra2_province TO `employee`;
 GRANT SELECT ON TABLE vn.integra2Province TO `employee`;
 -- link
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-VIEW `vn2008`.`link` AS 
-    SELECT 1;
-GRANT SELECT ON TABLE vn2008.link TO `administrative`;
-GRANT SELECT ON TABLE vn.link TO `administrative`;
-GRANT SELECT ON TABLE vn2008.link TO `hr`;
-GRANT SELECT ON TABLE vn.link TO `hr`;
+
+GRANT SELECT ON TABLE vn.company TO `administrative`;
+GRANT SELECT ON TABLE vn.company TO `hr`;
+
 -- warehouse_pickup
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER

From b712b65d76cd3eb8e41bb52a1fd57439073119ba Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 12 Feb 2024 07:44:40 +0100
Subject: [PATCH 05/15] refs #6372

---
 db/routines/vn/triggers/movementLabel_afterUpdate.sql |  8 ++++++++
 db/routines/vn2008/views/movement_label.sql           | 10 ++++++++++
 db/versions/10836-limeCordyline/14-movement_label.sql |  6 ++++++
 db/versions/10836-limeCordyline/29-kk.sql             |  3 ---
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 db/routines/vn/triggers/movementLabel_afterUpdate.sql
 create mode 100644 db/routines/vn2008/views/movement_label.sql
 create mode 100644 db/versions/10836-limeCordyline/14-movement_label.sql

diff --git a/db/routines/vn/triggers/movementLabel_afterUpdate.sql b/db/routines/vn/triggers/movementLabel_afterUpdate.sql
new file mode 100644
index 000000000..cef8e2b43
--- /dev/null
+++ b/db/routines/vn/triggers/movementLabel_afterUpdate.sql
@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`movementLabel_afterUpdate`
+	AFTER UPDATE ON `vn`.`movementLabel`
+	FOR EACH ROW
+IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
+	UPDATE sale s SET s.isPicked = 1 WHERE s.id = NEW.saleFk;
+END IF$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/movement_label.sql b/db/routines/vn2008/views/movement_label.sql
new file mode 100644
index 000000000..738750507
--- /dev/null
+++ b/db/routines/vn2008/views/movement_label.sql
@@ -0,0 +1,10 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`movement_label` 
+AS SELECT
+	`m`.`saleFk` AS `Id_movimiento`,
+	`m`.`label`,
+	`m`.`stem`,
+	`m`.`created`
+FROM
+	`vn`.`movementLabel` `m`;
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/14-movement_label.sql b/db/versions/10836-limeCordyline/14-movement_label.sql
new file mode 100644
index 000000000..bb762e1ba
--- /dev/null
+++ b/db/versions/10836-limeCordyline/14-movement_label.sql
@@ -0,0 +1,6 @@
+DROP TRIGGER IF EXISTS `vn2008`.`movement_label_au`;
+
+ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`movementLabel`;
+
+ALTER TABLE IF EXISTS `vn`.`movementLabel` 
+CHANGE COLUMN IF EXISTS `Id_movimiento` `saleFk` int(11) NOT NULL;
diff --git a/db/versions/10836-limeCordyline/29-kk.sql b/db/versions/10836-limeCordyline/29-kk.sql
index 9ec27358f..4683ae8a1 100644
--- a/db/versions/10836-limeCordyline/29-kk.sql
+++ b/db/versions/10836-limeCordyline/29-kk.sql
@@ -136,9 +136,6 @@ ALTER TABLE IF EXISTS vn2008.tipsa__ COMMENT='refs #6372 @deprecated 2023-12-13;
 ALTER TABLE IF EXISTS vn2008.payroll_basess RENAME vn2008.payroll_basess__;
 ALTER TABLE IF EXISTS vn2008.payroll_basess__ COMMENT='refs #6372 @deprecated 2023-12-13;';
 
-ALTER TABLE IF EXISTS vn2008.movement_label RENAME vn2008.movement_label__;
-ALTER TABLE IF EXISTS vn2008.movement_label__ COMMENT='refs #6372 @deprecated 2023-12-13;';
-
 ALTER TABLE IF EXISTS vn2008.pago_sdc RENAME vn2008.pago_sdc__;
 ALTER TABLE IF EXISTS vn2008.pago_sdc__ COMMENT='refs #6372 @deprecated 2023-12-13;';
 

From e1567dfb9e2fd64b35c89df60e52fea03014fb84 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 12 Feb 2024 11:20:12 +0100
Subject: [PATCH 06/15] refs #6372

---
 db/routines/vn2008/procedures/clean.sql   |  1 -
 db/versions/10836-limeCordyline/29-kk.sql | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/db/routines/vn2008/procedures/clean.sql b/db/routines/vn2008/procedures/clean.sql
index bd8a324c6..eaaa22c3f 100644
--- a/db/routines/vn2008/procedures/clean.sql
+++ b/db/routines/vn2008/procedures/clean.sql
@@ -53,7 +53,6 @@ proc: BEGIN
 	DELETE FROM cl_main WHERE Fecha < vDate18;
 	DELETE FROM hedera.`order` WHERE date_send < vDate18;
 	DELETE FROM vn.message WHERE sendDate < vDate;
-	DELETE FROM travel_reserve WHERE odbc_date < vDate;
 
 	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
 
diff --git a/db/versions/10836-limeCordyline/29-kk.sql b/db/versions/10836-limeCordyline/29-kk.sql
index 4683ae8a1..201a1c806 100644
--- a/db/versions/10836-limeCordyline/29-kk.sql
+++ b/db/versions/10836-limeCordyline/29-kk.sql
@@ -67,8 +67,8 @@ ALTER TABLE IF EXISTS vn2008.nichos__ COMMENT='refs #6372 @deprecated 2023-11-28
 ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones RENAME vn2008.payroll_bonificaciones__;
 ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
-ALTER TABLE IF EXISTS vn2008.payroll_daRENAMEs RENAME vn2008.payroll_daRENAMEs__;
-ALTER TABLE IF EXISTS vn2008.payroll_daRENAMEs__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+ALTER TABLE IF EXISTS vn2008.payroll_datos RENAME vn2008.payroll_datos__;
+ALTER TABLE IF EXISTS vn2008.payroll_datos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
 ALTER TABLE IF EXISTS vn2008.payroll_embargos RENAME vn2008.payroll_embargos__;
 ALTER TABLE IF EXISTS vn2008.payroll_embargos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
@@ -82,8 +82,8 @@ ALTER TABLE IF EXISTS vn2008.preparation_exception__ COMMENT='refs #6372 @deprec
 ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial RENAME vn2008.payrroll_apEmpresarial__;
 ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
-ALTER TABLE IF EXISTS vn2008.rec_translaRENAMEr RENAME vn2008.rec_translaRENAMEr__;
-ALTER TABLE IF EXISTS vn2008.rec_translaRENAMEr__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+ALTER TABLE IF EXISTS vn2008.rec_translator RENAME vn2008.rec_translator__;
+ALTER TABLE IF EXISTS vn2008.rec_translator__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
 ALTER TABLE IF EXISTS vn2008.recibida_agricola RENAME vn2008.recibida_agricola__;
 ALTER TABLE IF EXISTS vn2008.recibida_agricola__ COMMENT='refs #6372 @deprecated 2023-11-28;';
@@ -94,8 +94,8 @@ ALTER TABLE IF EXISTS vn2008.rounding__ COMMENT='refs #6372 @deprecated 2023-11-
 ALTER TABLE IF EXISTS vn2008.scanTree RENAME vn2008.scanTree__;
 ALTER TABLE IF EXISTS vn2008.scanTree__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
-ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesRENAME RENAME vn2008.sort_merge_results_ernesRENAME__;
-ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesRENAME__ COMMENT='refs #6372 @deprecated 2023-11-28;';
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto RENAME vn2008.sort_merge_results_ernesto__;
+ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto__ COMMENT='refs #6372 @deprecated 2023-11-28;';
 
 ALTER TABLE IF EXISTS vn2008.route RENAME vn2008.route__;
 ALTER TABLE IF EXISTS vn2008.route__ COMMENT='refs #6372 @deprecated 2023-11-28;';

From 37a47edfdc1ef9fa67ab5cf52cf7b0aa653ec74f Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 12 Feb 2024 12:25:58 +0100
Subject: [PATCH 07/15] refs #6372

---
 .../vn/functions/isPalletHomogeneus.sql       | 27 -------------------
 .../vn/views/exchangeInsuranceInPrevious.sql  |  9 -------
 db/routines/vn/views/unaryScanLineBuy.sql     |  6 -----
 .../vn/views/unaryScanLineExpedition.sql      |  6 -----
 db/routines/vn2008/views/pago_sdc.sql         | 16 +++++++++++
 .../10836-limeCordyline/15-pago_sdc.sql       | 11 ++++++++
 6 files changed, 27 insertions(+), 48 deletions(-)
 delete mode 100644 db/routines/vn/functions/isPalletHomogeneus.sql
 delete mode 100644 db/routines/vn/views/exchangeInsuranceInPrevious.sql
 delete mode 100644 db/routines/vn/views/unaryScanLineBuy.sql
 delete mode 100644 db/routines/vn/views/unaryScanLineExpedition.sql
 create mode 100644 db/routines/vn2008/views/pago_sdc.sql
 create mode 100644 db/versions/10836-limeCordyline/15-pago_sdc.sql

diff --git a/db/routines/vn/functions/isPalletHomogeneus.sql b/db/routines/vn/functions/isPalletHomogeneus.sql
deleted file mode 100644
index 39c6461ae..000000000
--- a/db/routines/vn/functions/isPalletHomogeneus.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`isPalletHomogeneus`(vExpedition INT)
-	RETURNS tinyint(1)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	DECLARE vScanId INT;
-	DECLARE vDistinctRoutesInThePallet INT;
-
-	SELECT scan_id INTO vScanId
-		FROM vn2008.scan_line
-		WHERE code = vExpedition
-		LIMIT 1;
-
-		SELECT COUNT(*) INTO vDistinctRoutesInThePallet
-		FROM (
-			SELECT DISTINCT t.Id_Ruta
-			FROM vn2008.scan_line sl
-				JOIN vn2008.expeditions e ON e.expeditions_id = sl.code
-				JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticket_id
-			WHERE sl.scan_id = vScanId
-				AND t.Id_Ruta
-		) t1;
-			
-	RETURN vDistinctRoutesInThePallet = 1;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/views/exchangeInsuranceInPrevious.sql b/db/routines/vn/views/exchangeInsuranceInPrevious.sql
deleted file mode 100644
index 097728bc7..000000000
--- a/db/routines/vn/views/exchangeInsuranceInPrevious.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`exchangeInsuranceInPrevious`
-AS SELECT `ei`.`finished` AS `dated`,
-	`ei`.`amount` AS `amount`,
-	`ei`.`rate` AS `rate`
-FROM `vn`.`exchangeInsurance` `ei`
-WHERE `ei`.`amount` <> 0
-	AND `ei`.`financialProductTypefk` = 'SC'
diff --git a/db/routines/vn/views/unaryScanLineBuy.sql b/db/routines/vn/views/unaryScanLineBuy.sql
deleted file mode 100644
index 26f178a45..000000000
--- a/db/routines/vn/views/unaryScanLineBuy.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineBuy`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`Id_Article` AS `itemFk`
-FROM `vn2008`.`unary_scan_line_buy` `u`
diff --git a/db/routines/vn/views/unaryScanLineExpedition.sql b/db/routines/vn/views/unaryScanLineExpedition.sql
deleted file mode 100644
index e71c2423e..000000000
--- a/db/routines/vn/views/unaryScanLineExpedition.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLineExpedition`
-AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
-	`u`.`expedition_id` AS `expeditionFk`
-FROM `vn2008`.`unary_scan_line_expedition` `u`
diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql
new file mode 100644
index 000000000..0fb6a172d
--- /dev/null
+++ b/db/routines/vn2008/views/pago_sdc.sql
@@ -0,0 +1,16 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn2008`.`pago_sdc`
+AS SELECT `ei`.`id` AS `pago_sdc_id`,
+	`ei`.`amount` AS `importe`,
+	`ei`.`dated` AS `fecha`,
+	`ei`.`finished` AS `vencimiento`,
+	`ei`.`entityFk` AS `entity_id`,
+	`ei`.`ref` AS `ref`,
+	`ei`.`rate` AS `rate`,
+	`ei`.`companyFk` AS `empresa_id`,
+	`ei`.`financialProductTypefk` AS `financialProductTypefk`,
+	`ei`.`upperBarrier` AS `upperBarrier`,
+	`ei`.`lowerBarrier` AS `lowerBarrier`,
+	`ei`.`strike` AS `strike`
+FROM `vn`.`exchangeInsurance` `ei`
\ No newline at end of file
diff --git a/db/versions/10836-limeCordyline/15-pago_sdc.sql b/db/versions/10836-limeCordyline/15-pago_sdc.sql
new file mode 100644
index 000000000..3225e2c4d
--- /dev/null
+++ b/db/versions/10836-limeCordyline/15-pago_sdc.sql
@@ -0,0 +1,11 @@
+DROP VIEW IF EXISTS `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
+
+ALTER TABLE IF EXISTS `vn`.`exchangeInsurance` 
+CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `vencimiento` `finished` date NOT NULL,
+CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;

From fd785ee429bbfe5d1bbeb6cd137a0becb1d12352 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Wed, 14 Feb 2024 11:01:37 +0100
Subject: [PATCH 08/15] refs #6372

---
 db/routines/vn/triggers/movementLabel_afterUpdate.sql | 2 +-
 db/routines/vn2008/views/pago_sdc.sql                 | 2 +-
 db/versions/10836-limeCordyline/15-pago_sdc.sql       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/routines/vn/triggers/movementLabel_afterUpdate.sql b/db/routines/vn/triggers/movementLabel_afterUpdate.sql
index cef8e2b43..7dd8a9eb9 100644
--- a/db/routines/vn/triggers/movementLabel_afterUpdate.sql
+++ b/db/routines/vn/triggers/movementLabel_afterUpdate.sql
@@ -3,6 +3,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`movementLabel_afterUp
 	AFTER UPDATE ON `vn`.`movementLabel`
 	FOR EACH ROW
 IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
-	UPDATE sale s SET s.isPicked = 1 WHERE s.id = NEW.saleFk;
+	UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
 END IF$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql
index 0fb6a172d..3d9f188d3 100644
--- a/db/routines/vn2008/views/pago_sdc.sql
+++ b/db/routines/vn2008/views/pago_sdc.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `vn2008`.`pago_sdc`
 AS SELECT `ei`.`id` AS `pago_sdc_id`,
 	`ei`.`amount` AS `importe`,
-	`ei`.`dated` AS `fecha`,
+	`ei`.`dueDated` AS `fecha`,
 	`ei`.`finished` AS `vencimiento`,
 	`ei`.`entityFk` AS `entity_id`,
 	`ei`.`ref` AS `ref`,
diff --git a/db/versions/10836-limeCordyline/15-pago_sdc.sql b/db/versions/10836-limeCordyline/15-pago_sdc.sql
index 3225e2c4d..002de4adc 100644
--- a/db/versions/10836-limeCordyline/15-pago_sdc.sql
+++ b/db/versions/10836-limeCordyline/15-pago_sdc.sql
@@ -5,7 +5,7 @@ ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
 ALTER TABLE IF EXISTS `vn`.`exchangeInsurance` 
 CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
 CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
-CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dueDated` date NOT NULL,
 CHANGE COLUMN IF EXISTS `vencimiento` `finished` date NOT NULL,
 CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
 CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;

From 04fe6a8596e2e8994aa6b1ff0f0a2187c08e4d3f Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Thu, 15 Feb 2024 13:58:12 +0100
Subject: [PATCH 09/15] refs #6372

---
 db/versions/10836-limeCordyline/14-movement_label.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/versions/10836-limeCordyline/14-movement_label.sql b/db/versions/10836-limeCordyline/14-movement_label.sql
index bb762e1ba..5ce130cf8 100644
--- a/db/versions/10836-limeCordyline/14-movement_label.sql
+++ b/db/versions/10836-limeCordyline/14-movement_label.sql
@@ -1,4 +1,4 @@
-DROP TRIGGER IF EXISTS `vn2008`.`movement_label_au`;
+DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
 
 ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`movementLabel`;
 

From 12f3af68bf6d85bc9cbd2297ef6c03a9cd2205d0 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 19 Feb 2024 11:04:07 +0100
Subject: [PATCH 10/15] refs #6372

---
 db/routines/vn2008/views/pago_sdc.sql           | 2 +-
 db/versions/10836-limeCordyline/15-pago_sdc.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql
index 3d9f188d3..0fb6a172d 100644
--- a/db/routines/vn2008/views/pago_sdc.sql
+++ b/db/routines/vn2008/views/pago_sdc.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `vn2008`.`pago_sdc`
 AS SELECT `ei`.`id` AS `pago_sdc_id`,
 	`ei`.`amount` AS `importe`,
-	`ei`.`dueDated` AS `fecha`,
+	`ei`.`dated` AS `fecha`,
 	`ei`.`finished` AS `vencimiento`,
 	`ei`.`entityFk` AS `entity_id`,
 	`ei`.`ref` AS `ref`,
diff --git a/db/versions/10836-limeCordyline/15-pago_sdc.sql b/db/versions/10836-limeCordyline/15-pago_sdc.sql
index 002de4adc..3225e2c4d 100644
--- a/db/versions/10836-limeCordyline/15-pago_sdc.sql
+++ b/db/versions/10836-limeCordyline/15-pago_sdc.sql
@@ -5,7 +5,7 @@ ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
 ALTER TABLE IF EXISTS `vn`.`exchangeInsurance` 
 CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
 CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
-CHANGE COLUMN IF EXISTS `fecha` `dueDated` date NOT NULL,
+CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
 CHANGE COLUMN IF EXISTS `vencimiento` `finished` date NOT NULL,
 CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
 CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;

From 3d47c9e5e8cfc35a0b80966c4268efc370015ec7 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Mon, 19 Feb 2024 11:27:37 +0100
Subject: [PATCH 11/15] refs #6372

---
 db/routines/vn2008/views/pago_sdc.sql           | 2 +-
 db/versions/10836-limeCordyline/15-pago_sdc.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn2008/views/pago_sdc.sql b/db/routines/vn2008/views/pago_sdc.sql
index 0fb6a172d..29480e376 100644
--- a/db/routines/vn2008/views/pago_sdc.sql
+++ b/db/routines/vn2008/views/pago_sdc.sql
@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `ei`.`id` AS `pago_sdc_id`,
 	`ei`.`amount` AS `importe`,
 	`ei`.`dated` AS `fecha`,
-	`ei`.`finished` AS `vencimiento`,
+	`ei`.`dueDated` AS `vencimiento`,
 	`ei`.`entityFk` AS `entity_id`,
 	`ei`.`ref` AS `ref`,
 	`ei`.`rate` AS `rate`,
diff --git a/db/versions/10836-limeCordyline/15-pago_sdc.sql b/db/versions/10836-limeCordyline/15-pago_sdc.sql
index 3225e2c4d..1b63b9c54 100644
--- a/db/versions/10836-limeCordyline/15-pago_sdc.sql
+++ b/db/versions/10836-limeCordyline/15-pago_sdc.sql
@@ -6,6 +6,6 @@ ALTER TABLE IF EXISTS `vn`.`exchangeInsurance`
 CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
 CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
 CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
-CHANGE COLUMN IF EXISTS `vencimiento` `finished` date NOT NULL,
+CHANGE COLUMN IF EXISTS `vencimiento` `dueDated` date NOT NULL,
 CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
 CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;

From 913e7aa1d8c59fd7144185c3a1e9cfb8c44ad10b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 20 Feb 2024 14:22:07 +0100
Subject: [PATCH 12/15] fix(run): refs #6372 change version

---
 .../10836-limeCordyline/03-gastos_resumen.sql  | 17 -----------------
 .../01-financialProductType.sql                |  0
 .../02-flight.sql                              |  0
 .../10896-salmonOrchid/03-gastos_resumen.sql   | 18 ++++++++++++++++++
 .../04-integra2.sql                            |  0
 .../05-integra2_province.sql                   |  0
 .../06-intervalos__delete.sql                  |  0
 .../10-mail_templates__delete.sql              |  0
 .../12-ticket_location__delete.sql             |  0
 .../13-turn__delete.sql                        |  0
 .../14-movement_label.sql                      |  0
 .../15-pago_sdc.sql                            |  0
 .../25-warehouse_pickup.sql                    |  0
 .../29-kk.sql                                  |  0
 .../30-permissions.sql                         |  0
 15 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 db/versions/10836-limeCordyline/03-gastos_resumen.sql
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/01-financialProductType.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/02-flight.sql (100%)
 create mode 100644 db/versions/10896-salmonOrchid/03-gastos_resumen.sql
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/04-integra2.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/05-integra2_province.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/06-intervalos__delete.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/10-mail_templates__delete.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/12-ticket_location__delete.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/13-turn__delete.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/14-movement_label.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/15-pago_sdc.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/25-warehouse_pickup.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/29-kk.sql (100%)
 rename db/versions/{10836-limeCordyline => 10896-salmonOrchid}/30-permissions.sql (100%)

diff --git a/db/versions/10836-limeCordyline/03-gastos_resumen.sql b/db/versions/10836-limeCordyline/03-gastos_resumen.sql
deleted file mode 100644
index bfec006fa..000000000
--- a/db/versions/10836-limeCordyline/03-gastos_resumen.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseSummary`;
-
-ALTER TABLE IF EXISTS `vn`.`expenseSummary` 
-CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
-CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
-CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
-
-ALTER TABLE IF EXISTS vn.expenseSummary COLLATE=utf8mb3_general_ci;
-
-ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
-
-ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN companyFk int(10) unsigned NOT NULL;
-
-ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_company_FK FOREIGN KEY (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
diff --git a/db/versions/10836-limeCordyline/01-financialProductType.sql b/db/versions/10896-salmonOrchid/01-financialProductType.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/01-financialProductType.sql
rename to db/versions/10896-salmonOrchid/01-financialProductType.sql
diff --git a/db/versions/10836-limeCordyline/02-flight.sql b/db/versions/10896-salmonOrchid/02-flight.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/02-flight.sql
rename to db/versions/10896-salmonOrchid/02-flight.sql
diff --git a/db/versions/10896-salmonOrchid/03-gastos_resumen.sql b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
new file mode 100644
index 000000000..ea14364d5
--- /dev/null
+++ b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
@@ -0,0 +1,18 @@
+ALTER TABLE IF EXISTS vn2008.gastos_resumen DROP FOREIGN KEY IF EXISTS gastos_resumen_expense_FK;
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseSummary`;
+
+ALTER TABLE IF EXISTS `vn`.`expenseSummary` 
+CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
+CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
+CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary COLLATE=utf8mb3_general_ci;
+
+ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
+
+ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+
diff --git a/db/versions/10836-limeCordyline/04-integra2.sql b/db/versions/10896-salmonOrchid/04-integra2.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/04-integra2.sql
rename to db/versions/10896-salmonOrchid/04-integra2.sql
diff --git a/db/versions/10836-limeCordyline/05-integra2_province.sql b/db/versions/10896-salmonOrchid/05-integra2_province.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/05-integra2_province.sql
rename to db/versions/10896-salmonOrchid/05-integra2_province.sql
diff --git a/db/versions/10836-limeCordyline/06-intervalos__delete.sql b/db/versions/10896-salmonOrchid/06-intervalos__delete.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/06-intervalos__delete.sql
rename to db/versions/10896-salmonOrchid/06-intervalos__delete.sql
diff --git a/db/versions/10836-limeCordyline/10-mail_templates__delete.sql b/db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/10-mail_templates__delete.sql
rename to db/versions/10896-salmonOrchid/10-mail_templates__delete.sql
diff --git a/db/versions/10836-limeCordyline/12-ticket_location__delete.sql b/db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/12-ticket_location__delete.sql
rename to db/versions/10896-salmonOrchid/12-ticket_location__delete.sql
diff --git a/db/versions/10836-limeCordyline/13-turn__delete.sql b/db/versions/10896-salmonOrchid/13-turn__delete.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/13-turn__delete.sql
rename to db/versions/10896-salmonOrchid/13-turn__delete.sql
diff --git a/db/versions/10836-limeCordyline/14-movement_label.sql b/db/versions/10896-salmonOrchid/14-movement_label.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/14-movement_label.sql
rename to db/versions/10896-salmonOrchid/14-movement_label.sql
diff --git a/db/versions/10836-limeCordyline/15-pago_sdc.sql b/db/versions/10896-salmonOrchid/15-pago_sdc.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/15-pago_sdc.sql
rename to db/versions/10896-salmonOrchid/15-pago_sdc.sql
diff --git a/db/versions/10836-limeCordyline/25-warehouse_pickup.sql b/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/25-warehouse_pickup.sql
rename to db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
diff --git a/db/versions/10836-limeCordyline/29-kk.sql b/db/versions/10896-salmonOrchid/29-kk.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/29-kk.sql
rename to db/versions/10896-salmonOrchid/29-kk.sql
diff --git a/db/versions/10836-limeCordyline/30-permissions.sql b/db/versions/10896-salmonOrchid/30-permissions.sql
similarity index 100%
rename from db/versions/10836-limeCordyline/30-permissions.sql
rename to db/versions/10896-salmonOrchid/30-permissions.sql

From 1cf17a3d8d3eddb9783e2897c6535351ec0c754e Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Wed, 21 Feb 2024 07:35:57 +0100
Subject: [PATCH 13/15] refs #6372

---
 db/routines/vn2008/views/gastos_resumen.sql        |  2 +-
 .../10896-salmonOrchid/03-gastos_resumen.sql       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/db/routines/vn2008/views/gastos_resumen.sql b/db/routines/vn2008/views/gastos_resumen.sql
index 1b6b6d877..02231bcbf 100644
--- a/db/routines/vn2008/views/gastos_resumen.sql
+++ b/db/routines/vn2008/views/gastos_resumen.sql
@@ -8,4 +8,4 @@ AS SELECT
 	`es`.`amount` AS `importe`,
 	`es`.`companyFk` AS `empresa_id`
 FROM
-	`vn`.`expenseSummary` `es`;
\ No newline at end of file
+	`vn`.`expenseManual` `es`;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/03-gastos_resumen.sql b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
index ea14364d5..5fa1f31fb 100644
--- a/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
+++ b/db/versions/10896-salmonOrchid/03-gastos_resumen.sql
@@ -1,18 +1,18 @@
 ALTER TABLE IF EXISTS vn2008.gastos_resumen DROP FOREIGN KEY IF EXISTS gastos_resumen_expense_FK;
-ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseSummary`;
+ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseManual`;
 
-ALTER TABLE IF EXISTS `vn`.`expenseSummary` 
+ALTER TABLE IF EXISTS `vn`.`expenseManual` 
 CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
 CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
 CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
 
-ALTER TABLE IF EXISTS vn.expenseSummary COLLATE=utf8mb3_general_ci;
+ALTER TABLE IF EXISTS vn.expenseManual COLLATE=utf8mb3_general_ci;
 
-ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
+ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
 
-ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
 
-ALTER TABLE IF EXISTS vn.expenseSummary MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
+ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
 
-ALTER TABLE IF EXISTS vn.expenseSummary ADD CONSTRAINT expenseSummary_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
 

From 5bef3989cd9a7e9accf6883ca1c5e18d13518e3c Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Wed, 21 Feb 2024 14:07:52 +0100
Subject: [PATCH 14/15] refs #6372

---
 ...Label_afterUpdate.sql => saleLabel_afterUpdate.sql} |  4 ++--
 db/routines/vn2008/views/movement_label.sql            | 10 ----------
 db/versions/10896-salmonOrchid/14-movement_label.sql   |  6 ++++--
 db/versions/10896-salmonOrchid/25-warehouse_pickup.sql |  4 +++-
 4 files changed, 9 insertions(+), 15 deletions(-)
 rename db/routines/vn/triggers/{movementLabel_afterUpdate.sql => saleLabel_afterUpdate.sql} (56%)
 delete mode 100644 db/routines/vn2008/views/movement_label.sql

diff --git a/db/routines/vn/triggers/movementLabel_afterUpdate.sql b/db/routines/vn/triggers/saleLabel_afterUpdate.sql
similarity index 56%
rename from db/routines/vn/triggers/movementLabel_afterUpdate.sql
rename to db/routines/vn/triggers/saleLabel_afterUpdate.sql
index 7dd8a9eb9..ff3787358 100644
--- a/db/routines/vn/triggers/movementLabel_afterUpdate.sql
+++ b/db/routines/vn/triggers/saleLabel_afterUpdate.sql
@@ -1,6 +1,6 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`movementLabel_afterUpdate`
-	AFTER UPDATE ON `vn`.`movementLabel`
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleLabel_afterUpdate`
+	AFTER UPDATE ON `vn`.`saleLabel`
 	FOR EACH ROW
 IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
 	UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
diff --git a/db/routines/vn2008/views/movement_label.sql b/db/routines/vn2008/views/movement_label.sql
deleted file mode 100644
index 738750507..000000000
--- a/db/routines/vn2008/views/movement_label.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`movement_label` 
-AS SELECT
-	`m`.`saleFk` AS `Id_movimiento`,
-	`m`.`label`,
-	`m`.`stem`,
-	`m`.`created`
-FROM
-	`vn`.`movementLabel` `m`;
\ No newline at end of file
diff --git a/db/versions/10896-salmonOrchid/14-movement_label.sql b/db/versions/10896-salmonOrchid/14-movement_label.sql
index 5ce130cf8..a3ccf320d 100644
--- a/db/versions/10896-salmonOrchid/14-movement_label.sql
+++ b/db/versions/10896-salmonOrchid/14-movement_label.sql
@@ -1,6 +1,8 @@
 DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
 
-ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`movementLabel`;
+DROP VIEW IF EXISTS `vn`.`saleLabel`;
 
-ALTER TABLE IF EXISTS `vn`.`movementLabel` 
+ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`saleLabel`;
+
+ALTER TABLE IF EXISTS `vn`.`saleLabel` 
 CHANGE COLUMN IF EXISTS `Id_movimiento` `saleFk` int(11) NOT NULL;
diff --git a/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql b/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
index 1a2479a43..d6f2ae18d 100644
--- a/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
+++ b/db/versions/10896-salmonOrchid/25-warehouse_pickup.sql
@@ -2,4 +2,6 @@ ALTER TABLE IF EXISTS `vn2008`.`warehouse_pickup` RENAME `vn`.`warehousePickup`;
 
 ALTER TABLE IF EXISTS `vn`.`warehousePickup` 
 CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(5) unsigned NOT NULL,
-CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
\ No newline at end of file
+CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
+
+ALTER TABLE `vn`.`warehousePickup` COMMENT='Agencia de recogida para cada almacén';

From 5110d6e71d3f26b288e64a18fa5d8f91399792b0 Mon Sep 17 00:00:00 2001
From: davidd <davidd@verdnatura.es>
Date: Thu, 22 Feb 2024 07:09:35 +0100
Subject: [PATCH 15/15] fix error refs #6372

---
 .../00-table.sql                                                  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename db/versions/{10898-6906-workerActivity => 10898-workerActivity}/00-table.sql (100%)

diff --git a/db/versions/10898-6906-workerActivity/00-table.sql b/db/versions/10898-workerActivity/00-table.sql
similarity index 100%
rename from db/versions/10898-6906-workerActivity/00-table.sql
rename to db/versions/10898-workerActivity/00-table.sql