verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

8282-testToMaster #3284

Merged
alexm merged 157 commits from 8282-testToMaster into master 2024-12-10 06:18:52 +00:00
Conversation 0 Commits 157 Files Changed 93 +2 -4
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 358ed2513d - Show all commits

2
db/versions/11332-tealErica/00-firstScript.sql
View File

@ -1,4 +1,4 @@
ALTER TABLE vn.travel ADD isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada'; ALTER TABLE vn.travel ADD isRaid tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Redada';
ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL ALTER TABLE vn.travel MODIFY COLUMN daysInForward int(10) unsigned DEFAULT NULL
COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed'; COMMENT 'Cuando es una redada, indica el número de días que se añadirán a la fecha de hoy para establecer el landed. NULL si no es una redada';

1
modules/entry/back/methods/entry/filter.js
View File

@ -195,6 +195,7 @@ module.exports = Self => {
e.isConfirmed, e.isConfirmed,
e.isOrdered, e.isOrdered,
t.isRaid, t.isRaid,
t.daysInForward,
e.commission, e.commission,
e.created, e.created,
e.travelFk, e.travelFk,

3
modules/entry/back/models/entry.json
View File

@ -33,9 +33,6 @@
"isConfirmed": { "isConfirmed": {
"type": "boolean" "type": "boolean"
}, },
"isRaid": {
"type": "boolean"
},
"commission": { "commission": {
"type": "number" "type": "number"
}, },