Merge branch 'master' into 5529-invoicingFixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
This commit is contained in:
commit
e342852ed8
|
@ -332,6 +332,12 @@ module.exports = Self => {
|
||||||
|
|
||||||
const lastDay = days[index][days[index].length - 1];
|
const lastDay = days[index][days[index].length - 1];
|
||||||
if (day.workerFk != previousWorkerFk || day == lastDay) {
|
if (day.workerFk != previousWorkerFk || day == lastDay) {
|
||||||
|
await models.WorkerTimeControlMail.create({
|
||||||
|
workerFk: previousWorkerFk,
|
||||||
|
year: args.year,
|
||||||
|
week: args.week
|
||||||
|
}, myOptions);
|
||||||
|
|
||||||
const salix = await models.Url.findOne({
|
const salix = await models.Url.findOne({
|
||||||
where: {
|
where: {
|
||||||
appName: 'salix',
|
appName: 'salix',
|
||||||
|
|
Loading…
Reference in New Issue