diff --git a/.dockerignore b/.dockerignore
index afe81bb0fc..1a47908abf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,6 @@
 node_modules
 print/node_modules
-front/node_modules
-services
\ No newline at end of file
+front
+db
+e2e
+storage
diff --git a/Jenkinsfile b/Jenkinsfile
index 7087b7d8ae..2c04bcf16f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,21 +5,15 @@ def FROM_GIT
 def RUN_TESTS
 def RUN_BUILD
 
+def BRANCH_ENV = [
+    test: 'test',
+    master: 'production'
+]
+
 node {
     stage('Setup') {
-        switch (env.BRANCH_NAME) {
-            case 'test':
-                env.NODE_ENV = 'test'
-                env.BACK_REPLICAS = 2
-                break
-            case 'master':
-                env.NODE_ENV = 'production'
-                env.BACK_REPLICAS = 4
-                break
-            default:
-                env.NODE_ENV = 'dev'
-                env.BACK_REPLICAS = 1
-        }
+        env.BACK_REPLICAS = 1
+        env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
 
         PROTECTED_BRANCH = [
             'dev',
@@ -31,12 +25,29 @@ node {
         RUN_TESTS = !PROTECTED_BRANCH && FROM_GIT
         RUN_BUILD = PROTECTED_BRANCH && FROM_GIT
 
-        // Uncomment to enable debugging
-        // https://loopback.io/doc/en/lb3/Setting-debug-strings.html#debug-strings-reference
-        //env.DEBUG = 'strong-remoting:shared-method'
+        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+        echo "NODE_NAME: ${env.NODE_NAME}"
+        echo "WORKSPACE: ${env.WORKSPACE}"
 
-        echo "Node: ${NODE_NAME}"
-        echo "Workspace: ${WORKSPACE}"
+        configFileProvider([
+            configFile(fileId: 'salix.properties',
+            variable: 'PROPS_FILE')
+        ]) {
+            def props = readProperties file: PROPS_FILE
+            props.each {key, value -> env."${key}" = value }
+            props.each {key, value -> echo "${key}: ${value}" }
+        }
+
+        if (PROTECTED_BRANCH) {
+            configFileProvider([
+                configFile(fileId: "salix.branch.${env.BRANCH_NAME}",
+                variable: 'BRANCH_PROPS_FILE')
+            ]) {
+                def props = readProperties file: BRANCH_PROPS_FILE
+                props.each {key, value -> env."${key}" = value }
+                props.each {key, value -> echo "${key}: ${value}" }
+            }
+        }
     }
 }
 pipeline {
@@ -81,9 +92,6 @@ pipeline {
             }
         }
         stage('Stack') {
-            environment {
-                TZ = 'Europe/Madrid'
-            }
             parallel {
                 stage('Back') {
                     stages {
@@ -99,14 +107,10 @@ pipeline {
                             }
                             post {
                                 always {
-                                    script {
-                                        try {
-                                            junit 'junitresults.xml'
-                                            junit 'junit.xml'
-                                        } catch (e) {
-                                            echo e.toString()
-                                        }
-                                    }
+                                    junit(
+                                        testResults: 'junitresults.xml',
+                                        allowEmptyResults: true
+                                    )
                                 }
                             }
                         }
@@ -139,6 +143,14 @@ pipeline {
                             steps {
                                 sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
                             }
+                            post {
+                                always {
+                                    junit(
+                                        testResults: 'junit.xml',
+                                        allowEmptyResults: true
+                                    )
+                                }
+                            }
                         }
                         stage('Build') {
                             when {
diff --git a/Dockerfile b/back/Dockerfile
similarity index 100%
rename from Dockerfile
rename to back/Dockerfile
diff --git a/back/models/bank-entity.js b/back/models/bank-entity.js
index c89e0b3644..ac352f93ce 100644
--- a/back/models/bank-entity.js
+++ b/back/models/bank-entity.js
@@ -8,6 +8,26 @@ module.exports = Self => {
     });
 
     Self.validatesUniquenessOf('bic', {
-        message: 'This BIC already exist.'
+        message: 'This BIC already exist'
     });
+
+    Self.validatesPresenceOf('countryFk', {
+        message: 'CountryFK cannot be empty'
+    });
+
+    Self.validateAsync('bic', checkBic, {
+        message: 'Bank entity id must be specified'
+    });
+    async function checkBic(err, done) {
+        const filter = {
+            fields: ['code'],
+            where: {id: this.countryFk}
+        };
+        const country = await Self.app.models.Country.findOne(filter);
+        const code = country ? country.code.toLowerCase() : null;
+
+        if (code == 'es' && !this.id)
+            err();
+        done();
+    }
 };
diff --git a/back/tests.js b/back/tests.js
index 0fb4c76eaf..1848132f8e 100644
--- a/back/tests.js
+++ b/back/tests.js
@@ -1,19 +1,36 @@
 /* eslint-disable no-console */
 const path = require('path');
+const getopts = require('getopts');
 const Myt = require('@verdnatura/myt/myt');
 const Run = require('@verdnatura/myt/myt-run');
 const helper = require('./tests-helper');
 
+const opts = getopts(process.argv.slice(2), {
+    string: [
+        'network'
+    ],
+    boolean: [
+        'ci',
+        'junit'
+    ]
+});
+
 let server;
-const isCI = process.argv[2] === 'ci';
 const PARALLEL = false;
 const TIMEOUT = 900000;
 
-process.on('SIGINT', teardown);
 process.on('exit', teardown);
 process.on('uncaughtException', onError);
 process.on('unhandledRejection', onError);
 
+const exitSignals = [
+    'SIGINT',
+    'SIGUSR1',
+    'SIGUSR2'
+];
+for (const signal of exitSignals)
+    process.on(signal, () => process.exit());
+
 async function setup() {
     console.log('Building and running DB container.');
 
@@ -21,9 +38,9 @@ async function setup() {
     await myt.init({
         workspace: path.join(__dirname, '..'),
         random: true,
-        ci: isCI,
+        ci: opts.ci,
         tmpfs: process.platform == 'linux',
-        network: isCI ? 'jenkins' : null
+        network: opts.network || null
     });
     server = await myt.run(Run);
     await myt.deinit();
@@ -38,18 +55,19 @@ async function setup() {
 
 async function teardown() {
     if (!server) return;
+    const oldServer = server;
+    server = null;
 
     if (!PARALLEL)
         await helper.deinit();
 
     console.log('Stopping and removing DB container.');
-    await server.rm();
-    server = null;
+    await oldServer.rm();
 }
 
 async function onError(err) {
-    await teardown();
     console.error(err);
+    process.exit(1);
 }
 
 async function test() {
@@ -79,8 +97,8 @@ async function test() {
         const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
         runner.addReporter(new SpecReporter({
             spec: {
-                displaySuccessful: isCI,
-                displayPending: isCI
+                displaySuccessful: opts.ci,
+                displayPending: opts.ci
             },
             summary: {
                 displayPending: false,
@@ -88,11 +106,12 @@ async function test() {
         }));
     }
 
-    if (isCI) {
+    if (opts.junit) {
         const JunitReporter = require('jasmine-reporters');
         runner.addReporter(new JunitReporter.JUnitXmlReporter());
-        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
     }
+    if (opts.ci)
+        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
 
     // runner.loadConfigFile('back/jasmine.json');
     runner.loadConfig(config);
diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index ae7612b461..be9fe05fff 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -184,8 +184,8 @@ INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory
         (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 1,   0, 0, 0),
         (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 1,   0, 0, 0);
 
-INSERT INTO `vn`.`sectorType` (id,description)
-	VALUES (1,'First type');
+INSERT INTO `vn`.`sectorType` (`id`, `code`)
+	VALUES (1,'normal');
 
 INSERT INTO `vn`.`sector`(`id`, `description`, `warehouseFk`, `code`, `typeFk`)
     VALUES
diff --git a/db/routines/util/functions/accountNumberToIban.sql b/db/routines/util/functions/accountNumberToIban.sql
new file mode 100644
index 0000000000..49d3c917e5
--- /dev/null
+++ b/db/routines/util/functions/accountNumberToIban.sql
@@ -0,0 +1,58 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
+	vAccount VARCHAR(20)
+)
+	RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
+	DETERMINISTIC
+BEGIN
+/**
+* Calcula y genera el código IBAN correspondiente
+* a un número de cuenta bancaria español.
+*
+* @param vAccount Número de cuenta bancaria
+* @return vIban Código IBAN de 4 caracteres.
+*/
+	DECLARE vIban VARCHAR(4);
+
+	SELECT
+		CONCAT('ES',
+			RIGHT(
+				CONCAT(0,
+					98-MOD(
+						CONCAT(
+							MOD(
+								CONCAT(
+									MOD(
+										CONCAT(
+											MOD(
+												SUBSTRING(vAccount, 1, 8),
+												97
+											),
+											SUBSTRING(vAccount,9,8)
+										),
+										97
+									),
+									SUBSTRING(
+										CONCAT(vAccount, 142800),
+										17,
+										8
+									)
+								),
+								97
+							),
+							SUBSTRING(
+								CONCAT(vAccount, 142800),
+								25,
+								2
+							)
+						),
+						97
+					)
+				),
+				2
+			)
+		) INTO vIban;
+
+	RETURN vIban;
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/functions/intrastat_estimateNet.sql b/db/routines/vn/functions/intrastat_estimateNet.sql
new file mode 100644
index 0000000000..350cb788af
--- /dev/null
+++ b/db/routines/vn/functions/intrastat_estimateNet.sql
@@ -0,0 +1,32 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`intrastat_estimateNet`(
+	vSelf INT,
+	vStems INT
+)
+	RETURNS double
+	DETERMINISTIC
+BEGIN
+/**
+* Calcula un valor neto estimado en función de 
+* datos históricos de facturas intrastat.
+*
+* @param vSelf Id de intrastat
+* @param vStems Número de unidades
+* @return vNet
+*/
+	DECLARE vNet DOUBLE;
+
+	SELECT ROUND(vStems / (SUM(average) / COUNT(average)), 2) INTO vNet
+		FROM (
+			SELECT *, stems / net average
+				FROM invoiceInIntrastat
+				WHERE intrastatFk = vSelf
+					AND net
+					AND stems > 0
+				ORDER BY dated DESC
+				LIMIT 20
+		) sub;
+
+	RETURN vNet/2;
+END$$
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/procedures/collectionPlacement_get.sql b/db/routines/vn/procedures/collectionPlacement_get.sql
index db452ec2aa..3641ba7053 100644
--- a/db/routines/vn/procedures/collectionPlacement_get.sql
+++ b/db/routines/vn/procedures/collectionPlacement_get.sql
@@ -70,9 +70,9 @@ BEGIN
 				ish.created,
 				ish.visible,
 				IFNULL(
-					IF(st.description = 'previousByPacking', ish.packing, g.`grouping`),
+					IF(st.code = 'previousByPacking', ish.packing, g.`grouping`),
 					1) `grouping`,
-				st.description = 'previousPrepared' isPreviousPrepared,
+				st.code = 'previousPrepared' isPreviousPrepared,
 				iss.id itemShelvingSaleFk,
 				ts.ticketFk,
 				iss.id,
diff --git a/db/routines/vn/procedures/itemShelving_get.sql b/db/routines/vn/procedures/itemShelving_get.sql
index 98f8659943..1be762f094 100644
--- a/db/routines/vn/procedures/itemShelving_get.sql
+++ b/db/routines/vn/procedures/itemShelving_get.sql
@@ -15,11 +15,13 @@ BEGIN
 			p.code,
 			ish.id,
 			s.priority,
-			ish.isChecked
+			ish.isChecked,
+			ic.url
 		FROM itemShelving ish
 			JOIN item i ON i.id = ish.itemFk
 			JOIN shelving s ON vSelf = s.code COLLATE utf8_unicode_ci
 			LEFT JOIN parking p ON s.parkingFk = p.id
+			JOIN hedera.imageConfig ic
 		WHERE ish.shelvingFk COLLATE utf8_unicode_ci = vSelf;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/productionControl.sql b/db/routines/vn/procedures/productionControl.sql
index 3f36638651..b42645d1ed 100644
--- a/db/routines/vn/procedures/productionControl.sql
+++ b/db/routines/vn/procedures/productionControl.sql
@@ -207,7 +207,7 @@ proc: BEGIN
 		ENGINE = MEMORY
 		SELECT ish.itemFk,
 				p.sectorFk,
-				st.description = 'previousPrepared' isPreviousPrepared,
+				st.code = 'previousPrepared' isPreviousPrepared,
 				sc.itemPackingTypeFk
 			FROM itemShelving ish
 				JOIN shelving sh ON sh.code = ish.shelvingFk
diff --git a/db/routines/vn/procedures/productionSectorList.sql b/db/routines/vn/procedures/productionSectorList.sql
index ea047b3762..5447f10d03 100644
--- a/db/routines/vn/procedures/productionSectorList.sql
+++ b/db/routines/vn/procedures/productionSectorList.sql
@@ -85,7 +85,7 @@ BEGIN
 						JOIN client c ON c.id = t.clientFk
 						JOIN tmp.productionBuffer pb ON pb.ticketFk = t.id
 						JOIN packagingConfig pc
-					WHERE IF(st.description = 'previousByPacking',
+					WHERE IF(st.code = 'previousByPacking',
 								i.`size` > pc.previousPreparationMinimumSize
 								AND (MOD(TRUNCATE(isa.quantity,0), isa.packing)= 0 ),
 							TRUE)
diff --git a/db/routines/vn/views/itemShelvingStock.sql b/db/routines/vn/views/itemShelvingStock.sql
index 15afe72a24..e0825eae58 100644
--- a/db/routines/vn/views/itemShelvingStock.sql
+++ b/db/routines/vn/views/itemShelvingStock.sql
@@ -15,7 +15,7 @@ AS SELECT `ish`.`itemFk` AS `itemFk`,
 	`sh`.`parkingFk` AS `parkingFk`,
 	`ish`.`id` AS `itemShelvingFk`,
 	`ish`.`created` AS `created`,
-	`st`.`description` = 'previousPrepared' AS `isPreviousPrepared`
+	`st`.`code` = 'previousPrepared' AS `isPreviousPrepared`
 FROM (
 		(
 			(
diff --git a/db/routines/vn2008/functions/cc_to_iban.sql b/db/routines/vn2008/functions/cc_to_iban.sql
deleted file mode 100644
index c4515a9cce..0000000000
--- a/db/routines/vn2008/functions/cc_to_iban.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn2008`.`cc_to_iban`(cc VARCHAR(20))
-	RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
-	DETERMINISTIC
-BEGIN
-	DECLARE iban VARCHAR(4);
-	select
-		CONCAT('ES',
-			RIGHT(
-				concat(0,
-					98-
-						mod(
-							concat(
-								mod(
-									concat(
-										mod(
-											concat(
-												mod(
-													substring(cc,1,8),
-													97),
-												substring(cc,9,8)
-											),
-											97),
-										substring(
-											concat(
-												cc,
-												142800
-											),
-											17,
-											8
-										)
-									),
-								97),
-								substring(
-									concat(
-										cc,
-										142800
-									),
-									25,
-									2
-								)
-							),
-						97)
-					)
-			,2)
-		)into iban;
-RETURN iban;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/functions/intrastat_neto.sql b/db/routines/vn2008/functions/intrastat_neto.sql
deleted file mode 100644
index 34e01de8c1..0000000000
--- a/db/routines/vn2008/functions/intrastat_neto.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn2008`.`intrastat_neto`(intINSTRASTAT INTEGER,intUNIDADES INTEGER)
-	RETURNS double
-	DETERMINISTIC
-BEGIN
-
-	DECLARE n DOUBLE;
-
-	SELECT ROUND(intUNIDADES / (SUM(MEDIA) / COUNT(media)), 2) INTO n FROM
-		(SELECT *, unidades / neto MEDIA
-			FROM intrastat_data
-		WHERE intrastat_id = intINSTRASTAT AND neto
-				AND unidades > 0
-		ORDER BY odbc_date DESC
-		LIMIT 20) t;
-	-- JGF 01/06 per a evitar Kg en negatiu
-	RETURN n/2;
-
-END$$
-DELIMITER ;
diff --git a/db/versions/10866-whiteRaphis/00-firstScript.sql b/db/versions/10866-whiteRaphis/00-firstScript.sql
deleted file mode 100644
index bfbcb5dc97..0000000000
--- a/db/versions/10866-whiteRaphis/00-firstScript.sql
+++ /dev/null
@@ -1 +0,0 @@
-REVOKE EXECUTE ON FUNCTION vn2008.red FROM hrBoss, salesPerson;
diff --git a/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql b/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql
new file mode 100644
index 0000000000..24f5346a88
--- /dev/null
+++ b/db/versions/10872-pinkLilium/00-aclUpdateFiscalData.sql
@@ -0,0 +1,3 @@
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+    VALUES ('Supplier', 'updateAllFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+            ('Supplier', 'updateFiscalData', 'WRITE', 'ALLOW', 'ROLE', 'buyer');
\ No newline at end of file
diff --git a/db/versions/10873-greenPaniculata/00-firstScript.sql b/db/versions/10873-greenPaniculata/00-firstScript.sql
new file mode 100644
index 0000000000..3125eb7aa8
--- /dev/null
+++ b/db/versions/10873-greenPaniculata/00-firstScript.sql
@@ -0,0 +1,60 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `util`.`accountNumberToIban`(
+	vAccount VARCHAR(20)
+)
+	RETURNS varchar(4) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
+	DETERMINISTIC
+BEGIN
+/**
+* Calcula y genera el código IBAN correspondiente
+* a un número de cuenta bancaria español.
+*
+* @param vAccount Número de cuenta bancaria
+* @return vIban Código IBAN de 4 caracteres.
+*/
+	DECLARE vIban VARCHAR(4);
+
+	SELECT
+		CONCAT('ES',
+			RIGHT(
+				CONCAT(0,
+					98-MOD(
+						CONCAT(
+							MOD(
+								CONCAT(
+									MOD(
+										CONCAT(
+											MOD(
+												SUBSTRING(vAccount, 1, 8),
+												97
+											),
+											SUBSTRING(vAccount,9,8)
+										),
+										97
+									),
+									SUBSTRING(
+										CONCAT(vAccount, 142800),
+										17,
+										8
+									)
+								),
+								97
+							),
+							SUBSTRING(
+								CONCAT(vAccount, 142800),
+								25,
+								2
+							)
+						),
+						97
+					)
+				),
+				2
+			)
+		) INTO vIban;
+
+	RETURN vIban;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON FUNCTION util.accountNumberToIban TO hr, financial;
diff --git a/db/versions/10874-yellowRose/00-firstScript.sql b/db/versions/10874-yellowRose/00-firstScript.sql
new file mode 100644
index 0000000000..6d5b1ee867
--- /dev/null
+++ b/db/versions/10874-yellowRose/00-firstScript.sql
@@ -0,0 +1,38 @@
+ALTER TABLE vn.sectorType CHANGE description code varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+
+-- Si no pongo lo de bajo da error en la view vn.itemShelvingAvailable
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`itemShelvingStock`
+AS SELECT `ish`.`itemFk` AS `itemFk`,
+	sum(`ish`.`visible`) AS `visible`,
+	min(`ish`.`packing`) AS `packing`,
+	min(`ish`.`grouping`) AS `grouping`,
+	`s`.`description` AS `sector`,
+	sum(`ish`.`visible`) AS `visibleOriginal`,
+	0 AS `removed`,
+	`p`.`sectorFk` AS `sectorFk`,
+	`s`.`warehouseFk` AS `warehouseFk`,
+	`ish`.`shelvingFk` AS `shelvingFk`,
+	`p`.`code` AS `parkingCode`,
+	`sh`.`parkingFk` AS `parkingFk`,
+	`ish`.`id` AS `itemShelvingFk`,
+	`ish`.`created` AS `created`,
+	`st`.`code` = 'previousPrepared' AS `isPreviousPrepared`
+FROM (
+		(
+			(
+				(
+					`vn`.`itemShelving` `ish`
+					LEFT JOIN `vn`.`shelving` `sh` ON(`sh`.`code` = `ish`.`shelvingFk`)
+				)
+				LEFT JOIN `vn`.`parking` `p` ON(`p`.`id` = `sh`.`parkingFk`)
+			)
+			LEFT JOIN `vn`.`sector` `s` ON(`s`.`id` = `p`.`sectorFk`)
+		)
+		LEFT JOIN `vn`.`sectorType` `st` ON(`st`.`id` = `s`.`typeFk`)
+	)
+WHERE `ish`.`visible` <> 0
+	AND `p`.`sectorFk` <> 0
+GROUP BY `ish`.`itemFk`,
+	`p`.`sectorFk`;
\ No newline at end of file
diff --git a/db/versions/10879-maroonCymbidium/00-firstScript.sql b/db/versions/10879-maroonCymbidium/00-firstScript.sql
new file mode 100644
index 0000000000..7efc4d6ab7
--- /dev/null
+++ b/db/versions/10879-maroonCymbidium/00-firstScript.sql
@@ -0,0 +1,34 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`intrastat_estimateNet`(
+	vSelf INT,
+	vStems INT
+)
+	RETURNS double
+	DETERMINISTIC
+BEGIN
+/**
+* Calcula un valor neto estimado en función de 
+* datos históricos de facturas intrastat.
+*
+* @param vSelf Id de intrastat
+* @param vStems Número de unidades
+* @return vNet
+*/
+	DECLARE vNet DOUBLE;
+
+	SELECT ROUND(vStems / (SUM(average) / COUNT(average)), 2) INTO vNet
+		FROM (
+			SELECT *, stems / net average
+				FROM invoiceInIntrastat
+				WHERE intrastatFk = vSelf
+					AND net
+					AND stems > 0
+				ORDER BY dated DESC
+				LIMIT 20
+		) sub;
+
+	RETURN vNet/2;
+END$$
+DELIMITER ;
+
+GRANT EXECUTE ON FUNCTION vn.intrastat_estimateNet TO administrative;
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index dda4187f29..5bb1680930 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,8 +3,9 @@ services:
   front:
     image: registry.verdnatura.es/salix-front:${VERSION:?}
     build:
-      context: .
-      dockerfile: front/Dockerfile
+      context: front
+    environment:
+      - TZ
     ports:
       - 80
     deploy:
@@ -17,12 +18,15 @@ services:
           memory: 1G
   back:
     image: registry.verdnatura.es/salix-back:${VERSION:?}
-    build: .
-    ports:
-      - 3000
+    build:
+      context: .
+      dockerfile: back/Dockerfile
     environment:
+      - TZ
       - NODE_ENV
       - DEBUG
+    ports:
+      - 3000
     configs:
       - source: datasources
         target: /etc/salix/datasources.json
diff --git a/e2e/helpers/tests.js b/e2e/helpers/tests.js
index a4a0596222..7dd299e0b4 100644
--- a/e2e/helpers/tests.js
+++ b/e2e/helpers/tests.js
@@ -1,7 +1,9 @@
+/* eslint-disable no-console */
 require('@babel/register')({presets: ['@babel/env']});
 require('core-js/stable');
 require('regenerator-runtime/runtime');
 require('vn-loopback/server/boot/date')();
+const getopts = require('getopts');
 
 const path = require('path');
 const Myt = require('@verdnatura/myt/myt');
@@ -18,12 +20,16 @@ process.on('warning', warning => {
 });
 
 async function test() {
-    if (process.argv[2] === 'show')
-        process.env.E2E_SHOW = true;
+    const opts = getopts(process.argv.slice(2), {
+        boolean: ['show']
+    });
+    process.env.E2E_SHOW = opts.show;
 
+    console.log('Building and running DB container.');
     const myt = new Myt();
     await myt.init({workspace: path.join(__dirname, '../..')});
     await myt.run(Run);
+    await myt.deinit();
 
     const Jasmine = require('jasmine');
     const jasmine = new Jasmine();
@@ -70,12 +76,10 @@ async function test() {
 
     jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
     await jasmine.execute();
-
-    await myt.deinit();
 }
 
 async function backendStatus() {
-    log('Awaiting backend connection...');
+    log('Awaiting backend connection.');
 
     const milliseconds = 1000;
     const maxAttempts = 10;
diff --git a/front/Dockerfile b/front/Dockerfile
index d0ee269041..c507d863cf 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update \
     && ln -sf /dev/stderr /var/log/nginx/error.log
 
 WORKDIR /etc/nginx
-COPY front/nginx.conf sites-available/salix
+COPY nginx.conf sites-available/salix
 RUN rm sites-enabled/default && ln -s ../sites-available/salix sites-enabled/salix
 
 COPY dist /salix/dist
diff --git a/fileMock.js b/front/jest-mock.js
similarity index 100%
rename from fileMock.js
rename to front/jest-mock.js
diff --git a/jest-front.js b/front/jest-setup.js
similarity index 59%
rename from jest-front.js
rename to front/jest-setup.js
index eabda91101..eebd99bbd9 100644
--- a/jest-front.js
+++ b/front/jest-setup.js
@@ -1,19 +1,19 @@
 import 'angular';
 import 'angular-mocks';
-import core from './front/core/module.js';
-import './front/salix/components/app/app.js';
-import './modules/zone/front/module.js';
-import './modules/claim/front/module.js';
-import './modules/client/front/module.js';
-import './modules/invoiceOut/front/module.js';
-import './modules/invoiceIn/front/module.js';
-import './modules/item/front/module.js';
-import './modules/order/front/module.js';
-import './modules/route/front/module.js';
-import './modules/ticket/front/module.js';
-import './modules/travel/front/module.js';
-import './modules/worker/front/module.js';
-import './modules/shelving/front/module.js';
+import core from './core/module.js';
+import './salix/components/app/app.js';
+import '../modules/zone/front/module.js';
+import '../modules/claim/front/module.js';
+import '../modules/client/front/module.js';
+import '../modules/invoiceOut/front/module.js';
+import '../modules/invoiceIn/front/module.js';
+import '../modules/item/front/module.js';
+import '../modules/order/front/module.js';
+import '../modules/route/front/module.js';
+import '../modules/ticket/front/module.js';
+import '../modules/travel/front/module.js';
+import '../modules/worker/front/module.js';
+import '../modules/shelving/front/module.js';
 import 'vn-loopback/server/boot/date';
 
 // Set NODE_ENV
diff --git a/gulpfile.js b/gulpfile.js
index a4caa61966..054a65c1c7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,7 @@
+/* eslint-disable no-console */
 require('require-yaml');
 const gulp = require('gulp');
 const PluginError = require('plugin-error');
-const argv = require('minimist')(process.argv.slice(2));
 const log = require('fancy-log');
 const Myt = require('@verdnatura/myt/myt');
 const Run = require('@verdnatura/myt/myt-run');
@@ -11,13 +11,10 @@ const Start = require('@verdnatura/myt/myt-start');
 
 let isWindows = /^win/.test(process.platform);
 
-if (argv.NODE_ENV)
-    process.env.NODE_ENV = argv.NODE_ENV;
-
 let langs = ['es', 'en'];
 let srcDir = './front';
 let modulesDir = './modules';
-let buildDir = 'dist';
+let buildDir = 'front/dist';
 
 let backSources = [
     '!node_modules',
@@ -67,19 +64,40 @@ back.description = `Starts backend and database service`;
 
 const defaultTask = gulp.parallel(front, back);
 defaultTask.description = `Starts all application services`;
-function install() {
-    const install = require('gulp-install');
-    const print = require('gulp-print');
+async function install() {
+    const spawn = require('child_process').spawn;
 
-    let npmArgs = [];
-    if (argv.ci) npmArgs = ['--no-audit', '--prefer-offline'];
+    console.log('-> Installing global packages...');
+    await pnpmInstall();
 
-    let packageFiles = ['front/package.json', 'print/package.json'];
-    return gulp.src(packageFiles)
-        .pipe(print(filepath => {
-            return `Installing packages in ${filepath}`;
-        }))
-        .pipe(install({npm: npmArgs}));
+    const modules = ['front', 'print'];
+    for (const module of modules) {
+        console.log(`-> Installing '${module}' packages...`);
+        await pnpmInstall(module);
+    }
+
+    async function pnpmInstall(prefix) {
+        let args = ['install', '--prefer-offline'];
+        if (prefix) args = args.concat(['--prefix', prefix]);
+
+        const options = {
+            stdio: [
+                process.stdin,
+                process.stdout,
+                process.stderr
+            ]
+        };
+
+        await new Promise((resolve, reject) => {
+            const child = spawn('pnpm', args, options);
+            child.on('exit', code => {
+                if (code !== 0)
+                    reject(new Error(`pnpm exit code ${code}`));
+                else
+                    resolve(code);
+            });
+        });
+    }
 }
 install.description = `Installs node dependencies in all directories`;
 
diff --git a/jest.front.config.js b/jest.front.config.js
index 3289df8bbf..a843832ea2 100644
--- a/jest.front.config.js
+++ b/jest.front.config.js
@@ -10,7 +10,7 @@ module.exports = {
     },
     testEnvironment: 'jsdom',
     setupFilesAfterEnv: [
-        './jest-front.js'
+        './front/jest-setup.js'
     ],
     testMatch: [
         '**/front/**/*.spec.js',
@@ -37,7 +37,7 @@ module.exports = {
     ],
     moduleNameMapper: {
         '\\.(css|scss)$': 'identity-obj-proxy',
-        '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/fileMock.js',
+        '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/front/jest-mock.js',
     },
     testURL: 'http://localhost',
     verbose: false,
diff --git a/loopback/locale/en.json b/loopback/locale/en.json
index 10ab08d57a..419775d1b3 100644
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@@ -198,6 +198,7 @@
 	"Booking completed": "Booking complete",
 	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
 	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+	"Bank entity must be specified": "Bank entity must be specified",
 	"Try again": "Try again",
 	"keepPrice": "keepPrice",
 	"Cannot past travels with entries": "Cannot past travels with entries",
@@ -205,6 +206,5 @@
 	"Incorrect pin": "Incorrect pin.",
 	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified",
 	"Name should be uppercase": "Name should be uppercase",
-	"Fecha fuera de rango": "Fecha fuera de rango",
-	"There is no zone for these parameters 34": "There is no zone for these parameters 34"
-}
+	"You cannot update these fields": "You cannot update these fields"
+}
\ No newline at end of file
diff --git a/loopback/locale/es.json b/loopback/locale/es.json
index 394fca4501..6b89d68351 100644
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@@ -1,344 +1,32 @@
 {
-	"Phone format is invalid": "El formato del teléfono no es correcto",
-	"You are not allowed to change the credit": "No tienes privilegios para modificar el crédito",
-	"Unable to mark the equivalence surcharge": "No se puede marcar el recargo de equivalencia",
-	"The default consignee can not be unchecked": "No se puede desmarcar el consignatario predeterminado",
-	"Unable to default a disabled consignee": "No se puede poner predeterminado un consignatario desactivado",
-	"Can't be blank": "No puede estar en blanco",
-	"Invalid TIN": "NIF/CIF inválido",
-	"TIN must be unique": "El NIF/CIF debe ser único",
-	"A client with that Web User name already exists": "Ya existe un cliente con ese Usuario Web",
-	"Is invalid": "Es inválido",
-	"Quantity cannot be zero": "La cantidad no puede ser cero",
-	"Enter an integer different to zero": "Introduce un entero distinto de cero",
-	"Package cannot be blank": "El embalaje no puede estar en blanco",
-	"The company name must be unique": "La razón social debe ser única",
-	"Invalid email": "Correo electrónico inválido",
-	"The IBAN does not have the correct format": "El IBAN no tiene el formato correcto",
-	"That payment method requires an IBAN": "El método de pago seleccionado requiere un IBAN",
-	"That payment method requires a BIC": "El método de pago seleccionado requiere un BIC",
-	"State cannot be blank": "El estado no puede estar en blanco",
-	"Worker cannot be blank": "El trabajador no puede estar en blanco",
-	"Cannot change the payment method if no salesperson": "No se puede cambiar la forma de pago si no hay comercial asignado",
-	"can't be blank": "El campo no puede estar vacío",
-	"Observation type must be unique": "El tipo de observación no puede repetirse",
+	"There are not picking tickets": "There are not picking tickets",
+	"Invalid email": "Invalid email",
+	"Name cannot be blank": "Name cannot be blank",
+	"Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
+	"CountryFK cannot be empty": "CountryFK cannot be empty",
+	"Social name should be uppercase": "Social name should be uppercase",
+	"Street cannot be empty": "Street cannot be empty",
+	"Street should be uppercase": "Street should be uppercase",
+	"City cannot be empty": "City cannot be empty",
+	"Phone cannot be blank": "Phone cannot be blank",
 	"The credit must be an integer greater than or equal to zero": "The credit must be an integer greater than or equal to zero",
-	"The grade must be similar to the last one": "El grade debe ser similar al último",
-	"Only manager can change the credit": "Solo el gerente puede cambiar el credito de este cliente",
-	"Name cannot be blank": "El nombre no puede estar en blanco",
-	"Phone cannot be blank": "El teléfono no puede estar en blanco",
-	"Period cannot be blank": "El periodo no puede estar en blanco",
-	"Choose a company": "Selecciona una empresa",
-	"Se debe rellenar el campo de texto": "Se debe rellenar el campo de texto",
-	"Description should have maximum of 45 characters": "La descripción debe tener maximo 45 caracteres",
-	"Cannot be blank": "El campo no puede estar en blanco",
-	"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
-	"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
-	"Description cannot be blank": "Se debe rellenar el campo de texto",
-	"The price of the item changed": "El precio del artículo cambió",
-	"The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
-	"The value should be a number": "El valor debe ser un numero",
-	"This order is not editable": "Esta orden no se puede modificar",
-	"You can't create an order for a frozen client": "No puedes crear una orden para un cliente congelado",
-	"You can't create an order for a client that has a debt": "No puedes crear una orden para un cliente con deuda",
-	"is not a valid date": "No es una fecha valida",
-	"Barcode must be unique": "El código de barras debe ser único",
-	"The warehouse can't be repeated": "El almacén no puede repetirse",
-	"The tag or priority can't be repeated for an item": "El tag o prioridad no puede repetirse para un item",
-	"The observation type can't be repeated": "El tipo de observación no puede repetirse",
-	"A claim with that sale already exists": "Ya existe una reclamación para esta línea",
-	"You don't have enough privileges to change that field": "No tienes permisos para cambiar ese campo",
-	"Warehouse cannot be blank": "El almacén no puede quedar en blanco",
-	"Agency cannot be blank": "La agencia no puede quedar en blanco",
-	"Not enough privileges to edit a client with verified data": "No tienes permisos para hacer cambios en un cliente con datos comprobados",
-	"This address doesn't exist": "Este consignatario no existe",
-	"You must delete the claim id %d first": "Antes debes borrar la reclamación %d",
-	"You don't have enough privileges": "No tienes suficientes permisos",
-	"Cannot check Equalization Tax in this NIF/CIF": "No se puede marcar RE en este NIF/CIF",
-	"You can't make changes on the basic data of an confirmed order or with rows": "No puedes cambiar los datos básicos de una orden con artículos",
-	"INVALID_USER_NAME": "El nombre de usuario solo debe contener letras minúsculas o, a partir del segundo carácter, números o subguiones, no está permitido el uso de la letra ñ",
-	"You can't create a ticket for a frozen client": "No puedes crear un ticket para un cliente congelado",
-	"You can't create a ticket for an inactive client": "No puedes crear un ticket para un cliente inactivo",
-	"Tag value cannot be blank": "El valor del tag no puede quedar en blanco",
-	"ORDER_EMPTY": "Cesta vacía",
-	"You don't have enough privileges to do that": "No tienes permisos para cambiar esto",
-	"NO SE PUEDE DESACTIVAR EL CONSIGNAT": "NO SE PUEDE DESACTIVAR EL CONSIGNAT",
-	"Error. El NIF/CIF está repetido": "Error. El NIF/CIF está repetido",
-	"Street cannot be empty": "Dirección no puede estar en blanco",
-	"City cannot be empty": "Ciudad no puede estar en blanco",
-	"Code cannot be blank": "Código no puede estar en blanco",
-	"You cannot remove this department": "No puedes eliminar este departamento",
-	"The extension must be unique": "La extensión debe ser unica",
-	"The secret can't be blank": "La contraseña no puede estar en blanco",
-	"We weren't able to send this SMS": "No hemos podido enviar el SMS",
-	"This client can't be invoiced": "Este cliente no puede ser facturado",
-	"You must provide the correction information to generate a corrective invoice": "Debes informar la información de corrección para generar una factura rectificativa",
-	"This ticket can't be invoiced": "Este ticket no puede ser facturado",
-	"You cannot add or modify services to an invoiced ticket": "No puedes añadir o modificar servicios a un ticket facturado",
-	"This ticket can not be modified": "Este ticket no puede ser modificado",
-	"The introduced hour already exists": "Esta hora ya ha sido introducida",
-	"INFINITE_LOOP": "Existe una dependencia entre dos Jefes",
-	"The sales of the receiver ticket can't be modified": "Las lineas del ticket al que envias no pueden ser modificadas",
-	"NO_AGENCY_AVAILABLE": "No hay una zona de reparto disponible con estos parámetros",
-	"ERROR_PAST_SHIPMENT": "No puedes seleccionar una fecha de envío en pasado",
-	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
-	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
-	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
-	"The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
-	"Please select at least one sale": "Por favor selecciona al menos una linea",
-	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
-	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"This item doesn't exists": "El artículo no existe",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
-	"Extension format is invalid": "El formato de la extensión es inválido",
-	"Invalid parameters to create a new ticket": "Parámetros inválidos para crear un nuevo ticket",
-	"This item is not available": "Este artículo no está disponible",
-	"This postcode already exists": "Este código postal ya existe",
-	"Concept cannot be blank": "El concepto no puede quedar en blanco",
-	"File doesn't exists": "El archivo no existe",
-	"You don't have privileges to change the zone": "No tienes permisos para cambiar la zona o para esos parámetros hay más de una opción de envío, hable con las agencias",
-	"This ticket is already on weekly tickets": "Este ticket ya está en tickets programados",
-	"Ticket id cannot be blank": "El id de ticket no puede quedar en blanco",
-	"Weekday cannot be blank": "El día de la semana no puede quedar en blanco",
-	"You can't delete a confirmed order": "No puedes borrar un pedido confirmado",
-	"The social name has an invalid format": "El nombre fiscal tiene un formato incorrecto",
-	"Invalid quantity": "Cantidad invalida",
-	"This postal code is not valid": "Este código postal no es válido",
-	"is invalid": "es inválido",
-	"The postcode doesn't exist. Please enter a correct one": "El código postal no existe. Por favor, introduce uno correcto",
-	"The department name can't be repeated": "El nombre del departamento no puede repetirse",
-	"This phone already exists": "Este teléfono ya existe",
-	"You cannot move a parent to its own sons": "No puedes mover un elemento padre a uno de sus hijos",
-	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
-	"You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
-	"You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
-	"You should specify a date": "Debes especificar una fecha",
-	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fin",
-	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fin",
-	"You should mark at least one week day": "Debes marcar al menos un día de la semana",
-	"Swift / BIC can't be empty": "Swift / BIC no puede estar vacío",
-	"Customs agent is required for a non UEE member": "El agente de aduanas es requerido para los clientes extracomunitarios",
-	"Incoterms is required for a non UEE member": "El incoterms es requerido para los clientes extracomunitarios",
-	"Deleted sales from ticket": "He eliminado las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{deletions}}}",
-	"Added sale to ticket": "He añadido la siguiente linea al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{addition}}}",
-	"Changed sale discount": "He cambiado el descuento de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Created claim": "He creado la reclamación [{{claimId}}]({{{claimUrl}}}) de las siguientes lineas del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Changed sale price": "He cambiado el precio de [{{itemId}} {{concept}}]({{{itemUrl}}}) ({{quantity}}) de {{oldPrice}}€ ➔ *{{newPrice}}€* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"Changed sale quantity": "He cambiado la cantidad de [{{itemId}} {{concept}}]({{{itemUrl}}}) de {{oldQuantity}} ➔ *{{newQuantity}}* del ticket [{{ticketId}}]({{{ticketUrl}}})",
-	"State": "Estado",
-	"regular": "normal",
-	"reserved": "reservado",
-	"Changed sale reserved state": "He cambiado el estado reservado de las siguientes lineas al ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"Bought units from buy request": "Se ha comprado {{quantity}} unidades de [{{itemId}} {{concept}}]({{{urlItem}}}) para el ticket id [{{ticketId}}]({{{url}}})",
-	"Deny buy request": "Se ha rechazado la petición de compra para el ticket id [{{ticketId}}]({{{url}}}). Motivo: {{observation}}",
-	"MESSAGE_INSURANCE_CHANGE": "He cambiado el crédito asegurado del cliente [{{clientName}} ({{clientId}})]({{{url}}}) a *{{credit}} €*",
-	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
-	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
-	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
-	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
-	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
-	"Distance must be lesser than 1000": "La distancia debe ser inferior a 1000",
-	"This ticket is deleted": "Este ticket está eliminado",
-	"Unable to clone this travel": "No ha sido posible clonar este travel",
-	"This thermograph id already exists": "La id del termógrafo ya existe",
-	"Choose a date range or days forward": "Selecciona un rango de fechas o días en adelante",
-	"ORDER_ALREADY_CONFIRMED": "ORDEN YA CONFIRMADA",
-	"Invalid password": "Invalid password",
-	"Password does not meet requirements": "La contraseña no cumple los requisitos",
-	"Role already assigned": "Rol ya asignado",
-	"Invalid role name": "Nombre de rol no válido",
-	"Role name must be written in camelCase": "El nombre del rol debe escribirse en camelCase",
-	"Email already exists": "El correo ya existe",
-	"User already exists": "El/La usuario/a ya existe",
-	"Absence change notification on the labour calendar": "Notificación de cambio de ausencia en el calendario laboral",
-	"Record of hours week": "Registro de horas semana {{week}} año {{year}} ",
-	"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
-	"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
-	"I have deleted the ticket id": "He eliminado el ticket id [{{id}}]({{{url}}})",
-	"I have restored the ticket id": "He restaurado el ticket id [{{id}}]({{{url}}})",
-	"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación",
-	"Changed this data from the ticket": "He cambiado estos datos del ticket [{{ticketId}}]({{{ticketUrl}}}): {{{changes}}}",
-	"agencyModeFk": "Agencia",
-	"clientFk": "Cliente",
-	"zoneFk": "Zona",
-	"warehouseFk": "Almacén",
-	"shipped": "F. envío",
-	"landed": "F. entrega",
-	"addressFk": "Consignatario",
-	"companyFk": "Empresa",
-	"The social name cannot be empty": "La razón social no puede quedar en blanco",
-	"The nif cannot be empty": "El NIF no puede quedar en blanco",
-	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
-	"ASSIGN_ZONE_FIRST": "Asigna una zona primero",
-	"Amount cannot be zero": "El importe no puede ser cero",
-	"Company has to be official": "Empresa inválida",
-	"You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
-	"Action not allowed on the test environment": "Esta acción no está permitida en el entorno de pruebas",
-	"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
-	"New ticket request has been created with price": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}* y un precio de *{{price}} €*",
-	"New ticket request has been created": "Se ha creado una nueva petición de compra '{{description}}' para el día *{{shipped}}*, con una cantidad de *{{quantity}}*",
-	"Swift / BIC cannot be empty": "Swift / BIC no puede estar vacío",
-	"This BIC already exist.": "Este BIC ya existe.",
-	"That item doesn't exists": "Ese artículo no existe",
-	"There's a new urgent ticket:": "Hay un nuevo ticket urgente:",
-	"Invalid account": "Cuenta inválida",
-	"Compensation account is empty": "La cuenta para compensar está vacia",
-	"This genus already exist": "Este genus ya existe",
-	"This specie already exist": "Esta especie ya existe",
-	"Client assignment has changed": "He cambiado el comercial ~*\"<{{previousWorkerName}}>\"*~ por *\"<{{currentWorkerName}}>\"* del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
-	"None": "Ninguno",
-	"The contract was not active during the selected date": "El contrato no estaba activo durante la fecha seleccionada",
-	"Cannot add more than one '1/2 day vacation'": "No puedes añadir más de un 'Vacaciones 1/2 dia'",
-	"This document already exists on this ticket": "Este documento ya existe en el ticket",
-	"Some of the selected tickets are not billable": "Algunos de los tickets seleccionados no son facturables",
-	"You can't invoice tickets from multiple clients": "No puedes facturar tickets de multiples clientes",
-	"nickname": "nickname",
-	"INACTIVE_PROVIDER": "Proveedor inactivo",
-	"This client is not invoiceable": "Este cliente no es facturable",
-	"serial non editable": "Esta serie no permite asignar la referencia",
-	"Max shipped required": "La fecha límite es requerida",
-	"Can't invoice to future": "No se puede facturar a futuro",
-	"Can't invoice to past": "No se puede facturar a pasado",
-	"This ticket is already invoiced": "Este ticket ya está facturado",
-	"A ticket with an amount of zero can't be invoiced": "No se puede facturar un ticket con importe cero",
-	"A ticket with a negative base can't be invoiced": "No se puede facturar un ticket con una base negativa",
-	"Global invoicing failed": "[Facturación global] No se han podido facturar algunos clientes",
-	"Wasn't able to invoice the following clients": "No se han podido facturar los siguientes clientes",
-	"Can't verify data unless the client has a business type": "No se puede verificar datos de un cliente que no tiene tipo de negocio",
-	"You don't have enough privileges to set this credit amount": "No tienes suficientes privilegios para establecer esta cantidad de crédito",
-	"You can't change the credit set to zero from a financialBoss": "No puedes cambiar el cŕedito establecido a cero por un jefe de finanzas",
-	"Amounts do not match": "Las cantidades no coinciden",
-	"The PDF document does not exist": "El documento PDF no existe. Prueba a regenerarlo desde la opción 'Regenerar PDF factura'",
-	"The type of business must be filled in basic data": "El tipo de negocio debe estar rellenado en datos básicos",
-	"You can't create a claim from a ticket delivered more than seven days ago": "No puedes crear una reclamación de un ticket entregado hace más de siete días",
-	"The worker has hours recorded that day": "El trabajador tiene horas fichadas ese día",
-	"The worker has a marked absence that day": "El trabajador tiene marcada una ausencia ese día",
-	"You can not modify is pay method checked": "No se puede modificar el campo método de pago validado",
-	"The account size must be exactly 10 characters": "El tamaño de la cuenta debe ser exactamente de 10 caracteres",
-	"Can't transfer claimed sales": "No puedes transferir lineas reclamadas",
-	"You don't have privileges to create refund": "No tienes permisos para crear un abono",
-	"The item is required": "El artículo es requerido",
-	"The agency is already assigned to another autonomous": "La agencia ya está asignada a otro autónomo",
-	"date in the future": "Fecha en el futuro",
-	"reference duplicated": "Referencia duplicada",
-	"This ticket is already a refund": "Este ticket ya es un abono",
-	"isWithoutNegatives": "Sin negativos",
-	"routeFk": "routeFk",
-	"Can't change the password of another worker": "No se puede cambiar la contraseña de otro trabajador",
-	"No hay un contrato en vigor": "No hay un contrato en vigor",
-	"No se permite fichar a futuro": "No se permite fichar a futuro",
-	"No está permitido trabajar": "No está permitido trabajar",
-	"Fichadas impares": "Fichadas impares",
-	"Descanso diario 12h.": "Descanso diario 12h.",
-	"Descanso semanal 36h. / 72h.": "Descanso semanal 36h. / 72h.",
-	"Dirección incorrecta": "Dirección incorrecta",
-	"Modifiable user details only by an administrator": "Detalles de usuario modificables solo por un administrador",
-	"Modifiable password only via recovery or by an administrator": "Contraseña modificable solo a través de la recuperación o por un administrador",
-	"Not enough privileges to edit a client": "No tienes suficientes privilegios para editar un cliente",
-	"This route does not exists": "Esta ruta no existe",
-	"Claim pickup order sent": "Reclamación Orden de recogida enviada [{{claimId}}]({{{claimUrl}}}) al cliente *{{clientName}}*",
-	"You don't have grant privilege": "No tienes privilegios para dar privilegios",
-	"You don't own the role and you can't assign it to another user": "No eres el propietario del rol y no puedes asignarlo a otro usuario",
-	"Ticket merged": "Ticket [{{originId}}]({{{originFullPath}}}) ({{{originDated}}}) fusionado con [{{destinationId}}]({{{destinationFullPath}}}) ({{{destinationDated}}})",
-	"Already has this status": "Ya tiene este estado",
-	"There aren't records for this week": "No existen registros para esta semana",
-	"Empty data source": "Origen de datos vacio",
-	"App locked": "Aplicación bloqueada por el usuario {{userId}}",
-	"Email verify": "Correo de verificación",
-	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"Receipt's bank was not found": "No se encontró el banco del recibo",
-	"This receipt was not compensated": "Este recibo no ha sido compensado",
-	"Client's email was not found": "No se encontró el email del cliente",
-	"Negative basis": "Base negativa",
-	"This worker code already exists": "Este codigo de trabajador ya existe",
-	"This personal mail already exists": "Este correo personal ya existe",
-	"This worker already exists": "Este trabajador ya existe",
-	"App name does not exist": "El nombre de aplicación no es válido",
-	"Try again": "Vuelve a intentarlo",
-	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",
-	"Failed to upload delivery note": "Error al subir albarán {{id}}",
-	"The DOCUWARE PDF document does not exists": "El documento PDF Docuware no existe",
-	"It is not possible to modify tracked sales": "No es posible modificar líneas de pedido que se hayan empezado a preparar",
-	"It is not possible to modify sales that their articles are from Floramondo": "No es posible modificar líneas de pedido cuyos artículos sean de Floramondo",
-	"It is not possible to modify cloned sales": "No es posible modificar líneas de pedido clonadas",
-	"A supplier with the same name already exists. Change the country.": "Un proveedor con el mismo nombre ya existe. Cambie el país.",
-	"There is no assigned email for this client": "No hay correo asignado para este cliente",
-	"Exists an invoice with a future date": "Existe una factura con fecha posterior",
-	"Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite",
-	"Warehouse inventory not set": "El almacén inventario no está establecido",
-	"This locker has already been assigned": "Esta taquilla ya ha sido asignada",
-	"Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº %d",
-	"Not exist this branch": "La rama no existe",
-	"This ticket cannot be signed because it has not been boxed": "Este ticket no puede firmarse porque no ha sido encajado",
-	"Collection does not exist": "La colección no existe",
-	"Cannot obtain exclusive lock": "No se puede obtener un bloqueo exclusivo",
-	"Insert a date range": "Inserte un rango de fechas",
-	"Added observation": "{{user}} añadió esta observacion: {{text}}",
-	"Comment added to client": "Observación añadida al cliente {{clientFk}}",
-	"Invalid auth code": "Código de verificación incorrecto",
-	"Invalid or expired verification code": "Código de verificación incorrecto o expirado",
-	"Cannot create a new claimBeginning from a different ticket": "No se puede crear una línea de reclamación de un ticket diferente al origen",
-	"company": "Compañía",
-	"country": "País",
-	"clientId": "Id cliente",
-	"clientSocialName": "Cliente",
-	"amount": "Importe",
-	"taxableBase": "Base",
-	"ticketFk": "Id ticket",
-	"isActive": "Activo",
-	"hasToInvoice": "Facturar",
-	"isTaxDataChecked": "Datos comprobados",
-	"comercialId": "Id comercial",
-	"comercialName": "Comercial",
-	"Pass expired": "La contraseña ha caducado, cambiela desde Salix",
-	"Invalid NIF for VIES": "Invalid NIF for VIES",
-	"Ticket does not exist": "Este ticket no existe",
-	"Ticket is already signed": "Este ticket ya ha sido firmado",
-	"Authentication failed": "Autenticación fallida",
-	"You can't use the same password": "No puedes usar la misma contraseña",
-	"You can only add negative amounts in refund tickets": "Solo se puede añadir cantidades negativas en tickets abono",
-	"Fecha fuera de rango": "Fecha fuera de rango",
-	"Error while generating PDF": "Error al generar PDF",
-	"Error when sending mail to client": "Error al enviar el correo al cliente",
-	"Mail not sent": "Se ha producido un fallo al enviar la factura al cliente [{{clientId}}]({{{clientUrl}}}), por favor revisa la dirección de correo electrónico",
-	"The renew period has not been exceeded": "El periodo de renovación no ha sido superado",
-	"Valid priorities": "Prioridades válidas: %d",
-	"hasAnyNegativeBase": "Base negativa para los tickets: {{ticketsIds}}",
-	"hasAnyPositiveBase": "Base positivas para los tickets: {{ticketsIds}}",
-	"You cannot assign an alias that you are not assigned to": "No puede asignar un alias que no tenga asignado",
-	"This ticket cannot be left empty.": "Este ticket no se puede dejar vacío. %s",
-	"The company has not informed the supplier account for bank transfers": "La empresa no tiene informado la cuenta de proveedor para transferencias bancarias",
-	"You cannot assign/remove an alias that you are not assigned to": "No puede asignar/eliminar un alias que no tenga asignado",
-	"This invoice has a linked vehicle.": "Esta factura tiene un vehiculo vinculado",
-	"You don't have enough privileges.": "No tienes suficientes permisos.",
-	"This ticket is locked": "Este ticket está bloqueado.",
-	"This ticket is not editable.": "Este ticket no es editable.",
-	"The ticket doesn't exist.": "No existe el ticket.",
-	"Social name should be uppercase": "La razón social debe ir en mayúscula",
-	"Street should be uppercase": "La dirección fiscal debe ir en mayúscula",
-	"Ticket without Route": "Ticket sin ruta",
-	"Select a different client": "Seleccione un cliente distinto",
-	"Fill all the fields": "Rellene todos los campos",
-	"The response is not a PDF": "La respuesta no es un PDF",
-	"Booking completed": "Reserva completada",
-	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-	"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
-	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
-	"User disabled": "Usuario desactivado",
-	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima",
-	"Cannot past travels with entries": "No se pueden pasar envíos con entradas",
-	"It was not able to remove the next expeditions:": "No se pudo eliminar las siguientes expediciones: {{expeditions}}",
-	"This claim has been updated": "La reclamación con Id: {{claimId}}, ha sido actualizada",
-	"This user does not have an assigned tablet": "Este usuario no tiene tablet asignada",
-	"Incorrect pin": "Pin incorrecto",
-	"You already have the mailAlias": "Ya tienes este alias de correo",
-	"The alias cant be modified": "Este alias de correo no puede ser modificado",
-	"No tickets to invoice": "No hay tickets para facturar",
-	"Name should be uppercase": "El nombre debe ir en mayúscula",
-	"An email is necessary": "Es necesario un email",
+	"The grade must be an integer greater than or equal to zero": "The grade must be an integer greater than or equal to zero",
+	"Description should have maximum of 45 characters": "Description should have maximum of 45 characters",
+	"Amount cannot be zero": "Amount cannot be zero",
+	"Period cannot be blank": "Period cannot be blank",
+	"Sample type cannot be blank": "Sample type cannot be blank",
+	"Cannot be blank": "Cannot be blank",
+	"The social name cannot be empty": "The social name cannot be empty",
+	"Name should be uppercase": "Name should be uppercase",
+	"Concept cannot be blank": "Concept cannot be blank",
+	"Enter an integer different to zero": "Enter an integer different to zero",
+	"Package cannot be blank": "Package cannot be blank",
+	"State cannot be blank": "State cannot be blank",
+	"Worker cannot be blank": "Worker cannot be blank",
+	"Description cannot be blank": "Description cannot be blank",
+	"Agency cannot be blank": "Agency cannot be blank",
+	"Reserva no completada": "Reserva no completada",
 	"printerNotExists": "printerNotExists",
-	"There are not picking tickets": "No hay tickets para sacar"
+	"No hay disponibilidad para el artículo seleccionado": "No hay disponibilidad para el artículo seleccionado",
+	"You don't have enough privileges": "You don't have enough privileges"
 }
\ No newline at end of file
diff --git a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
index 96c7893160..dc9496b4a0 100644
--- a/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/negativeBases.js
@@ -66,6 +66,7 @@ module.exports = Self => {
                         cou.country,
                         c.id clientId,
                         c.socialName clientSocialName,
+                        u.nickname workerSocialName,
                         SUM(s.quantity * s.price * ( 100 - s.discount ) / 100) amount,
                         negativeBase.taxableBase,
                         negativeBase.ticketFk,
@@ -80,6 +81,7 @@ module.exports = Self => {
                             JOIN vn.client c ON c.id = t.clientFk
                             JOIN vn.country cou ON cou.id = c.countryFk
                             LEFT JOIN vn.worker w ON w.id = c.salesPersonFk
+                            JOIN account.user u ON u.id = w.id
                             LEFT JOIN (
                                 SELECT ticketFk, taxableBase
                                     FROM tmp.ticketAmount
diff --git a/modules/item/front/last-entries/index.js b/modules/item/front/last-entries/index.js
index 31616f8a7e..a5f1f4d9d9 100644
--- a/modules/item/front/last-entries/index.js
+++ b/modules/item/front/last-entries/index.js
@@ -16,7 +16,7 @@ class Controller extends Section {
         this.filter = {
             where: {
                 itemFk: this.$params.id,
-                shipped: {
+                landed: {
                     between: [from, to]
                 }
             }
@@ -36,7 +36,7 @@ class Controller extends Section {
         const to = new Date(this._dateTo);
         to.setHours(23, 59, 59, 59);
 
-        this.filter.where.shipped = {
+        this.filter.where.landed = {
             between: [from, to]
         };
         this.$.model.refresh();
@@ -53,7 +53,7 @@ class Controller extends Section {
         const to = new Date(value);
         to.setHours(23, 59, 59, 59);
 
-        this.filter.where.shipped = {
+        this.filter.where.landed = {
             between: [from, to]
         };
         this.$.model.refresh();
diff --git a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
index 56030a8940..7cb95f840a 100644
--- a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
@@ -1,92 +1,142 @@
-const app = require('vn-loopback/server/server');
+const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');
 
-describe('Supplier updateFiscalData', () => {
+describe('Supplier updateFiscalData()', () => {
     const supplierId = 1;
     const administrativeId = 5;
-    const employeeId = 1;
-    const defaultData = {
-        name: 'PLANTS SL',
-        nif: '06089160W',
-        account: '4100000001',
-        sageTaxTypeFk: 4,
-        sageWithholdingFk: 1,
-        sageTransactionTypeFk: 1,
-        postCode: '15214',
-        city: 'PONTEVEDRA',
-        provinceFk: 1,
-        countryFk: 1,
-    };
+    const buyerId = 35;
 
-    it('should return an error if the user is not administrative', async() => {
-        const ctx = {req: {accessToken: {userId: employeeId}}};
-        ctx.args = {};
+    const name = 'NEW PLANTS';
+    const city = 'PONTEVEDRA';
+    const nif = 'A68446004';
+    const account = '4000000005';
+    const sageTaxTypeFk = 5;
+    const sageWithholdingFk = 2;
+    const sageTransactionTypeFk = 2;
+    const postCode = '46460';
+    const phone = 456129367;
+    const street = ' Fake address 12 3 flat';
+    const provinceFk = 2;
+    const countryFk = 1;
+    const supplierActivityFk = 'animals';
+    const healthRegister = '400664487H';
 
-        let error;
-        await app.models.Supplier.updateFiscalData(ctx, supplierId)
-            .catch(e => {
-                error = e;
-            });
+    let ctx;
+    let options;
+    let tx;
 
-        expect(error.message).toBeDefined();
-    });
-
-    it('should check that the supplier fiscal data is untainted', async() => {
-        const supplier = await app.models.Supplier.findById(supplierId);
-
-        expect(supplier.name).toEqual(defaultData.name);
-        expect(supplier.nif).toEqual(defaultData.nif);
-        expect(supplier.account).toEqual(defaultData.account);
-        expect(supplier.sageTaxTypeFk).toEqual(defaultData.sageTaxTypeFk);
-        expect(supplier.sageWithholdingFk).toEqual(defaultData.sageWithholdingFk);
-        expect(supplier.sageTransactionTypeFk).toEqual(defaultData.sageTransactionTypeFk);
-        expect(supplier.postCode).toEqual(defaultData.postCode);
-        expect(supplier.city).toEqual(defaultData.city);
-        expect(supplier.provinceFk).toEqual(defaultData.provinceFk);
-        expect(supplier.countryFk).toEqual(defaultData.countryFk);
-    });
-
-    it('should update the supplier fiscal data and return the count if changes made', async() => {
-        const activeCtx = {
-            accessToken: {userId: administrativeId},
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: buyerId},
+                headers: {origin: 'http://localhost'},
+                __: value => value
+            },
+            args: {}
         };
-        const ctx = {req: activeCtx};
+
         spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
+            active: ctx.req
         });
 
-        ctx.args = {
-            name: 'WEAPON DEALER',
-            nif: 'A68446004',
-            account: '4000000005',
-            sageTaxTypeFk: 5,
-            sageWithholdingFk: 2,
-            sageTransactionTypeFk: 2,
-            postCode: '46460',
-            city: 'VALENCIA',
-            provinceFk: 2,
-            countryFk: 1,
-            supplierActivityFk: 'animals',
-            healthRegister: '400664487H'
-        };
+        options = {transaction: tx};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
 
-        const result = await app.models.Supplier.updateFiscalData(ctx, supplierId);
+    afterEach(async() => {
+        await tx.rollback();
+    });
 
-        expect(result.name).toEqual('WEAPON DEALER');
-        expect(result.nif).toEqual('A68446004');
-        expect(result.account).toEqual('4000000005');
-        expect(result.sageTaxTypeFk).toEqual(5);
-        expect(result.sageWithholdingFk).toEqual(2);
-        expect(result.sageTransactionTypeFk).toEqual(2);
-        expect(result.postCode).toEqual('46460');
-        expect(result.city).toEqual('VALENCIA');
-        expect(result.provinceFk).toEqual(2);
-        expect(result.countryFk).toEqual(1);
-        expect(result.supplierActivityFk).toEqual('animals');
-        expect(result.healthRegister).toEqual('400664487H');
+    it('should throw an error if it is a buyer and tries to update forbidden fiscal data', async() => {
+        try {
+            await models.Supplier.updateFiscalData(ctx,
+                supplierId,
+                name,
+                nif,
+                account,
+                undefined,
+                sageTaxTypeFk,
+                undefined,
+                sageTransactionTypeFk,
+                undefined,
+                undefined,
+                undefined,
+                provinceFk,
+                countryFk,
+                supplierActivityFk,
+                healthRegister,
+                undefined,
+                undefined,
+                options);
+        } catch (e) {
+            expect(e.message).toEqual('You cannot update these fields');
+        }
+    });
 
-        // Restores
-        ctx.args = defaultData;
-        await app.models.Supplier.updateFiscalData(ctx, supplierId);
+    it('should update the granted fiscal data if it is a buyer', async() => {
+        const supplier = await models.Supplier.updateFiscalData(ctx,
+            supplierId,
+            undefined,
+            undefined,
+            account,
+            phone,
+            undefined,
+            undefined,
+            undefined,
+            postCode,
+            street,
+            city,
+            provinceFk,
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            options);
+
+        expect(supplier.account).toEqual(account);
+        expect(supplier.phone).toEqual(phone);
+        expect(supplier.postCode).toEqual(postCode);
+        expect(supplier.account).toEqual(account);
+        expect(supplier.city).toEqual(city);
+        expect(supplier.provinceFk).toEqual(provinceFk);
+    });
+
+    it('should update all fiscalData if it is an administative', async() => {
+        const supplier = await models.Supplier.updateFiscalData(ctx,
+            supplierId,
+            name,
+            nif,
+            account,
+            phone,
+            sageTaxTypeFk,
+            sageWithholdingFk,
+            sageTransactionTypeFk,
+            postCode,
+            street,
+            city,
+            provinceFk,
+            countryFk,
+            supplierActivityFk,
+            healthRegister,
+            undefined,
+            undefined,
+            options);
+
+        expect(supplier.name).toEqual(name);
+        expect(supplier.nif).toEqual(nif);
+        expect(supplier.account).toEqual(account);
+        expect(supplier.phone).toEqual(phone);
+        expect(supplier.sageTaxTypeFk).toEqual(sageTaxTypeFk);
+        expect(supplier.sageWithholdingFk).toEqual(sageWithholdingFk);
+        expect(supplier.sageTransactionTypeFk).toEqual(sageTransactionTypeFk);
+        expect(supplier.postCode).toEqual(postCode);
+        expect(supplier.street).toEqual(street);
+        expect(supplier.city).toEqual(city);
+        expect(supplier.provinceFk).toEqual(provinceFk);
+        expect(supplier.countryFk).toEqual(countryFk);
+        expect(supplier.supplierActivityFk).toEqual(supplierActivityFk);
+        expect(supplier.healthRegister).toEqual(healthRegister);
     });
 });
diff --git a/modules/supplier/back/methods/supplier/updateFiscalData.js b/modules/supplier/back/methods/supplier/updateFiscalData.js
index 271ed8769e..c0b860983d 100644
--- a/modules/supplier/back/methods/supplier/updateFiscalData.js
+++ b/modules/supplier/back/methods/supplier/updateFiscalData.js
@@ -1,75 +1,59 @@
+const UserError = require('vn-loopback/util/user-error');
 module.exports = Self => {
-    Self.remoteMethod('updateFiscalData', {
+    Self.remoteMethodCtx('updateFiscalData', {
         description: 'Updates fiscal data of a supplier',
         accessType: 'WRITE',
         accepts: [{
-            arg: 'ctx',
-            type: 'Object',
-            http: {source: 'context'}
-        },
-        {
             arg: 'id',
             type: 'Number',
             description: 'The supplier id',
             http: {source: 'path'}
-        },
-        {
+        }, {
             arg: 'name',
             type: 'string'
-        },
-        {
+        }, {
             arg: 'nif',
             type: 'string'
-        },
-        {
+        }, {
             arg: 'account',
             type: 'any'
-        },
-        {
+        }, {
+            arg: 'phone',
+            type: 'string'
+        }, {
             arg: 'sageTaxTypeFk',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'sageWithholdingFk',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'sageTransactionTypeFk',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'postCode',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'street',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'city',
             type: 'string'
-        },
-        {
+        }, {
             arg: 'provinceFk',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'countryFk',
             type: 'any'
-        },
-        {
+        }, {
             arg: 'supplierActivityFk',
             type: 'string'
-        },
-        {
+        }, {
             arg: 'healthRegister',
             type: 'string'
-        },
-        {
+        }, {
             arg: 'isVies',
             type: 'boolean'
-        },
-        {
+        }, {
             arg: 'isTrucker',
             type: 'boolean'
         }],
@@ -84,15 +68,42 @@ module.exports = Self => {
         }
     });
 
-    Self.updateFiscalData = async(ctx, supplierId) => {
+    Self.updateFiscalData = async(ctx, supplierId, name, nif, account, phone, sageTaxTypeFk, sageWithholdingFk, sageTransactionTypeFk, postCode, street, city, provinceFk, countryFk, supplierActivityFk, healthRegister, isVies, isTrucker, options) => {
         const models = Self.app.models;
-        const args = ctx.args;
+        const {args} = ctx;
+        const myOptions = {};
         const supplier = await models.Supplier.findById(supplierId);
 
-        // Remove unwanted properties
+        if (typeof options == 'object') Object.assign(myOptions, options);
+
         delete args.ctx;
         delete args.id;
 
-        return supplier.updateAttributes(args);
+        const updateAllFiscalData = await models.ACL.checkAccessAcl(ctx, 'Supplier', 'updateAllFiscalData', 'WRITE');
+        if (!updateAllFiscalData) {
+            for (const arg in args) {
+                if (args[arg] && !['street', 'postCode', 'city', 'provinceFk', 'phone'].includes(arg))
+                    throw new UserError('You cannot update these fields');
+            }
+        }
+
+        return supplier.updateAttributes({
+            name,
+            nif,
+            account,
+            phone,
+            sageTaxTypeFk,
+            sageWithholdingFk,
+            sageTransactionTypeFk,
+            postCode,
+            street,
+            city,
+            provinceFk,
+            countryFk,
+            supplierActivityFk,
+            healthRegister,
+            isVies,
+            isTrucker
+        }, myOptions);
     };
 };
diff --git a/package.json b/package.json
index 04c0e6d04d..9ae8b276bf 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.7.4",
         "@babel/preset-env": "^7.11.0",
         "@babel/register": "^7.7.7",
-        "@verdnatura/myt": "^1.6.3",
+        "@verdnatura/myt": "^1.6.6",
         "angular-mocks": "^1.7.9",
         "babel-jest": "^26.0.1",
         "babel-loader": "^8.2.4",
@@ -67,6 +67,7 @@
         "eslint-plugin-jasmine": "^2.10.1",
         "fancy-log": "^1.3.2",
         "file-loader": "^6.2.0",
+        "getopts": "^2.3.0",
         "gulp": "^4.0.2",
         "gulp-concat": "^2.6.1",
         "gulp-env": "^0.4.0",
@@ -89,7 +90,6 @@
         "js-yaml": "^4.1.0",
         "json-loader": "^0.5.7",
         "merge-stream": "^1.0.1",
-        "minimist": "^1.2.5",
         "node-sass": "^9.0.0",
         "nodemon": "^2.0.16",
         "plugin-error": "^1.0.1",
@@ -107,7 +107,7 @@
     "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",
+        "test:back:ci": "node back/tests.js --ci --junit --network jenkins",
         "test:e2e": "node e2e/helpers/tests.js",
         "test:front": "jest --watch",
         "back": "nodemon --inspect -w modules ./node_modules/gulp/bin/gulp.js back",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2df0ae49c8..221008dd98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -128,8 +128,8 @@ devDependencies:
     specifier: ^7.7.7
     version: 7.23.7(@babel/core@7.23.9)
   '@verdnatura/myt':
-    specifier: ^1.6.3
-    version: 1.6.3
+    specifier: ^1.6.6
+    version: 1.6.6
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -163,6 +163,9 @@ devDependencies:
   file-loader:
     specifier: ^6.2.0
     version: 6.2.0(webpack@5.90.1)
+  getopts:
+    specifier: ^2.3.0
+    version: 2.3.0
   gulp:
     specifier: ^4.0.2
     version: 4.0.2
@@ -229,9 +232,6 @@ devDependencies:
   merge-stream:
     specifier: ^1.0.1
     version: 1.0.1
-  minimist:
-    specifier: ^1.2.5
-    version: 1.2.8
   node-sass:
     specifier: ^9.0.0
     version: 9.0.0
@@ -2630,8 +2630,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.3:
-    resolution: {integrity: sha512-VRoTB5sEPL8a7VaX9l2afpaPNT6pBa+If1tP9tpaJ4enFQbNITlApcC0GK6XYmWMkJQjl2lgdN4/u0UCiNb2MQ==}
+  /@verdnatura/myt@1.6.6:
+    resolution: {integrity: sha512-5KHi9w1baEQ6Oe/pAR8pl0oD5yyJJuPirE+ZhygreUGGURfig4VekjhlGE3WEbWquDiIAMi89J1VQ+1Ba0+jQw==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5
diff --git a/webpack.config.js b/webpack.config.js
index a102b838ed..7296a62d19 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -11,7 +11,7 @@ let baseConfig = {
     entry: {salix: 'salix'},
     mode,
     output: {
-        path: path.join(__dirname, 'dist'),
+        path: path.join(__dirname, 'front/dist'),
         publicPath: '/'
     },
     module: {
@@ -139,7 +139,7 @@ let devConfig = {
         host: '0.0.0.0',
         port: 5000,
         publicPath: '/',
-        contentBase: 'dist',
+        contentBase: 'front/dist',
         quiet: false,
         noInfo: false,
         hot: true,