diff --git a/db/changes/10120-december/00-entryBeforeUpdate.sql b/db/changes/10120-december/00-entryBeforeUpdate.sql
index 236fcfffc4..088ea93289 100644
--- a/db/changes/10120-december/00-entryBeforeUpdate.sql
+++ b/db/changes/10120-december/00-entryBeforeUpdate.sql
@@ -5,12 +5,12 @@ CREATE DEFINER=`root`@`%` TRIGGER `vn`.`entry_beforeUpdate`
 	BEFORE UPDATE ON `entry`
     FOR EACH ROW
 BEGIN
-    DECLARE vIsClone BOOL;
+    DECLARE vIsVirtual BOOL;
     DECLARE vPrintedCount INT;
     DECLARE vHasDistinctWarehouses BOOL;
 
 	IF !(NEW.travelFk <=> OLD.travelFk) THEN
-		SELECT COUNT(*) > 0 INTO vIsClone
+		SELECT COUNT(*) > 0 INTO vIsVirtual
 			FROM entryVirtual WHERE entryFk = NEW.id;
 
 		SELECT !(o.warehouseInFk <=> n.warehouseInFk)
@@ -20,7 +20,7 @@ BEGIN
 			WHERE o.id = OLD.travelFk
 				AND n.id = NEW.travelFk;
 
-		IF vIsClone AND vHasDistinctWarehouses THEN
+		IF vIsVirtual AND vHasDistinctWarehouses THEN
 			SIGNAL SQLSTATE '45000'
 				SET MESSAGE_TEXT = 'A cloned entry cannot be moved to a travel with different warehouses';
 		END IF;
diff --git a/db/changes/10120-december/00-invoiceOutBokking.sql b/db/changes/10120-december/00-invoiceOutBokking.sql
index 6dd14e5fe6..55254937ee 100644
--- a/db/changes/10120-december/00-invoiceOutBokking.sql
+++ b/db/changes/10120-december/00-invoiceOutBokking.sql
@@ -10,10 +10,12 @@ BEGIN
 */
 	DECLARE vBookNumber INT;
     DECLARE vExpenceConcept VARCHAR(50);
-    DECLARE isUEENotSpain INT DEFAULT 1;
-    DECLARE vSpain INT DEFAULT 1;
+    DECLARE vIsUeeMember BOOL DEFAULT TRUE;
+    DECLARE vSpainCountryFk INT;
     DECLARE vOldBookNumber INT;
     
+	SELECT id INTO vSpainCountryFk FROM country WHERE code = 'ES';
+
     SELECT ASIEN
 			INTO vOldBookNumber
 		FROM XDiario x
@@ -46,14 +48,13 @@ BEGIN
 				ic.cplusRectificationTypeFk AS TIPORECTIF,
 				io.companyFk,
 				RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum,
-                IF(ct.politicalCountryFk = vSpain, 1, IF(ct.CEE = isUEENotSpain,2,4)) AS TERIDNIF,
-				CONCAT(IF(ct.CEE = isUEENotSpain,ct.code,''),c.fi) AS TERNIF,
+                IF(ct.politicalCountryFk = vSpainCountryFk, vSpainCountryFk, IF(ct.isUeeMember = vIsUeeMember,2,4)) AS TERIDNIF,
+				CONCAT(IF(ct.isUeeMember = vIsUeeMember,ct.code,''),c.fi) AS TERNIF,
 				c.socialName AS TERNOM,
                 ior.serial AS SERIE_RT,
                 RIGHT(ior.ref, LENGTH(ior.ref) - 1) AS FACTU_RT,
                 ior.issued AS FECHA_RT,
                 IF(ior.id,TRUE,FALSE) AS RECTIFICA
-
 		FROM invoiceOut io
 			JOIN (	
 					SELECT GREATEST(MAX(shipped), TIMESTAMPADD(DAY,-15,io.issued)) as FECHA_OP 
diff --git a/db/changes/10120-december/00-triggerVnControl.sql b/db/changes/10120-december/00-triggerVnControl.sql
index 94220b74b6..5cb148e264 100644
--- a/db/changes/10120-december/00-triggerVnControl.sql
+++ b/db/changes/10120-december/00-triggerVnControl.sql
@@ -65,7 +65,6 @@ BEGIN
 			WHERE ticketFk = OLD.Id_Ticket;
 	END;
 
-	IF OLD.odbc_date > TIMESTAMPADD(WEEK, -1, CURDATE()) THEN
 		SELECT i.Id_Ticket, i.inter_id, s.`name`
 			INTO vTicketFk, vTicketTrackingFk, vStateName 
 			FROM vncontrol.inter i 
@@ -78,6 +77,5 @@ BEGIN
 			REPLACE INTO vn.ticketLastState(ticketFk, ticketTrackingFk,name)
 				VALUES(vTicketFk, vTicketTrackingFk, vStateName);
 		END IF;
-	END IF;
 END$$
 DELIMITER ;
diff --git a/db/changes/10120-december/00-vnClean.sql b/db/changes/10120-december/00-vnClean.sql
index c3d751777a..d6a8662eb7 100644
--- a/db/changes/10120-december/00-vnClean.sql
+++ b/db/changes/10120-december/00-vnClean.sql
@@ -5,19 +5,19 @@ DELIMITER $$
 CREATE DEFINER=`root`@`%` PROCEDURE `vn`.`clean`()
 BEGIN
 	DECLARE vDateShort DATETIME;
-	DECLARE oneYearAgo DATE;
-	DECLARE twoYearsAgo DATE;
-	DECLARE fourYearsAgo DATE;
+	DECLARE vOneYearAgo DATE;
+	DECLARE vTwoYearsAgo DATE;
+	DECLARE vFourYearsAgo DATE;
 
 	SET vDateShort = TIMESTAMPADD(MONTH, -2, CURDATE());
-	SET oneYearAgo = TIMESTAMPADD(YEAR,-1,CURDATE());
-	SET twoYearsAgo = TIMESTAMPADD(YEAR,-2,CURDATE());
-	SET fourYearsAgo = TIMESTAMPADD(YEAR,-4,CURDATE());
+	SET vOneYearAgo = TIMESTAMPADD(YEAR,-1,CURDATE());
+	SET vTwoYearsAgo = TIMESTAMPADD(YEAR,-2,CURDATE());
+	SET vFourYearsAgo = TIMESTAMPADD(YEAR,-4,CURDATE());
 
 	DELETE FROM `message` WHERE sendDate < vDateShort;
 	DELETE FROM messageInbox WHERE sendDate < vDateShort;
 	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM workerTimeControl WHERE timed < fourYearsAgo;
+	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
 	DELETE FROM itemShelving WHERE created < CURDATE() AND visible = 0;
 	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,CURDATE());
     DELETE FROM entryLog WHERE creationDate < vDateShort;
diff --git a/db/changes/10120-december/01-vn2008bootanicalExportIsUpdatable.sql b/db/changes/10120-december/01-vn2008bootanicalExportIsUpdatable.sql
index 20b8fe1759..44a067d074 100644
--- a/db/changes/10120-december/01-vn2008bootanicalExportIsUpdatable.sql
+++ b/db/changes/10120-december/01-vn2008bootanicalExportIsUpdatable.sql
@@ -5,6 +5,7 @@ DELIMITER $$
 CREATE DEFINER=`root`@`%` FUNCTION `vn2008`.`botanic_export_is_updatable`(v_edi_genus_id MEDIUMINT,v_edi_specie_id MEDIUMINT,v_id_Paises MEDIUMINT,v_restriction MEDIUMINT) RETURNS int(11)
 DETERMINISTIC
 BEGIN
+	-- DEPRECATED: use vn.botanicExport_isUpdatable
 	RETURN botanicExport_isUpdatable (v_edi_genus_id, v_edi_specie_id, v_id_Paises, v_restriction);
 END$$