db/dump/fixtures.before.sql

@@ -3729,4 +3729,7 @@ 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.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/vn/procedures/clean.sql

@@ -188,11 +188,13 @@ 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;

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 vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag7 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vTag8 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    
-    DECLARE vValue1 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue5 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue6 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
-    DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
+	DECLARE vTag1 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag5 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag6 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag7 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+	DECLARE vTag8 VARCHAR(20) COLLATE 'utf8_unicode_ci';
+
+	DECLARE vValue1 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue5 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue6 VARCHAR(50) COLLATE 'utf8_unicode_ci';
+	DECLARE vValue7 VARCHAR(50) 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
-			AND a.available > 0
+		WHERE a.available > 0
 			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
 			AND i.id <> vSelf
 		ORDER BY `counter` DESC,

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/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/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');

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