Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5576-reestructurar-directorio-imagenes

db/dump/fixtures.before.sql

@@ -3732,3 +3732,6 @@ UPDATE vn.buy SET itemOriginalFk = 1 WHERE id = 1;
 UPDATE vn.saleTracking SET stateFk = 26 WHERE id = 5;
 
 INSERT INTO vn.report (name) VALUES ('LabelCollection');
+
+INSERT INTO vn.parkingLog(originFk, userFk, `action`, creationDate, description, changedModel,oldInstance, newInstance, changedModelId, changedModelValue)
+	VALUES(1, 18, 'update', util.VN_CURDATE(), NULL, 'SaleGroup', '{"parkingFk":null}', '{"parkingFk":1}', 1, NULL);

db/routines/bi/views/v_clientes_jerarquia.sql

@@ -1,21 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `bi`.`v_clientes_jerarquia`
-AS SELECT `c`.`id_cliente` AS `Id_Cliente`,
-	`c`.`cliente` AS `Cliente`,
-	`t`.`CodigoTrabajador` AS `Comercial`,
-	`tj`.`CodigoTrabajador` AS `Jefe`
-FROM (
-		(
-			(
-				`vn2008`.`Clientes` `c`
-				JOIN `vn2008`.`Trabajadores` `t` ON(`t`.`Id_Trabajador` = `c`.`Id_Trabajador`)
-			)
-			JOIN `vn2008`.`jerarquia` ON(
-				`vn2008`.`jerarquia`.`worker_id` = `c`.`Id_Trabajador`
-			)
-		)
-		JOIN `vn2008`.`Trabajadores` `tj` ON(
-			`tj`.`Id_Trabajador` = `vn2008`.`jerarquia`.`boss_id`
-		)
-	)

db/routines/vn/procedures/clean.sql

@@ -188,15 +188,23 @@ BEGIN
 					SELECT MAX(tl.id)ids
 						FROM ticket t
 							JOIN ticketLog tl ON tl.originFk = t.id
+							LEFT JOIN ticketWeekly tw ON tw.ticketFk = t.id
 						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' 
 							AND t.isDeleted
+							AND tw.ticketFk IS NULL
 						GROUP BY t.id
 				) sub ON sub.ids = tl.id 
-			WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
+			WHERE tl.creationDate <= v2Months;
 	DELETE t
 		FROM ticket t
 			JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
 
+	DELETE sl
+		FROM saleLabel sl
+			JOIN sale s ON s.id = sl.saleFk
+			JOIN ticket t ON t.id = s.ticketFk
+		WHERE t.shipped < v2Months;
+
 	-- Tickets Nulos PAK 11/10/2016
 	SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
 	UPDATE ticket

db/routines/vn/procedures/item_getSimilar.sql

@@ -19,17 +19,17 @@ BEGIN
 	DECLARE vTypeFk INT;
 	DECLARE vPriority INT DEFAULT 1;
 
-    DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag1 VARCHAR(20) COLLATE 'utf8_unicode_ci';
-    DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag5 VARCHAR(20) COLLATE 'utf8_unicode_ci';
-    DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag6 VARCHAR(20) COLLATE 'utf8_unicode_ci';
-    DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag7 VARCHAR(20) COLLATE 'utf8_unicode_ci';
-    DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag8 VARCHAR(20) COLLATE 'utf8_unicode_ci';
-    
+
-    DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vValue1 VARCHAR(50) COLLATE 'utf8_unicode_ci';
-    DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vValue5 VARCHAR(50) COLLATE 'utf8_unicode_ci';
-    DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vValue6 VARCHAR(50) COLLATE 'utf8_unicode_ci';
-    DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vValue7 VARCHAR(50) COLLATE 'utf8_unicode_ci';
-    DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vValue8 VARCHAR(50) COLLATE 'utf8_unicode_ci';
 
 	SELECT typeFk,
 			tag5,
@@ -81,7 +81,8 @@ BEGIN
 			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
 			iss.visible located
 		FROM item i
-			JOIN cache.available a ON a.item_id = i.id
+			STRAIGHT_JOIN cache.available a ON a.item_id = i.id
+				AND a.calc_id = vCalcFk
 			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
 				AND ip.itemFk = vSelf
 			LEFT JOIN itemTag it ON it.itemFk = i.id
@@ -92,8 +93,7 @@ BEGIN
 			LEFT JOIN buy b ON b.id = lb.buy_id
 			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
 				AND iss.warehouseFk = vWarehouseFk
-		WHERE a.calc_id = vCalcFk
+		WHERE a.available > 0
-			AND a.available > 0
 			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
 			AND i.id <> vSelf
 		ORDER BY `counter` DESC,

db/routines/vn/procedures/ticket_closeByTicket.sql

@@ -18,7 +18,8 @@ BEGIN
 		WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
 			AND t.id = vTicketFk
 			AND t.refFk IS NULL
-		GROUP BY t.id);
+		GROUP BY t.id
+    );
 
 	CALL ticket_close();
 

db/routines/vn/triggers/parking_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_afterDelete`
+	AFTER DELETE ON `parking`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO parkingLog 
+		SET `action` = 'delete',
+			`changedModel` = 'Parking',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/parking_beforeInsert.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeInsert`
 	BEFORE INSERT ON `parking`
 	FOR EACH ROW
 BEGIN
-
+	SET NEW.editorFk = account.myUser_getId();
 	-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
 
 END$$

db/routines/vn/triggers/parking_beforeUpdate.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`parking_beforeUpdate`
 	BEFORE UPDATE ON `parking`
 	FOR EACH ROW
 BEGIN
-
+	SET NEW.editorFk = account.myUser_getId();
 	-- SET new.`code` = CONCAT(new.`column`,' - ',new.`row`) ;
     
 END$$

db/routines/vn/views/unary.sql

@@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unary`
-AS SELECT `a`.`id` AS `id`,
-	`a`.`parent` AS `parent`
-FROM `vn2008`.`unary` `a`

db/routines/vn/views/unaryScan.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScan`
-AS SELECT `u`.`unary_id` AS `unaryFk`,
-	`u`.`name` AS `name`,
-	`u`.`odbc_date` AS `created`,
-	`u`.`type` AS `type`
-FROM `vn2008`.`unary_scan` `u`

db/routines/vn/views/unaryScanLine.sql

@@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`unaryScanLine`
-AS SELECT `u`.`id` AS `id`,
-	`u`.`code` AS `code`,
-	`u`.`odbc_date` AS `created`,
-	`u`.`unary_id` AS `unaryScanFk`
-FROM `vn2008`.`unary_scan_line` `u`

db/routines/vn2008/procedures/emailYesterdayPurchasesByConsigna.sql

@@ -1,100 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`emailYesterdayPurchasesByConsigna`(IN v_Date DATE, IN v_Client_Id INT)
-BEGIN
-
-	DECLARE MyIdTicket BIGINT;
-	DECLARE MyAlias VARCHAR(50);
-	DECLARE MyDomicilio VARCHAR(255);
-	DECLARE MyPoblacion VARCHAR(25);
-	DECLARE MyImporte DOUBLE;
-	DECLARE MyMailTo VARCHAR(250);
-	DECLARE MyMailReplyTo VARCHAR(250);
-	DECLARE done INT DEFAULT FALSE;
-	DECLARE emptyList INT DEFAULT 0;
-	DECLARE txt TEXT;
-	
-	DECLARE rs CURSOR FOR 
-		SELECT t.Id_Ticket, Alias, cast(amount as decimal(10,2)) Importe, Domicilio, POBLACION
-			FROM Tickets t
-				JOIN Consignatarios cs ON t.Id_Consigna = cs.Id_Consigna
-				JOIN (
-					SELECT `Movimientos`.`Id_Ticket` AS `Id_Ticket`,
-						sum(
-							`Movimientos`.`Cantidad` * `Movimientos`.`Preu` * (100 - `Movimientos`.`Descuento`) / 100
-						) AS `amount`
-					FROM (
-							`vn2008`.`Movimientos`
-							JOIN `vn2008`.`Tickets` ON(
-								`Movimientos`.`Id_Ticket` = `Tickets`.`Id_Ticket`
-							)
-						)
-					WHERE `Tickets`.`Fecha` >= `util`.`VN_CURDATE`() + INTERVAL -6 MONTH
-					GROUP BY `Movimientos`.`Id_Ticket`
-				) v ON v.Id_Ticket = t.Id_Ticket
-			WHERE t.Fecha BETWEEN v_Date AND util.dayEnd(v_Date)
-				AND t.Id_Cliente = v_Client_Id;
-	
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-	
-	SET v_Date = IFNULL(v_Date, util.yesterday());
-	
-	OPEN rs;
-	
-	FETCH rs INTO MyIdTicket, MyAlias, MyImporte, MyDomicilio, MyPoblacion;
-	
-	SET emptyList = done;
-	
-	SET txt = CONCAT('<p><font face="verdana" >',
-					 '<h2> Relación de envíos.</h2>',
-					 '<h3><font color="green">Dia: ', v_Date, '</font></h3>');
-	
-	WHILE NOT done DO
-	
-		SET txt = CONCAT(txt, '<br><br>',
-						'<table>
-							<tr>
-								<th> <a href = "https://shop.verdnatura.es/#!form=ecomerce/ticket&ticket=',MyIdTicket,'">
-	                            <font color="green"> Ticket ', MyIdTicket,'</font></th>
-	                            <th></th><th></th><th></th><th></th>
-	                            <th></th><th></th><th></th><th></th>
-	                            <th> <font color="orange"> ', MyImporte, ' € </a></font></th>
-							</tr>
-						</table>'
-	     			   , '             ', MyAlias, '<br>'
-					   , '             ', MyDomicilio, '(', MyPoblacion, ')');
-	
-	FETCH rs INTO MyIdTicket, MyAlias, MyImporte, MyDomicilio, MyPoblacion;
-	
-	END WHILE;
-		
-	SET txt = CONCAT(
-				txt, 
-				'<table>',
-                '<tr><th></th></tr>',
-                '</table>',
-				'<br><br>Puede acceder al detalle de los albaranes haciendo click sobre el número de Ticket',
-				'<br><h3> Muchas gracias por su confianza</h3>',
-				'</font></p>');
-	
-	-- Envío del email
-	IF emptyList = 0 THEN
-	
-		SELECT CONCAT(`e-mail`,',pako@verdnatura.es') INTO MyMailTo
-			FROM Clientes
-			WHERE Id_Cliente = v_Client_Id AND `e-mail`>'';
-	    
-	    IF v_Client_Id = 7818 THEN -- LOEWE
-			SET MyMailTo = 'isabel@elisabethblumen.com,emunozca@loewe.es,pako@verdnatura.es';
-	    END IF;
-	
-		CALL vn.mail_insert(
-			IFNULL(MyMailTo,'pako.natek@gmail.com'),
-			'pako@verdnatura.es',
-			'Resumen de pedidos preparados',
-			txt
-		);
-	
-	END IF;
-
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/emailYesterdayPurchasesLauncher.sql

@@ -1,27 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`emailYesterdayPurchasesLauncher`()
-BEGIN
-
-DECLARE done INT DEFAULT 0;
-DECLARE vMyClientId INT;
-
-DECLARE rs CURSOR FOR
-SELECT Id_Cliente
-FROM Clientes
-WHERE EYPBC != 0;
-
-DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-
-OPEN rs;
-
-FETCH rs INTO vMyClientId;
-
-WHILE NOT done DO
-
-	CALL emailYesterdayPurchasesByConsigna(util.yesterday(), vMyClientId);
-    
-	FETCH rs INTO vMyClientId;
-
-END WHILE;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/embalajes_stocks.sql

@@ -1,51 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`embalajes_stocks`(IN idPEOPLE INT, IN bolCLIENT BOOLEAN)
-BEGIN
-
-if bolCLIENT then
-
-	select m.Id_Article,  Article, - cast(sum(m.Cantidad) as decimal) as Saldo
-	from Movimientos m
-    join Articles a on m.Id_Article = a.Id_Article
-    join Tipos tp on tp.tipo_id = a.tipo_id 
-	join Tickets t using(Id_Ticket)
-	join Consignatarios cs using(Id_Consigna)
-	where cs.Id_Cliente = idPEOPLE
-    and Tipo = 'Contenedores'
-	and t.Fecha > '2010-01-01'
-    group by m.Id_Article;
-
-else
-
-select Id_Article, Article, sum(Cantidad) as Saldo
-from
-(select Id_Article, Cantidad
-from Compres c
-join Articles a using(Id_Article)
-join Tipos tp using(tipo_id)
-join Entradas e using(Id_Entrada)
-join travel tr on tr.id = travel_id
-where Id_Proveedor = idPEOPLE
-and landing >= '2010-01-01'
-and reino_id = 6
-
-union all
-
-select Id_Article,  - Cantidad
-from Movimientos m
-join Articles a using(Id_Article)
-join Tipos tp using(tipo_id)
-join Tickets t using(Id_Ticket)
-join Consignatarios cs using(Id_Consigna)
-join proveedores_clientes pc on pc.Id_Cliente = cs.Id_Cliente
-where Id_Proveedor = idPEOPLE
-and reino_id = 6
-and t.Fecha > '2010-01-01') mov
-
-join Articles a using(Id_Article)
-group by Id_Article;
-
-end if;
-
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/embalajes_stocks_detalle.sql

@@ -1,78 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`embalajes_stocks_detalle`(IN idPEOPLE INT, IN idARTICLE INT, IN bolCLIENT BOOLEAN)
-BEGIN
-
-
-if bolCLIENT then
-
-	select m.Id_Article
-         , Article
-		 , IF(Cantidad < 0, - Cantidad, NULL) as Entrada
-		 , IF(Cantidad < 0, NULL, Cantidad) as  Salida
-		 , 'T' as Tabla
-		 , t.Id_Ticket  as Registro
-		 , t.Fecha
-		 , w.name as Almacen
-		 , cast(Preu as Decimal(5,2)) Precio
-         , c.Cliente as Proveedor
-         , abbreviation as Empresa
-	from Movimientos m
-    join Articles a using(Id_Article)
-	join Tickets t using(Id_Ticket)
-    join empresa e on e.id = t.empresa_id
-    join warehouse w on w.id = t.warehouse_id
-	join Consignatarios cs using(Id_Consigna)
-    join Clientes c on c.Id_Cliente = cs.Id_Cliente
-    where cs.Id_Cliente = idPEOPLE
-	and m.Id_Article = idARTICLE
-	and t.Fecha > '2010-01-01';
-
-else
-
-select Id_Article, Tabla, Registro, Fecha, Article
-, w.name as Almacen,  Entrada, Salida, Proveedor, cast(Precio as Decimal(5,2)) Precio
-
-from
-
-(select Id_Article
-      , IF(Cantidad > 0, Cantidad, NULL) as Entrada
-      , IF(Cantidad > 0, NULL,- Cantidad) as Salida
-      , 'E' as Tabla
-      , Id_Entrada as Registro
-      , landing as Fecha
-      , tr.warehouse_id
-      , Costefijo as Precio
-from Compres c
-join Entradas e using(Id_Entrada)
-join travel tr on tr.id = travel_id
-where Id_Proveedor = idPEOPLE
-and Id_Article = idARTICLE
-and landing >= '2010-01-01'
-
-union all
-
-select Id_Article
-	 , IF(Cantidad < 0, - Cantidad, NULL) as Entrada
-	 , IF(Cantidad < 0, NULL, Cantidad) as  Salida
-     , 'T'
-     , Id_Ticket
-     , Fecha
-     , t.warehouse_id
-     , Preu
-from Movimientos m
-join Tickets t using(Id_Ticket)
-join Consignatarios cs using(Id_Consigna)
-join proveedores_clientes pc on pc.Id_Cliente = cs.Id_Cliente
-where Id_Proveedor = idPEOPLE
-and Id_Article = idARTICLE
-and t.Fecha > '2010-01-01') mov
-
-join Articles a using(Id_Article)
-join Proveedores p on Id_Proveedor = idPEOPLE
-join warehouse w on w.id = mov.warehouse_id
-;
-
-end if;
-
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/unary_leaves.sql

@@ -1,58 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`unary_leaves`(v_top INT)
-BEGIN
-/**
- * A partir de un nodo devuelve todos sus descendientes.
- *
- * @table tmp.tree Tabla con los ids de los nodos descendientes;
- **/
-	DECLARE v_count INT;
-    DECLARE v_parent INT;
-    DECLARE v_depth INT DEFAULT 0;
-    
-    DROP TEMPORARY TABLE IF EXISTS tmp.tree;
-    CREATE TEMPORARY TABLE tmp.tree
-		(INDEX (id))
-        ENGINE = MEMORY
-		SELECT v_top id, v_parent parent, v_depth depth;
-        
-	DROP TEMPORARY TABLE IF EXISTS tmp.parent;
-    CREATE TEMPORARY TABLE tmp.parent
-        ENGINE = MEMORY
-		SELECT v_top id;
-
-	l: LOOP
-		
-        SET v_depth = v_depth + 1;
-		
-		DROP TEMPORARY TABLE IF EXISTS tmp.child;
-		CREATE TEMPORARY TABLE tmp.child
-			ENGINE = MEMORY
-			SELECT c.`id`, c.parent
-				FROM `unary` c
-                JOIN tmp.parent p ON c.`parent` = p.id;
-                
-		DROP TEMPORARY TABLE tmp.parent;
-        CREATE TEMPORARY TABLE tmp.parent
-			ENGINE = MEMORY
-			SELECT c.id, c.parent
-				FROM tmp.child c
-                LEFT JOIN tmp.tree t ON t.id = c.id
-					WHERE t.id IS NULL;
-                    
-		INSERT INTO tmp.tree
-			SELECT id, parent, v_depth FROM tmp.parent;
-            
-		SELECT COUNT(*) INTO v_count
-			FROM tmp.parent;
-            
-		IF v_count = 0 THEN
-			LEAVE l;
-		END IF;    
-    END LOOP;
-    
-    DROP TEMPORARY TABLE
-		tmp.parent,
-        tmp.child;
-END$$
-DELIMITER ;

db/routines/vn2008/procedures/unary_tops.sql

@@ -1,19 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`unary_tops`()
-BEGIN
-/**
- * Devuelve todos los nodos que no tienen padre.
- *
- * @table tmp.tree Tabla con los ids de los nodos que no tienen padre;
- **/
-	
-    DROP TEMPORARY TABLE IF EXISTS tmp.tree;
-    CREATE TEMPORARY TABLE tmp.tree
-        ENGINE = MEMORY
-		SELECT s.`unary_id` AS id, s.name, s.odbc_date, s.type
-				FROM `unary_scan` s
-                INNER JOIN `unary` u ON s.unary_id = u.id
-                WHERE u.parent IS NULL;
-        
-END$$
-DELIMITER ;

db/routines/vn2008/views/v_jerarquia.sql

@@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`v_jerarquia`
-AS SELECT `vn2008`.`jerarquia`.`worker_id` AS `Id_Trabajador`,
-	`vn2008`.`jerarquia`.`boss_id` AS `boss_id`
-FROM `vn2008`.`jerarquia`
-UNION ALL
-SELECT DISTINCT `vn2008`.`jerarquia`.`boss_id` AS `Id_Trabajador`,
-	`vn2008`.`jerarquia`.`boss_id` AS `boss_id`
-FROM `vn2008`.`jerarquia`

db/versions/10918-wheatRose/00-firstScript.sql

@@ -0,0 +1,2 @@
+DELETE FROM bs.nightTask
+	WHERE `procedure` = 'emailYesterdayPurchasesLauncher';

db/versions/10923-pinkOak/00-createParkingLog.sql

@@ -0,0 +1,60 @@
+CREATE OR REPLACE TABLE vn.parkingLog (
+
+	`id` int(11) NOT NULL AUTO_INCREMENT,
+
+	`originFk` int(11) DEFAULT NULL,
+
+	`userFk` int(10) unsigned DEFAULT NULL,
+
+	`action` set('insert','update','delete','select') NOT NULL,
+
+	`creationDate` timestamp NULL DEFAULT current_timestamp(),
+
+	`description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+
+	`changedModel` enum('Parking','SaleGroup','SaleGroupDetail') NOT NULL DEFAULT 'Parking',
+
+	`oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+
+	`newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+
+	`changedModelId` int(11) NOT NULL,
+
+	`changedModelValue` varchar(45) DEFAULT NULL,
+
+	PRIMARY KEY (`id`),
+
+	KEY `logParkinguserFk` (`userFk`),
+
+	KEY `parkingLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+
+	KEY `parkingLog_originFk` (`originFk`,`creationDate`),
+
+	CONSTRAINT `parkingOriginFk` FOREIGN KEY (`originFk`) REFERENCES `parking` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+
+	CONSTRAINT `parkingUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.parking DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.parking ADD COLUMN editorFk INT;
+
+ALTER TABLE vn.saleGroupDetail DROP COLUMN IF EXISTS editorFk;
+ALTER TABLE IF EXISTS vn.saleGroupDetail ADD COLUMN editorFk INT;
+
+
+ALTER TABLE vn.ticketLog 
+	MODIFY COLUMN changedModel ENUM(
+		'Ticket',
+		'Sale',
+		'TicketWeekly',
+		'TicketTracking',
+		'TicketService',
+		'TicketRequest',
+		'TicketRefund',
+		'TicketPackaging',
+		'TicketObservation',
+		'TicketDms',
+		'Expedition',
+		'Sms'
+	) NOT NULL DEFAULT 'Ticket';

db/versions/10923-pinkOak/01-aclParkingLog.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES ('ParkingLog', '*', 'READ', 'ALLOW', 'ROLE', 'employee');

db/versions/10942-turquoiseCyca/00-firstScript.sql

@@ -1,3 +0,0 @@
--- Place your SQL code here
-ALTER TABLE IF EXISTS vn2008.unary__ RENAME vn2008.unary;
-ALTER TABLE IF EXISTS vn2008.unary_scan__ RENAME vn2008.unary_scan;

db/versions/10943-greenOrchid/00-firstScript.sql

@@ -1,4 +0,0 @@
-ALTER TABLE IF EXISTS vn2008.unary_scan__ RENAME vn2008.unary_scan;
-ALTER TABLE IF EXISTS vn2008.unary_scan_line__ RENAME vn2008.unary_scan_line;
-ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ RENAME vn2008.unary_scan_line_buy;
-ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ RENAME vn2008.unary_scan_line_expedition;

db/versions/10946-blueChrysanthemum/00-firstScript.sql

@@ -0,0 +1,4 @@
+ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
+ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;

loopback/locale/es.json

@@ -324,7 +324,6 @@
     "The response is not a PDF": "La respuesta no es un PDF",
     "Booking completed": "Reserva completada",
     "The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-    "Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
     "The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
     "User disabled": "Usuario desactivado",
     "The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
@@ -348,4 +347,4 @@
     "Cmr file does not exist": "El archivo del cmr no existe",
     "You are not allowed to modify the alias": "No estás autorizado a modificar el alias",
     "The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas"
-}
+}

modules/invoiceOut/back/models/invoice-out.js

@@ -1,5 +1,6 @@
 const print = require('vn-print');
 const path = require('path');
+const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     require('../methods/invoiceOut/filter')(Self);
@@ -66,4 +67,24 @@ module.exports = Self => {
             });
         }
     };
+
+    Self.getSerial = async function(clientId, companyId, addressId, type, myOptions) {
+        const [{serial}] = await Self.rawSql(
+            `SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
+            [
+                clientId,
+                companyId,
+                type
+            ],
+            myOptions);
+
+        const invoiceOutSerial = await Self.app.models.InvoiceOutSerial.findById(serial);
+        if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
+            const address = await Self.app.models.Address.findById(addressId);
+            if (!address || !address.customsAgentFk || !address.incotermsFk)
+                throw new UserError('The address of the customer must have information about Incoterms and Customs Agent');
+        }
+
+        return serial;
+    };
 };

modules/parking/back/model-config.json

@@ -0,0 +1,5 @@
+{
+    "ParkingLog": {
+        "dataSource": "vn"
+    }
+}

modules/parking/back/models/parking-log.json

@@ -0,0 +1,9 @@
+{
+	"name": "ParkingLog",
+	"base": "Log",
+	"options": {
+		"mysql": {
+			"table": "parkingLog"
+		}
+	}
+}

modules/shelving/back/locale/parking/en.yml

@@ -0,0 +1,9 @@
+name: parking
+columns:
+  id: id
+  column: column
+  row: row
+  sectorFk: sector
+  code: code
+  pickingOrder: picking order
+  editorFk: editor

modules/shelving/back/locale/parking/es.yml

@@ -0,0 +1,10 @@
+name: parking
+columns:
+  id: id
+  column: columna
+  row: fila
+  sectorFk: sector
+  code: código
+  pickingOrder: orden de recogida
+  editorFk: editor
+  

modules/shelving/back/models/parking.json

@@ -20,9 +20,6 @@
             "type": "string",
             "required": true
         },
-        "sectorFk": {
-            "type": "number"
-        },
         "code": {
             "type": "string"
         },
@@ -35,6 +32,11 @@
             "type": "hasMany",
             "model": "saleGroup",
             "foreignKey": "parkingFk"
+        },
+        "sector": {
+            "type": "belongsTo",
+            "model": "Sector",
+            "foreignKey": "sectorFk"
         }
     }
 }

modules/supplier/back/methods/supplier/newSupplier.js

@@ -1,3 +1,5 @@
+const UserError = require('vn-loopback/util/user-error');
+
 module.exports = Self => {
     Self.remoteMethodCtx('newSupplier', {
         description: 'Creates a new supplier and returns it',
@@ -19,12 +21,13 @@ module.exports = Self => {
     Self.newSupplier = async(ctx, options) => {
         const models = Self.app.models;
         const args = ctx.args;
-        const myOptions = {};
+        const myOptions = {validate: false};
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
         delete args.ctx;
+        if (!args.name) throw new UserError('The social name cannot be empty');
         const data = {...args, ...{nickname: args.name}};
         const supplier = await models.Supplier.create(data, myOptions);
 

modules/supplier/front/descriptor/locale/es.yml

@@ -4,4 +4,5 @@ Go to client: Ir al cliente
 Verified supplier: Proveedor verificado
 Unverified supplier: Proveedor no verificado
 Inactive supplier: Proveedor inactivo
-Create invoiceIn: Crear factura recibida
+Create invoiceIn: Crear factura recibida
+Supplier name: Razón social

modules/ticket/back/methods/ticket/closeAll.js

@@ -35,6 +35,7 @@ module.exports = Self => {
             SELECT t.id,
                     t.clientFk,
                     t.companyFk,
+                    c.id clientFk,
                     c.name clientName,
                     c.email recipient,
                     c.salesPersonFk,

modules/ticket/back/methods/ticket/closure.js

@@ -1,3 +1,5 @@
+/* eslint max-len: ["error", { "code": 150 }]*/
+
 const Report = require('vn-print/core/report');
 const Email = require('vn-print/core/email');
 const smtp = require('vn-print/core/smtp');
@@ -11,19 +13,27 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
-            await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
+            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
+            await Self.rawSql(
+                `CALL vn.ticket_closeByTicket(?)`,
+                [ticket.id],
+                {userId}
+            );
 
-            const [invoiceOut] = await Self.rawSql(`
+            const [invoiceOut] = await Self.rawSql(
+                `
                 SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
                     FROM ticket t
                         JOIN invoiceOut io ON io.ref = t.refFk
                         JOIN company cny ON cny.id = io.companyFk
                     WHERE t.id = ?
-            `, [ticket.id]);
+                `,
+                [ticket.id],
+            );
 
             const mailOptions = {
                 overrideAttachments: true,
-                attachments: []
+                attachments: [],
             };
 
             const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
@@ -33,7 +43,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     reference: invoiceOut.ref,
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail,
                 };
 
                 const invoiceReport = new Report('invoice', args);
@@ -50,15 +60,19 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 await storage.write(stream, {
                     type: 'invoice',
                     path: `${year}/${month}/${day}`,
-                    fileName: fileName
+                    fileName: fileName,
                 });
 
-                await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
+                await Self.rawSql(
+                    'UPDATE invoiceOut SET hasPdf = true WHERE id = ?',
+                    [invoiceOut.id],
+                    {userId},
+                );
 
                 if (isToBeMailed) {
                     const invoiceAttachment = {
                         filename: fileName,
-                        content: stream
+                        content: stream,
                     };
 
                     if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
@@ -68,7 +82,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
 
                         mailOptions.attachments.push({
                             filename: fileName,
-                            content: stream
+                            content: stream,
                         });
                     }
 
@@ -82,7 +96,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     id: ticket.id,
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail,
                 };
 
                 const email = new Email('delivery-note-link', args);
@@ -90,14 +104,17 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
             }
 
             // Incoterms authorization
-            const [{firstOrder}] = await Self.rawSql(`
+            const [{firstOrder}] = await Self.rawSql(
+                `
                         SELECT COUNT(*) as firstOrder
                             FROM ticket t
                                 JOIN client c ON c.id = t.clientFk
                             WHERE t.clientFk = ?
                                 AND NOT t.isDeleted
                                 AND c.isVies
-                    `, [ticket.clientFk]);
+                    `,
+                [ticket.clientFk],
+            );
 
             if (firstOrder == 1) {
                 const args = {
@@ -106,7 +123,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     recipientId: ticket.clientFk,
                     recipient: ticket.recipient,
                     replyTo: ticket.salesPersonEmail,
-                    addressId: ticket.addressFk
+                    addressId: ticket.addressFk,
                 };
 
                 const email = new Email('incoterms-authorization', args);
@@ -116,21 +133,25 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                     `SELECT id
                         FROM sample
                     WHERE code = 'incoterms-authorization'
-                `);
+                `,
+                );
 
-                await Self.rawSql(`
+                await Self.rawSql(
+                    `
                     INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-                `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+                `,
+                    [ticket.clientFk, sample.id, ticket.companyFk],
+                    {userId},
+                );
             }
         } catch (error) {
             // Domain not found
-            if (error.responseCode == 450)
+            if (error.responseCode == 450) return invalidEmail(ticket);
-                return invalidEmail(ticket);
 
             // Save tickets on a list of failed ids
             failedtickets.push({
                 id: ticket.id,
-                stacktrace: error
+                stacktrace: error,
             });
         }
     }
@@ -147,24 +168,26 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
         smtp.send({
             to: config.app.reportEmail,
             subject: '[API] Nightly ticket closure report',
-            html: body
+            html: body,
         });
     }
 
     async function invalidEmail(ticket) {
-        await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
+        await Self.rawSql(
-            ticket.clientFk
+            `UPDATE client SET email = NULL WHERE id = ?`,
-        ], {userId});
+            [ticket.clientFk],
+            {userId},
+        );
 
         const oldInstance = `{"email": "${ticket.recipient}"}`;
         const newInstance = `{"email": ""}`;
-        await Self.rawSql(`
+        await Self.rawSql(
+            `
             INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
-                VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+                VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`,
-            ticket.clientFk,
+            [ticket.clientFk, oldInstance, newInstance],
-            oldInstance,
+            {userId},
-            newInstance
+        );
-        ], {userId});
 
         const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
         al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
@@ -176,7 +199,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
         smtp.send({
             to: ticket.salesPersonEmail,
             subject: 'No se ha podido enviar el albarán',
-            html: body
+            html: body,
         });
     }
 };

modules/ticket/back/methods/ticket/makeInvoice.js

@@ -77,22 +77,10 @@ module.exports = function(Self) {
             if (!clientCanBeInvoiced)
                 throw new UserError(`This client can't be invoiced`);
 
-            const [{serial}] = invoiceCorrection ? [{serial: 'R'}] : await Self.rawSql(
+            const serial = !invoiceCorrection
-                `SELECT vn.invoiceSerial(?, ?, ?) AS serial`,
+                ? await models.InvoiceOut.getSerial(clientId, companyFk, firstTicket.addressFk, invoiceType, myOptions)
-                [
+                : 'R';
-                    clientId,
-                    companyFk,
-                    invoiceType
-                ],
-                myOptions);
 
-            const invoiceOutSerial = await models.InvoiceOutSerial.findById(serial);
-            if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
-                const address = await models.Address.findById(firstTicket.addressFk);
-
-                if (!address || !address.customsAgentFk || !address.incotermsFk)
-                    throw new UserError('Incoterms data for consignee is missing');
-            }
             await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);
 
             const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);

modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js

@@ -77,6 +77,6 @@ describe('ticket makeInvoice()', () => {
             await tx.rollback();
         }
 
-        expect(error.message).toEqual(`Incoterms data for consignee is missing`);
+        expect(error.message).toEqual(`The address of the customer must have information about Incoterms and Customs Agent`);
     });
 });