verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

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

This commit is contained in:
Joan Sanchez 2021-01-07 13:32:37 +00:00
parent 57de04410f 2a948ddc33
commit 7172d6bcd1
6 changed files with 797 additions and 1794 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

16
db/dump/fixtures.sql
View File

@ -1085,6 +1085,22 @@ INSERT INTO `vn`.`itemBotanical`(`itemFk`, `botanical`, `genusFk`, `specieFk`)
(3, 'Cycas revoluta', 2, NULL), (3, 'Cycas revoluta', 2, NULL),
(4, 'Polygonum', NULL, 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`) INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES VALUES
(1, 1, 56, 'Ranged weapon', 1), (1, 1, 56, 'Ranged weapon', 1),

2519
db/dump/structure.sql
View File

File diff suppressed because it is too large Load Diff

1
db/export-data.sh
View File

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

3
front/core/styles/icons/salixfont.css
View File

@ -24,11 +24,9 @@
} }
.icon-invoiceIn:before { .icon-invoiceIn:before {
content: "\e960"; content: "\e960";
color: #5f5f5f;
} }
.icon-invoiceOut:before { .icon-invoiceOut:before {
content: "\e961"; content: "\e961";
color: #5f5f5f;
} }
.icon-supplier:before { .icon-supplier:before {
content: "\e936"; content: "\e936";
@ -107,7 +105,6 @@
} }
.icon-invoices:before { .icon-invoices:before {
content: "\e91c"; content: "\e91c";
color: #5f5f5f;
} }
.icon-pets:before { .icon-pets:before {
content: "\e94e"; content: "\e94e";

1
modules/route/back/methods/route/insertTicket.js
View File

@ -38,7 +38,6 @@ module.exports = Self => {
const ticket = await models.Ticket.findOne({ const ticket = await models.Ticket.findOne({
where: { where: {
id: ticketId, id: ticketId,
zoneFk: route.zoneFk,
routeFk: null, routeFk: null,
landed: {between: [minDate, maxDate]}, landed: {between: [minDate, maxDate]},
} }