Merge branch 'dev' into 6693-revisarTriggersPendientes

Reviewed-on: #2025
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

Jenkinsfile

@@ -103,7 +103,7 @@ pipeline {
                                 NODE_ENV = ''
                             }
                             steps {
-                                sh 'npm run test:back:ci'
+                                sh 'node back/tests.js --ci --junit --network jenkins'
                             }
                             post {
                                 always {

db/routines/vn/procedures/item_getLack.sql

@@ -23,7 +23,8 @@ BEGIN
 			SUM(IFNULL(sub.amount,0)) lack,
 			i.inkFk,
 			IFNULL(im.timed, util.midnight()) timed,
-			IFNULL(izc.timed, util.midnight()) minTimed
+			IFNULL(izc.timed, util.midnight()) minTimed,
+			o.name originFk
 		FROM (SELECT item_id, 
 						warehouse_id, 
 						amount
@@ -42,6 +43,7 @@ BEGIN
 			JOIN itemCategory ic ON ic.id = it.categoryFk
 			LEFT JOIN tmp.itemMinETD im ON im.itemFk = i.id
 			LEFT JOIN tmp.itemZoneClosure izc ON izc.itemFk = i.id
+			JOIN origin o ON o.id = i.originFk
 		WHERE w.isForTicket
 			AND ic.display
 			AND it.code != 'GEN'

e2e/tests.js

@@ -10,7 +10,7 @@ const Myt = require('@verdnatura/myt/myt');
 const Run = require('@verdnatura/myt/myt-run');
 
 const axios = require('axios');
-const e2eConfig = require('./config.js');
+const e2eConfig = require('./helpers/config.js');
 const log = require('fancy-log');
 
 process.on('warning', warning => {
@@ -23,11 +23,12 @@ async function test() {
     const opts = getopts(process.argv.slice(2), {
         boolean: ['show']
     });
-    process.env.E2E_SHOW = opts.show;
+    if (opts.show)
+        process.env.E2E_SHOW = true;
 
     console.log('Building and running DB container.');
     const myt = new Myt();
-    await myt.init({workspace: path.join(__dirname, '../..')});
+    await myt.init({workspace: path.join(__dirname, '..')});
     await myt.run(Run);
     await myt.deinit();
 

package.json

@@ -105,14 +105,11 @@
         "yaml-loader": "^0.5.0"
     },
     "scripts": {
-        "dbtest": "nodemon -q db/tests.js -w db/tests",
         "test:back": "nodemon -q back/tests.js --config back/nodemonConfig.json",
-        "test:back:ci": "node back/tests.js --ci --junit --network jenkins",
-        "test:e2e": "node e2e/helpers/tests.js",
+        "test:e2e": "node e2e/tests.js",
         "test:front": "jest --watch",
         "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
-        "lint": "eslint ./ --cache --ignore-pattern .gitignore",
-        "docker": "docker build --progress=plain -t salix-db ./db"
+        "lint": "eslint ./ --cache --ignore-pattern .gitignore"
     },
     "jest": {
         "projects": [