diff --git a/modules/client/front/balance/index/index.js b/modules/client/front/balance/index/index.js index 9e150f1b51..ad5d8e6831 100644 --- a/modules/client/front/balance/index/index.js +++ b/modules/client/front/balance/index/index.js @@ -9,7 +9,7 @@ class Controller { this.$translate = $translate; this.accessToken = vnToken.token; - this.companyFk = vnConfig.companyFk; + this.vnConfig = vnConfig; this.filter = { include: { relation: 'company', @@ -29,6 +29,17 @@ class Controller { }, }; } + + get companyFk() { + if (!this._companyFk) + return this.vnConfig.companyFk; + + return this._companyFk; + } + + set companyFk(id) { + this._companyFk = id; + } setOrder(value) { this.params.params.companyFk = value; this.filter.where.companyFk = value; diff --git a/modules/worker/back/methods/worker-time-control/addTime.js b/modules/worker/back/methods/worker-time-control/addTime.js index 9864142bf4..5548654bc9 100644 --- a/modules/worker/back/methods/worker-time-control/addTime.js +++ b/modules/worker/back/methods/worker-time-control/addTime.js @@ -33,7 +33,13 @@ module.exports = Self => { const subordinate = await Worker.findById(data.workerFk); - return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [ - subordinate.userFk, null, data.timed, true]); + return Self.create({ + userFk: subordinate.userFk, + timed: data.timed, + manual: 1 + }); + + /* return Self.rawSql('CALL vn.workerTimeControl_add(?, ?, ?, ?)', [ + subordinate.userFk, null, data.timed, true]); */ }; }; diff --git a/print/report/rpt-delivery-note/index.js b/print/report/rpt-delivery-note/index.js index 08e2e88274..be6bb83c5a 100755 --- a/print/report/rpt-delivery-note/index.js +++ b/print/report/rpt-delivery-note/index.js @@ -59,8 +59,8 @@ module.exports = { percent(input) { return new Intl.NumberFormat('es', { style: 'percent', - minimumFractionDigits: 0, - maximumFractionDigits: 0 + minimumFractionDigits: 2, + maximumFractionDigits: 2 }).format(parseFloat(input)); }, date(input) {