Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details

This commit is contained in:
Carlos Jimenez Ruiz 2019-05-17 11:37:45 +02:00
commit 3e34e7e371
1 changed files with 6 additions and 6 deletions

View File

@ -31,13 +31,13 @@ INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`,`lan
(111, 'Missing', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'), (111, 'Missing', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'),
(112, 'Trash', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es'); (112, 'Trash', 'ac754a330530832ba1bf7687f577da91', 2, 0, NULL, 'es');
INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre`, `Apellidos`, `user_id`) INSERT INTO `vn2008`.`Trabajadores`(`CodigoTrabajador`, `Id_Trabajador`, `Nombre`, `Apellidos`, `user_id`,`boss`)
VALUES VALUES
('LGN', 106, 'David Charles', 'Haller', 106), ('LGN', 106, 'David Charles', 'Haller', 106, 19),
('ANT', 107, 'Hank' , 'Pym' , 107), ('ANT', 107, 'Hank' , 'Pym' , 107, 19),
('DCX', 110, 'Charles' , 'Xavier', 108), ('DCX', 110, 'Charles' , 'Xavier', 108, 19),
('HLK', 109, 'Bruce' , 'Banner', 109), ('HLK', 109, 'Bruce' , 'Banner', 109, 19),
('JJJ', 108, 'Jessica' , 'Jones' , 110); ('JJJ', 108, 'Jessica' , 'Jones' , 110, 19);
INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`) INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`)
VALUES VALUES