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

Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-10-03 15:53:05 +02:00
parent 57b9f8b359 a7bd76a218
commit 90831167a1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/loopback/common/methods/ticket/new.js
View File

@ -34,7 +34,7 @@ module.exports = Self => {
params.warehouseFk,
params.companyFk | 442,
params.addressFk,
params.agencyModeFk,
params.agencyModeFk | null,
params.routeFk | null,
params.landed,
params.userId

2
services/loopback/common/models/loggable.js
View File

@ -127,7 +127,7 @@ module.exports = function(Self) {
let userFk;
if (!loopBackContext) userFk = 9;
if (!loopBackContext) userFk = process.env.NODE_ENV ? 1765 : 111;
else userFk = loopBackContext.active.accessToken.userId;
let action = setActionType(ctx);