Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Juan Ferrer Toribio 2018-02-01 08:49:10 +01:00
commit 52db3bbf2f
1 changed files with 51 additions and 25 deletions

View File

@ -354,7 +354,6 @@ INSERT INTO `vn`.`city`(`id`, `name`, `provinceFk`)
VALUES VALUES
(1, 'Gotham', 1); (1, 'Gotham', 1);
INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`) INSERT INTO `vn`.`cplusTerIdNif`(`id`, `description`)
VALUES VALUES
(1, 'NIF'); (1, 'NIF');
@ -429,6 +428,18 @@ INSERT INTO `salix`.`ClientObservation`(`id`, `clientFk`, `employeeFk`, `text`,
(9, 9, 5, 'HULK SMASH! ...', CURDATE()), (9, 9, 5, 'HULK SMASH! ...', CURDATE()),
(10, 10, 5, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', CURDATE()); (10, 10, 5, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', CURDATE());
INSERT INTO `vn`.`observationType`(`id`,`description`)
VALUES
(1,'observation one'),
(2,'observation two'),
(3,'observation three');
INSERT INTO `vn`.`addressObservation`(`id`,`addressFk`,`observationTypeFk`,`description`)
VALUES
(1, 1, 1,'under the floor'),
(2, 1, 2,'wears leather and goes out at night'),
(3, 1, 3,'care with the dog');
INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`) INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`)
VALUES VALUES
(1, 1, CURDATE(), CURDATE()), (1, 1, CURDATE(), CURDATE()),
@ -530,36 +541,36 @@ INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `ma
INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`) INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`)
VALUES VALUES
(1, 'Vestimenta', 1, 'B92A26'), (1, 'Gear', 1, 'B92A26'),
(2, 'Objetos', 2, 'dcf711'); (2, 'Items', 2, 'dcf711');
INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`) INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`)
VALUES VALUES
(1, 'ARM', 'Armor', 1, 15, 5), (1, 'ARM', 'Armor', 1, 15, 5),
(2, 'ITG', 'Infinity gem', 2, 30, 5), (2, 'ITG', 'Infinity gem', 2, 30, 5),
(3, 'WPN', 'Weapons', 2, 30, 5); (3, 'WPN', 'Weapon', 2, 30, 5);
INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`) INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`)
VALUES VALUES
('AMA', 'Amarillo' ,1 , 1), ('YEL', 'Yellow', 1 , 1),
('AZL', 'Azul' ,1 , 2), ('BLU', 'Blue', 1 , 2),
('AMR', 'Rojo/Amarillo',1 , 3); ('RED', 'Red', 1 , 3);
INSERT INTO `vn`.`origin`(`id`,`code`, `name`) INSERT INTO `vn`.`origin`(`id`,`code`, `name`)
VALUES VALUES
(1, 'ESP', 'España'), (1, 'SPA', 'Spain'),
(2, 'HOL', 'Holanda'), (2, 'HOL', 'Holand'),
(3, 'VCL', 'Valencia'); (3, 'VLC', 'Valencia');
INSERT INTO `vn`.`producer`(`id`, `name`) INSERT INTO `vn`.`producer`(`id`, `name`)
VALUES VALUES
(1, 'Cine Marvel'), (1, 'Marvel Studios'),
(2, 'Mitologia nordica'); (2, 'Nordic Mythology');
INSERT INTO `vn`.`taxType`(`id`, `nickname`, `isAccrued`, `serial`, `TIPOOPE`, `description`, `countryFk`) INSERT INTO `vn`.`taxType`(`id`, `nickname`, `isAccrued`, `serial`, `TIPOOPE`, `description`, `countryFk`)
VALUES VALUES
(1, 'nacional',1, 'R', 'I', 'national VAT',1), (1, 'National', 1, 'R', 'I', 'national VAT',1),
(2, 'europea', 0, 'E', 'I', 'europe VAT', 1); (2, 'European', 0, 'E', 'I', 'europe VAT', 1);
INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equalizationTax`, `type`, `link`, `isActive`, `updated`, `transactionCode`) INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equalizationTax`, `type`, `link`, `isActive`, `updated`, `transactionCode`)
VALUES VALUES
@ -568,28 +579,43 @@ INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equaliza
INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`) INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`)
VALUES VALUES
(1, 'VAT Reduced','R'), (1, 'Reduced VAT','R'),
(2, 'VAT General', 'G'); (2, 'General VAT', 'G');
INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
VALUES VALUES
(1, 'automatic armor', 1, 1), (1, 'Automatic armor', 1, 1),
(2, 'magic weapon' , 2, 2); (2, 'Magic weapon' , 2, 2);
INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`) INSERT INTO `vn`.`expence`(`id`, `taxTypeFk`, `name`, `isWithheld`)
VALUES VALUES
(1, 1, 'bail', 0), (1, 1, 'bail', 0),
(2, 1, 'loan', 1); (2, 1, 'loan', 1);
INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`) INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`)
VALUES VALUES
(1, 'Gema del Tiempo', 2, 70, 'AMA', 'EXT', 1, 1, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, 66540, 1), (1, 'Gem of Time', 2, 70, 'AMA', 'EXT', 1, 1, 'One of the infinity gems', 1, 2, 0, 1, 0, NULL, 0, 66540, 1),
(2, 'Gema de la Mente', 2, 70, 'AZL', 'EXT', 1, 2, 'Una de las gemas del infinito', 1, 2, 0, 1, 0, NULL, 0, 65540, 1), (2, 'Gem of Mind', 2, 70, 'AZL', 'EXT', 1, 2, 'One of the infinity gems', 1, 2, 0, 1, 0, NULL, 0, 65540, 1),
(3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1, 3, 'La armadura de Rhodey', 1, 1, 0, 1, 0, NULL, 0, 61692, 1), (3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1, 3, 'Rhodeys armor', 1, 1, 0, 1, 0, NULL, 0, 61692, 1),
(4, 'Mark I', 1, 60, 'AMR', 'EXT', 1, 1, 'La primera armadura de Iron Man', 1, 1, 1, 2, 0, NULL, 0, 66090, 2), (4, 'Mark I', 1, 60, 'AMR', 'EXT', 1, 1, 'Iron Mans first armor', 1, 1, 1, 2, 0, NULL, 0, 66090, 2),
(5, 'Mjolnir', 3, 30, 'AZR', 'EXT', 1, 2, 'El martillo de Thor', 2, 2, 1, 2, 0, NULL, 0, 67350, 2); (5, 'Mjolnir', 3, 30, 'AZR', 'EXT', 1, 2, 'Thors hammer!', 2, 2, 1, 2, 0, NULL, 0, 67350, 2);
INSERT INTO `salix`.`user`(`id`,`username`,`password`,`email`)
VALUES
(10, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 'JessicaJones@verdnatura.es');
INSERT INTO `vn`.`tag`(`id`,`name`,`free`,`isQuantitatif`,`sourceTable`,`unit`)
VALUES
(1, 'color', 1, 0, null, null),
(2, 'power', 1, 0, null, null),
(3, 'shape', 1, 0, null, null),
(4, 'location', 1, 0, null, null),
(5, 'owner', 1, 1, null, null);
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
(1, 1, 1, 'Yellow', 0),
(2, 1, 2, 'Manipulates time', 0),
(3, 1, 3, 'round', 0),
(4, 1, 4, 'given to Gamora by the Warlock', 0),
(5, 1, 5, 'Gamora', 0);