Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Javi Gallego 2021-01-08 09:44:13 +01:00
commit b5cd4e3c9f
3 changed files with 24 additions and 19 deletions

File diff suppressed because one or more lines are too long

View File

@ -1084,6 +1084,22 @@ INSERT INTO `vn`.`itemBotanical`(`itemFk`, `botanical`, `genusFk`, `specieFk`)
(3, 'Cycas revoluta', 2, NULL),
(4, 'Polygonum', NULL, NULL);
INSERT INTO `vn`.`tag`(`id`, `code`, `name`, `isFree`, `isQuantitatif`, `sourceTable`, `unit`, `ediTypeFk`, `overwrite`)
VALUES
(1, 'color', 'Color', 0, 0, 'ink', NULL, NULL, 'inkFk'),
(2, NULL, 'Forma', 1, 0, NULL, NULL,NULL, NULL),
(3, NULL, 'Material', 1, 0, NULL, NULL,NULL, NULL),
(4, NULL, 'Longitud', 1, 1, NULL, 'mm', NULL, 'size'),
(5, NULL, 'Diámetro', 1, 1, NULL, 'mm',NULL, 'diameter'),
(7, NULL, 'Ancho de la base', 1, 1, NULL, 'mm',NULL, NULL),
(23, 'stems', 'Tallos', 1, 1, NULL, NULL, NULL, 'stems'),
(27, NULL, 'Longitud(cm)', 1, 1, NULL, 'cm', NULL, NULL),
(36, NULL, 'Proveedor', 1, 0, NULL, NULL, NULL, NULL),
(56, NULL, 'Genero', 1, 0, NULL, NULL, NULL, NULL),
(58, NULL, 'Variedad', 1, 0, NULL, NULL, NULL, NULL),
(67, 'category', 'Categoria', 1, 0, NULL, NULL, NULL, NULL),
(92, NULL, 'Nombre temporal', 1, 0, NULL, NULL, NULL, NULL);
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
(1, 1, 56, 'Ranged weapon', 1),

View File

@ -43,7 +43,6 @@ TABLES=(
cplusSubjectOp
cplusTaxBreak
pgc
tag
time
claimResponsible
claimReason