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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2022-03-21 13:17:52 +01:00
parent 920bff30c8 19df1fe382
commit 29036cc39d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
loopback/locale/en.json
View File

@ -121,5 +121,6 @@
"Deny buy request": "Purchase request for ticket id [{{ticketId}}]({{{url}}}) has been rejected. Reason: {{observation}}", "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 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", "The worker has hours recorded that day": "The worker has hours recorded that day",
"isWithoutNegatives": "isWithoutNegatives" "isWithoutNegatives": "isWithoutNegatives",
"routeFk": "routeFk"
} }

4
modules/ticket/back/methods/ticket/componentUpdate.js
View File

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