Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data

This commit is contained in:
Vicent Llopis 2022-03-21 13:15:46 +01:00
commit fae267f539
2 changed files with 5 additions and 2 deletions

View File

@ -122,5 +122,6 @@
"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}",
"The type of business must be filled in basic data": "The type of business must be filled in basic data",
"The worker has hours recorded that day": "The worker has hours recorded that day",
"isWithoutNegatives": "isWithoutNegatives"
"isWithoutNegatives": "isWithoutNegatives",
"routeFk": "routeFk"
}

View File

@ -158,7 +158,8 @@ module.exports = Self => {
'companyFk',
'shipped',
'landed',
'isDeleted'
'isDeleted',
'routeFk'
],
include: [
{
@ -169,6 +170,7 @@ module.exports = Self => {
}]
}, myOptions);
args.routeFk = null;
const updatedTicket = Object.assign({}, args);
delete updatedTicket.ctx;
delete updatedTicket.option;