Merge branch 'dev' into 5834-billingDataAutoFillBic

2024-02-06 17:33:27 +01:00 · 2024-02-06 17:33:27 +01:00 · 4d6e631fca
parent 22f9d7d7a2 4592429b3d
commit 4d6e631fca
98 changed files with 18229 additions and 51300 deletions
--- a/10
+++ b/10
@ -13,7 +13,7 @@ RUN apt-get update \
        graphicsmagick \
    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
    && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g npm@9.6.6
+    && corepack enable pnpm

 # Puppeteer

@ -39,12 +39,12 @@ RUN apt-get update \

 WORKDIR /salix

-COPY print/package.json print/package-lock.json print/
-RUN npm ci --no-audit --prefer-offline --omit=dev --prefix=print
+COPY print/package.json print/pnpm-lock.yaml print/
+RUN pnpm install --prod --prefix=print

-COPY package.json package-lock.json ./
+COPY package.json pnpm-lock.yaml ./
 COPY loopback/package.json loopback/
-RUN npm ci --no-audit --prefer-offline --omit=dev
+RUN pnpm install --prod

 COPY loopback loopback
 COPY back back
--- a/156
+++ b/156
@ -3,21 +3,11 @@
 def PROTECTED_BRANCH
 def FROM_GIT
 def RUN_TESTS
+def RUN_BUILD

-pre: {
-    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:
+node {
+    stage('Setup') {
        env.NODE_ENV = 'dev'
-            env.BACK_REPLICAS = 1
-    }

        PROTECTED_BRANCH = [
            'dev',
@ -27,10 +17,32 @@ pre: {

        FROM_GIT = env.JOB_NAME.startsWith('gitea/')
        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}"
+
+        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 {
    agent any
@ -47,20 +59,12 @@ pipeline {
    stages {
        stage('Install') {
            environment {
-                NODE_ENV = ""
+                NODE_ENV = ''
            }
            parallel {
-                stage('Backend') {
+                stage('Back') {
                    steps {
-                        sh 'npm install --no-audit --prefer-offline'
-                    }
-                }
-                stage('Frontend') {
-                    when {
-                        expression { FROM_GIT }
-                    }
-                    steps {
-                        sh 'npm install --no-audit --prefer-offline --prefix=front'
+                        sh 'pnpm install --prefer-offline'
                    }
                }
                stage('Print') {
@ -68,35 +72,99 @@ pipeline {
                        expression { FROM_GIT }
                    }
                    steps {
-                        sh 'npm install --no-audit --prefer-offline --prefix=print'
+                        sh 'pnpm install --prefer-offline --prefix=print'
+                    }
+                }
+                stage('Front') {
+                    when {
+                        expression { FROM_GIT }
+                    }
+                    steps {
+                        sh 'pnpm install --prefer-offline --prefix=front'
                    }
                }
            }
        }
+        stage('Stack') {
+            environment {
+                TZ = 'Europe/Madrid'
+            }
+            parallel {
+                stage('Back') {
+                    stages {
                        stage('Test') {
                            when {
                                expression { RUN_TESTS }
                            }
                            environment {
-                NODE_ENV = ""
-                TZ = 'Europe/Madrid'
+                                NODE_ENV = ''
                            }
-            parallel {
-                stage('Backend') {
                            steps {
                                sh 'npm run test:back:ci'
                            }
+                            post {
+                                always {
+                                    script {
+                                        try {
+                                            junit 'junitresults.xml'
+                                            junit 'junit.xml'
+                                        } catch (e) {
+                                            echo e.toString()
                                        }
-                stage('Frontend') {
-                    steps {
-                        sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=6'
                                    }
                                }
                            }
                        }
                        stage('Build') {
                            when {
-                expression { PROTECTED_BRANCH && FROM_GIT }
+                                expression { RUN_BUILD }
+                            }
+                            steps {
+                                script {
+                                    def packageJson = readJSON file: 'package.json'
+                                    env.VERSION = packageJson.version
+                                }
+                                sh 'docker-compose build back'
+                            }
+                        }
+                    }
+                }
+                stage('Front') {
+                    when {
+                        expression { FROM_GIT }
+                    }
+                    stages {
+                        stage('Test') {
+                            when {
+                                expression { RUN_TESTS }
+                            }
+                            environment {
+                                NODE_ENV = ''
+                            }
+                            steps {
+                                sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=10'
+                            }
+                        }
+                        stage('Build') {
+                            when {
+                                expression { RUN_BUILD }
+                            }
+                            steps {
+                                script {
+                                    def packageJson = readJSON file: 'package.json'
+                                    env.VERSION = packageJson.version
+                                }
+                                sh 'gulp build'
+                                sh 'docker-compose build front'
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        stage('Push') {
+            when {
+                expression { RUN_BUILD }
            }
            environment {
                CREDENTIALS = credentials('docker-registry')
@ -106,8 +174,8 @@ pipeline {
                    def packageJson = readJSON file: 'package.json'
                    env.VERSION = packageJson.version
                }
-                sh 'gulp build'
-                dockerBuild()
+                sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
+                sh 'docker-compose push'
            }
        }
        stage('Deploy') {
@ -147,18 +215,6 @@ pipeline {
        }
    }
    post {
-        always {
-            script {
-                if (RUN_TESTS) {
-                    try {
-                        junit 'junitresults.xml'
-                        junit 'junit.xml'
-                    } catch (e) {
-                        echo e.toString()
-                    }
-                }
-            }
-        }
        success {
            script {
                if (env.BRANCH_NAME == 'master' && FROM_GIT) {
--- a/back/tests-helper.js
+++ b/back/tests-helper.js
@ -0,0 +1,34 @@
+/* eslint-disable no-console */
+const app = require('vn-loopback/server/server');
+let dataSources = require('../loopback/server/datasources.json');
+
+async function init() {
+    console.log('Initializing backend.');
+
+    dataSources = JSON.parse(JSON.stringify(dataSources));
+    Object.assign(dataSources.vn, {
+        host: process.env.DB_HOST,
+        port: process.env.DB_PORT
+    });
+
+    const bootOptions = {dataSources};
+    await new Promise((resolve, reject) => {
+        app.boot(bootOptions,
+            err => err ? reject(err) : resolve());
+    });
+    // FIXME: Workaround to wait for loopback to be ready
+    await app.models.Application.status();
+}
+
+async function deinit() {
+    console.log('Stopping backend.');
+    await app.disconnect();
+}
+
+module.exports = {
+    init,
+    deinit
+};
+
+if (require.main === module)
+    init();
--- a/back/tests.js
+++ b/back/tests.js
@ -2,29 +2,20 @@
 const path = require('path');
 const Myt = require('@verdnatura/myt/myt');
 const Run = require('@verdnatura/myt/myt-run');
-let dataSources = require('../loopback/server/datasources.json');
+const helper = require('./tests-helper');

 let server;
-
-process.on('warning', warning => {
-    console.log(warning.name);
-    console.log(warning.message);
-    console.log(warning.stack);
-});
-
-process.on('SIGUSR2', rmServer);
-process.on('exit', rmServer);
-
-async function rmServer() {
-    if (!server) return;
-    await server.rm();
-    server = null;
-}
-
-async function test() {
-    console.log('Building and running DB container.');
-
 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);
+
+async function setup() {
+    console.log('Building and running DB container.');

    const myt = new Myt();
    await myt.init({
@ -36,32 +27,57 @@ async function test() {
    });
    server = await myt.run(Run);
    await myt.deinit();
+
    const {dbConfig} = server;
+    process.env.DB_HOST = dbConfig.host;
+    process.env.DB_PORT = dbConfig.port;

-    console.log('Initializing backend.');
+    if (!PARALLEL)
+        await helper.init();
+}

-    dataSources = JSON.parse(JSON.stringify(dataSources));
-    Object.assign(dataSources.vn, {
-        host: dbConfig.host,
-        port: dbConfig.port
-    });
+async function teardown() {
+    if (!server) return;

-    const bootOptions = {dataSources};
-    const app = require('vn-loopback/server/server');
-    await new Promise((resolve, reject) => {
-        app.boot(bootOptions,
-            err => err ? reject(err) : resolve());
-    });
-    // FIXME: Workaround to wait for loopback to be ready
-    await app.models.Application.status();
+    if (!PARALLEL)
+        await helper.deinit();

-    console.log('Running tests.');
+    console.log('Stopping and removing DB container.');
+    await server.rm();
+    server = null;
+}

+async function onError(err) {
+    await teardown();
+    console.error(err);
+}
+
+async function test() {
+    let runner;
+    const config = {
+        globalSetup: setup,
+        globalSetupTimeout: TIMEOUT,
+        globalTeardown: teardown,
+        globalTeardownTimeout: TIMEOUT,
+        spec_dir: '.',
+        spec_files: [
+            'back/**/*[sS]pec.js',
+            'loopback/**/*[sS]pec.js',
+            'modules/*/back/**/*.[sS]pec.js'
+        ],
+        helpers: []
+    };
+
+    if (PARALLEL) {
+        const ParallelRunner = require('jasmine/parallel');
+        runner = new ParallelRunner({numWorkers: 1});
+        config.helpers.push(`back/tests-helper.js`);
+    } else {
        const Jasmine = require('jasmine');
-    const jasmine = new Jasmine();
+        runner = new Jasmine();

        const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
-    jasmine.addReporter(new SpecReporter({
+        runner.addReporter(new SpecReporter({
            spec: {
                displaySuccessful: isCI,
                displayPending: isCI
@ -70,35 +86,17 @@ async function test() {
                displayPending: false,
            }
        }));
+    }

    if (isCI) {
        const JunitReporter = require('jasmine-reporters');
-        jasmine.addReporter(new JunitReporter.JUnitXmlReporter());
-
-        jasmine.exitOnCompletion = true;
-        jasmine.jasmine.DEFAULT_TIMEOUT_INTERVAL = 900000;
+        runner.addReporter(new JunitReporter.JUnitXmlReporter());
+        runner.jasmine.DEFAULT_TIMEOUT_INTERVAL = TIMEOUT;
    }

-    const backSpecs = [
-        './back/**/*[sS]pec.js',
-        './loopback/**/*[sS]pec.js',
-        './modules/*/back/**/*.[sS]pec.js'
-    ];
-
-    jasmine.loadConfig({
-        spec_dir: '.',
-        spec_files: backSpecs,
-        helpers: [],
-    });
-
-    await jasmine.execute();
-
-    console.log('Stopping.');
-
-    if (app) await app.disconnect();
-    await rmServer();
-
-    console.log('Tests ended.\n');
+    // runner.loadConfigFile('back/jasmine.json');
+    runner.loadConfig(config);
+    await runner.execute();
 }

 test();
--- a/db/dump/fixtures.after.sql
+++ b/db/dump/fixtures.after.sql
@ -73,9 +73,10 @@ INSERT INTO vn.cmr (id, truckPlate, observations, senderInstruccions, paymentIns

 UPDATE `vn`.`claimRatio` SET `claimAmount` = '10' WHERE (`clientFk` = '1101');

-INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `warehouseAliasFk`, `isOwn`, `isAnyVolumeAllowed`) VALUES
-    ('Agencia', '1', '1', '1', '1'),
-    ('Otra agencia ', '1', '2', '0', '0');
+INSERT INTO `vn`.`agency` (`name`, `warehouseFk`, `isOwn`, `isAnyVolumeAllowed`) 
+    VALUES
+    ('Agencia', '1', '1', '1'),
+    ('Otra agencia ', '1', '0', '0');

 INSERT INTO `vn`.`expedition` (`agencyModeFk`, `ticketFk`, `isBox`, `counter`, `workerFk`, `externalId`, `packagingFk`, `hostFk`, `itemPackingTypeFk`, `hasNewRoute`) VALUES
    ('1', '1', 1, '1', '1', '1', '1', 'pc00', 'F', 0),
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -174,20 +174,15 @@ INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`,
        (19,'Francia',  1, 'FR', 1, 27, 4, 0, 1),
        (30,'Canarias', 1, 'IC', 1, 24, 4, 1, 2);

-INSERT INTO `vn`.`warehouseAlias`(`id`, `name`)
+INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `countryFk`, `hasProduction`, `isOrigin`, `isDestiny`)
    VALUES
-        (1, 'Main Warehouse'),
-        (2, 'Gotham');
-
-INSERT INTO `vn`.`warehouse`(`id`, `name`, `code`, `isComparative`, `isInventory`, `hasAvailable`, `isManaged`, `hasDms`, `hasComission`, `aliasFk`, `countryFk`, `hasProduction`)
-    VALUES
-        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 2, 1,   1),
-        (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 2, 13,  1),
-        (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 2, 1,   1),
-        (13, 'Inventory',       'inv',   1, 1, 1, 0, 0, 0, 2, 1,   0),
-        (60, 'Algemesi',        NULL,    1, 1, 1, 0, 0, 0, 2, 1,   0);
+        (1,  'Warehouse One',   'ALG',   1, 1, 1, 1, 1, 1, 1,   1, 1, 1),
+        (2,  'Warehouse Two',   NULL,    1, 1, 1, 1, 0, 1, 13,  1, 1, 0),
+        (3,  'Warehouse Three', NULL,    1, 1, 1, 1, 0, 0, 1,   1, 1, 0),
+        (4,  'Warehouse Four',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 1),
+        (5,  'Warehouse Five',  NULL,    1, 1, 1, 1, 0, 0, 1,   1, 0, 0),
+        (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');
@ -271,18 +266,18 @@ INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
        (3, 'PICKUP', 'Recogida'),
        (4, 'OTHER', 'Otros');

-INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`, `warehouseAliasFk`)
+INSERT INTO `vn`.`agency`(`id`, `name`, `warehouseFk`)
    VALUES
-        (1,     'inhouse pickup'        ,   1, 1),
-        (2,     'Super-Man delivery'    ,   1, 1),
-        (3,     'Teleportation device'  ,   1, 1),
-        (4,     'Entanglement'          ,   1, 1),
-        (5,     'Quantum break device'  ,   1, 1),
-        (6,     'Walking'               ,   1, 1),
-        (7,     'Gotham247'             ,   1, 1),
-        (8,     'Gotham247Expensive'    ,   1, 1),
-        (9,     'Refund'                ,   1, 1),
-        (10,    'Other agency'          ,   1, 1);
+        (1,     'inhouse pickup'        ,   1),
+        (2,     'Super-Man delivery'    ,   1),
+        (3,     'Teleportation device'  ,   1),
+        (4,     'Entanglement'          ,   1),
+        (5,     'Quantum break device'  ,   1),
+        (6,     'Walking'               ,   1),
+        (7,     'Gotham247'             ,   1),
+        (8,     'Gotham247Expensive'    ,   1),
+        (9,     'Refund'                ,   1),
+        (10,    'Other agency'          ,   1);

 UPDATE `vn`.`agencyMode` SET `id` = 1 WHERE `name` = 'inhouse pickup';
 UPDATE `vn`.`agencyMode` SET `id` = 2 WHERE `name` = 'Super-Man delivery';
@ -569,13 +564,13 @@ INSERT INTO `vn`.`supplierActivity`(`code`, `name`)

 INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`, `commission`, `created`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `payDay`, `taxTypeSageFk`, `withholdingSageFk`, `transactionTypeSageFk`, `workerFk`, `supplierActivityFk`, `isPayMethodChecked`, `healthRegister`)
    VALUES
-        (1,     'Plants SL',                'Plants nick',      4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA',    1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
-        (2,     'Farmer King',              'The farmer',       4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',        2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
-        (69,    'Packaging',                'Packaging nick',   4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD',        3, 46600, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
-        (442,   'Verdnatura Levante SL',    'Verdnatura',       5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',        1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
-        (567,   'Holland',                  'Holland nick',     4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD',        3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
-        (791,   'Bros SL',                  'Bros nick',        5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD',        3, 46600, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
-        (1381,  'Ornamentales',             'Ornamentales',     7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',        1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');
+        (1,     'PLANTS SL',             'Plants nick',      4100000001, 1, '06089160W', 0, util.VN_CURDATE(), 1, 'supplier address 1', 'PONTEVEDRA',    1, 15214, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
+        (2,     'FARMER KING',              'The farmer',       4000020002, 1, '87945234L', 0, util.VN_CURDATE(), 1, 'supplier address 2', 'GOTHAM',        2, 43022, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
+        (69,    'PACKAGING',                'Packaging nick',   4100000069, 1, '94935005K', 0, util.VN_CURDATE(), 1, 'supplier address 5', 'ASGARD',        3, 46600, 1, 1, 15, 4,  1, 1, 18, 'flowerPlants',  1, '400664487V'),
+        (442,   'VERDNATURA LEVANTE SL',    'Verdnatura',       5115000442, 1, '06815934E', 0, util.VN_CURDATE(), 1, 'supplier address 3', 'GOTHAM',        1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
+        (567,   'HOLLAND',                  'Holland nick',     4000020567, 1, '14364089Z', 0, util.VN_CURDATE(), 1, 'supplier address 6', 'ASGARD',        3, 46600, 1, 2, 10, 93, 2, 8, 18, 'animals',       1, '400664487V'),
+        (791,   'BROS SL',                  'Bros nick',        5115000791, 1, '37718083S', 0, util.VN_CURDATE(), 1, 'supplier address 7', 'ASGARD',        3, 46600, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V'),
+        (1381,  'ORNAMENTALES',             'Ornamentales',     7185001381, 1, '07972486L', 0, util.VN_CURDATE(), 1, 'supplier address 4', 'GOTHAM',        1, 43022, 1, 2, 15, 6,  9, 3, 18, 'complements',   1, '400664487V');

 INSERT INTO `vn`.`supplierAddress`(`id`, `supplierFk`, `nickname`, `street`, `provinceFk`, `postalCode`, `city`, `phone`, `mobile`)
    VALUES
--- a/db/routines/bs/procedures/comercialesCompleto.sql
+++ b/db/routines/bs/procedures/comercialesCompleto.sql
@ -20,16 +20,16 @@ BEGIN
 		c.movil,
 		c.POBLACION poblacion,
 		p.`name` provincia,
-		vn2008.red(f.futur) futur,
+		ROUND(f.futur, 2) futur,
 		c.Credito credito,
 		pm.`name` forma_pago,
-		vn2008.red(c365 / 12) consumo_medio365,
-		vn2008.red(c365) consumo365,
-		vn2008.red(CmLy.peso) peso_mes_año_pasado,
-		vn2008.red(CmLy.peso * 1.19) objetivo,
+		ROUND(c365 / 12, 2) consumo_medio365,
+		ROUND(c365, 2) consumo365,
+		ROUND(CmLy.peso, 2) peso_mes_año_pasado,
+		ROUND(CmLy.peso * 1.19, 2) objetivo,
 		tr.CodigoTrabajador,
-		vn2008.red(mes_actual.consumo) consumoMes,
-		vn2008.red(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0)) como_lo_llevo,
+		ROUND(mes_actual.consumo, 2) consumoMes,
+		ROUND(IFNULL(mes_actual.consumo, 0) - IFNULL(CmLy.peso * 1.19, 0), 2) como_lo_llevo,
 		DATE(LastTicket) ultimo_ticket,
 		dead.muerto,
 		g.Greuge,
--- a/db/routines/cache/procedures/available_refresh.sql
+++ b/db/routines/cache/procedures/available_refresh.sql
@ -5,7 +5,8 @@ proc: BEGIN
 	DECLARE vReserveDate DATETIME;
 	DECLARE vParams CHAR(100);
 	DECLARE vInventoryDate DATE;
-	DECLARE vIsLogifloraDay BOOLEAN;
+	DECLARE vLifeScope DATE;
+	DECLARE vWarehouseFkInventory INT;

 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@ -26,43 +27,42 @@ proc: BEGIN
 		LEAVE proc;
 	END IF;

-	-- Invoca al procedimiento que genera el stock virtual de Logiflora, si coincide con la peticion de refresco del disponible
-	IF vn.isLogifloraDay(vDated, vWarehouse) THEN
-		-- CALL edi.floramondo_offerRefresh;
-		SET vIsLogifloraDay = TRUE;
-	ELSE
-		SET vIsLogifloraDay = FALSE;
-	END IF;
-
 	-- Calcula algunos parámetros necesarios
 	SET vStartDate = TIMESTAMP(vDated, '00:00:00');
 	SELECT inventoried INTO vInventoryDate FROM vn.config;
+	SELECT DATE_SUB(vStartDate, INTERVAL MAX(life) DAY) INTO vLifeScope FROM vn.itemType;
 	SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vReserveDate
 		FROM hedera.orderConfig;

+	SELECT w.id INTO vWarehouseFkInventory
+		FROM vn.warehouse w
+		WHERE w.code = 'inv';
+
 	-- Calcula el ultimo dia de vida para cada producto
 	DROP TEMPORARY TABLE IF EXISTS itemRange;
 	CREATE TEMPORARY TABLE itemRange
 		(PRIMARY KEY (itemFk))
 		ENGINE = MEMORY
-		SELECT c.itemFk,
-				IF(it.life IS NULL,
-					NULL,
-					TIMESTAMP(TIMESTAMPADD(DAY, it.life, c.landing), '23:59:59')) ended
-			FROM (
-				SELECT b.itemFk, MAX(t.landed) landing
+		SELECT i.id itemFk,
+				util.dayEnd(DATE_ADD(c.maxLanded, INTERVAL it.life DAY)) ended, it.life
+			FROM vn.item i
+				LEFT JOIN (
+					SELECT b.itemFk, MAX(t.landed) maxLanded
 						FROM vn.buy b
 							JOIN vn.entry e ON b.entryFk = e.id
 							JOIN vn.travel t ON t.id = e.travelFk
 							JOIN vn.warehouse w ON w.id = t.warehouseInFk
-					WHERE t.landed BETWEEN vInventoryDate AND vStartDate
+							JOIN vn.item i ON i.id = b.itemFk
+							JOIN vn.itemType it ON it.id = i.typeFk
+						WHERE t.landed BETWEEN vLifeScope AND vStartDate
 							AND t.warehouseInFk = vWarehouse
+							AND t.warehouseOutFk <> vWarehouseFkInventory
+							AND it.life
 							AND NOT e.isExcludedFromAvailable
 						GROUP BY b.itemFk
-				) c
-				JOIN vn.item i ON i.id = c.itemFk
+					) c ON i.id = c.itemFk
 				JOIN vn.itemType it ON it.id = i.typeFk
-			HAVING ended >= vStartDate OR ended IS NULL;
+			HAVING ended >= vStartDate OR life IS NULL;

 	-- Calcula el ATP
 	DELETE FROM available WHERE calc_id = vCalc;
@ -86,7 +86,7 @@ proc: BEGIN
 					WHERE i.landed >= vStartDate
 						AND (ir.ended IS NULL OR i.landed <= ir.ended)
 						AND i.warehouseInFk = vWarehouse
-						AND (ISNULL(wf.entryFk) OR vIsLogifloraDay)
+						AND ISNULL(wf.entryFk)
 				UNION ALL
 				SELECT i.itemFk, i.shipped, i.quantity
 					FROM vn.itemEntryOut i
--- a/db/routines/vn/functions/intrastat_estimateNet.sql
+++ 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 ;
--- a/db/routines/vn/procedures/fustControl.sql
+++ b/db/routines/vn/procedures/fustControl.sql
@ -1,79 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControl`(vFromDated DATE, vToDated DATE)
-BEGIN
-	
-	DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
-	DECLARE vDateStart DATETIME;
-	DECLARE vDateEnd DATETIME;
-
-	SET vDateStart = vFromDated;
-	SET vDateEnd = util.Dayend(vToDated);
-
-	SELECT p.id FustCode, 
-			CAST(sent.stucks AS DECIMAL(10,0)) FH, 
-			CAST(tp.stucks AS DECIMAL(10,0)) Tickets, 
-			CAST(-sj.stucks AS DECIMAL(10,0)) Sijsner, 
-			CAST(IFNULL(sent.stucks,0) - IFNULL(tp.stucks,0) + IFNULL(sj.stucks,0) AS DECIMAL(10,0)) saldo
-		FROM vn.packaging p
-		LEFT JOIN (
-			SELECT FustCode, sum(fustQuantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,b.packagingFk) FustCode, s.quantity / b.packing AS fustQuantity
-					FROM vn.sale s 
-						JOIN vn.ticket t ON t.id = s.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN cache.last_buy lb ON lb.item_id = s.itemFk AND lb.warehouse_id = t.warehouseFk 
-						JOIN vn.buy b ON b.id = lb.buy_id 
-						JOIN vn.packaging p ON p.id = b.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk 
-						JOIN vn.province p2 ON p2.id = a.provinceFk 
-						JOIN vn.country c ON c.id = p2.countryFk 
-					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND c.country = 'FRANCIA') sub 
-					GROUP BY FustCode) sent ON sent.FustCode = p.id
-		LEFT JOIN (
-			SELECT FustCode, sum(quantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp 
-						JOIN vn.ticket t ON t.id = tp.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN vn.packaging p ON p.id = tp.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-						JOIN vn.address a ON a.id = t.addressFk 
-						JOIN vn.province p2 ON p2.id = a.provinceFk 
-						JOIN vn.country c ON c.id = p2.countryFk 
-					WHERE t.shipped BETWEEN vDateStart AND vDateEnd
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND c.country = 'FRANCIA'
-						AND t.clientFk != vSijsnerClientFk
-						AND tp.quantity > 0) sub 
-					GROUP BY FustCode) tp ON tp.FustCode = p.id
-		LEFT JOIN (
-			SELECT FustCode, sum(quantity) stucks
-				FROM (
-				SELECT IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, tp.quantity
-					FROM vn.ticketPackaging tp 
-						JOIN vn.ticket t ON t.id = tp.ticketFk 
-						JOIN vn.warehouse w ON w.id = t.warehouseFk 
-						JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-						JOIN vn.packaging p ON p.id = tp.packagingFk 
-						LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-					WHERE t.shipped BETWEEN TIMESTAMPADD(DAY, 1, vDateStart ) AND TIMESTAMPADD(DAY, 1, vDateEnd )
-						AND wa.name = 'VNH'
-						AND p.isPackageReturnable 
-						AND t.clientFk = vSijsnerClientFk) sub 
-					GROUP BY FustCode) sj ON sj.FustCode = p.id
-		WHERE sent.stucks 
-			OR tp.stucks
-			OR sj.stucks;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/fustControlDetail.sql
+++ b/db/routines/vn/procedures/fustControlDetail.sql
@ -1,36 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`fustControlDetail`(vFromDated DATE, vToDated DATE)
-BEGIN
-	
-	DECLARE vSijsnerClientFk INT DEFAULT 19752;
-
-	DECLARE vDateStart DATETIME;
-	DECLARE vDateEnd DATETIME;
-
-	SET vDateStart = vFromDated;
-	SET vDateEnd = util.Dayend(vToDated);
-	
-	SELECT a.nickname shopName,
-			a.city , 
-			IFNULL(pe.equivalentFk ,tp.packagingFk) FustCode, 
-			tp.quantity,
-			tp.ticketFk,
-			CONCAT('From ', vFromDated,' to ', vToDated) AS dateRange
-				FROM vn.ticketPackaging tp 
-					JOIN vn.ticket t ON t.id = tp.ticketFk 
-					JOIN vn.warehouse w ON w.id = t.warehouseFk 
-					JOIN vn.warehouseAlias wa ON wa.id = w.aliasFk 
-					JOIN vn.packaging p ON p.id = tp.packagingFk 
-					LEFT JOIN vn.packageEquivalent pe ON pe.packagingFk = p.id
-					JOIN vn.address a ON a.id = t.addressFk 
-					JOIN vn.province p2 ON p2.id = a.provinceFk 
-					JOIN vn.country c ON c.id = p2.countryFk 
-				WHERE t.shipped BETWEEN vFromDated AND util.dayend(vToDated)
-					AND wa.name = 'VNH'
-					AND p.isPackageReturnable 
-					AND c.country = 'FRANCIA'
-					AND t.clientFk != vSijsnerClientFk
-					AND tp.quantity > 0;
-				
-END$$
-DELIMITER ;
--- a/db/routines/vn/procedures/invoiceIn_add.sql
+++ b/db/routines/vn/procedures/invoiceIn_add.sql
@ -0,0 +1,234 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
+BEGIN
+/**
+ * Traslada la info de contabilidad relacionada con las facturas recibidas
+ *
+ * @vInvoiceInFk Factura recibida
+ * @vXDiarioFk Id tabla XDiario
+ */
+    DECLARE vInvoiceInOriginalFk INT;
+	DECLARE vDone BOOL DEFAULT FALSE;
+	DECLARE vBase DOUBLE;
+	DECLARE vVat DOUBLE;
+	DECLARE vRate DOUBLE;
+	DECLARE vTransactionCode INT;
+	DECLARE vCounter INT DEFAULT 0;
+	DECLARE vTransactionCodeOld INT;
+	DECLARE vTaxCode INT;
+	DECLARE vTaxCodeOld INT;
+	DECLARE vOperationCode VARCHAR(1);
+	DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
+	DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
+	DECLARE vInvoiceTypeReceived VARCHAR(1);
+	DECLARE vInvoiceTypeInformative VARCHAR(1);
+	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
+
+	DECLARE vCursor CURSOR FOR
+		SELECT it.taxableBase,
+				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
+				t.PorcentajeIva,
+				it.transactionTypeSageFk,
+				it.taxTypeSageFk,
+				tty.isIntracommunity,
+				tt.ClaveOperacionDefecto
+			FROM vn.invoiceIn i
+				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
+				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
+				JOIN taxType tty ON tty.id = t.CodigoIva
+				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
+				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
+			WHERE i.id = vInvoiceInFk
+				AND d.id IS NULL;
+
+	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
+
+	DELETE FROM movContaIVA
+		WHERE id = vXDiarioFk;
+
+	SELECT codeSage INTO vInvoiceTypeReceived
+		FROM invoiceType WHERE code ='received';
+
+	SELECT codeSage INTO vInvoiceTypeInformative
+		FROM invoiceType WHERE code ='informative';
+
+	INSERT INTO movContaIVA(id, LibreA1)
+		VALUES (vXDiarioFk, vInvoiceInFk);
+
+	OPEN vCursor;
+
+	l: LOOP
+		FETCH vCursor INTO vBase,
+				vVat,
+				vRate,
+				vTransactionCode,
+				vTaxCode,
+				vIsIntracommunity,
+				vOperationCode;
+
+		IF vDone THEN
+			LEAVE l;
+		END IF;
+
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
+
+		IF vOperationCode IS NOT NULL THEN
+			UPDATE movContaIVA
+				SET ClaveOperacionFactura = vOperationCode
+				WHERE id = vXDiarioFk;
+		END IF;
+
+		SET vCounter = vCounter + 1;
+		CASE vCounter
+			WHEN 1 THEN
+				 UPDATE movContaIVA
+					SET BaseIva1 = vBase,
+						PorIva1 = vRate,
+						CuotaIva1 = vVat,
+						CodigoTransaccion1 = vTransactionCode,
+						CodigoIva1 = vTaxCode
+					WHERE id = vXDiarioFk;
+
+			WHEN 2 THEN
+				UPDATE movContaIVA
+					SET BaseIva2 = vBase,
+						PorIva2 = vRate,
+						CuotaIva2 = vVat,
+						CodigoTransaccion2 = vTransactionCode,
+						CodigoIva2 = vTaxCode
+					WHERE id = vXDiarioFk;
+			WHEN 3 THEN
+				UPDATE movContaIVA
+					SET BaseIva3 = vBase,
+						PorIva3 = vRate,
+						CuotaIva3 = vVat,
+						CodigoTransaccion3 = vTransactionCode,
+						CodigoIva3 = vTaxCode
+					WHERE id = vXDiarioFk;
+			WHEN 4 THEN
+				UPDATE movContaIVA
+					SET BaseIva4 = vBase,
+						PorIva4 = vRate,
+						CuotaIva4 = vVat,
+						CodigoTransaccion4 = vTransactionCode,
+						CodigoIva4 = vTaxCode
+					WHERE id = vXDiarioFk;
+			ELSE
+				SELECT vXDiarioFk INTO vXDiarioFk;
+		END CASE;
+
+		IF vIsIntracommunity THEN
+			UPDATE movContaIVA
+				SET Intracomunitaria = TRUE
+				WHERE id = vXDiarioFk;
+		END IF;
+
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
+
+	END LOOP;
+
+	CLOSE vCursor;
+
+	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
+		FROM vn.dua d
+			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
+				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
+		WHERE d.ASIEN = (
+			SELECT ASIEN
+				FROM vn.XDiario
+				WHERE id = vXDiarioFk)
+		LIMIT 1;
+
+	UPDATE movContaIVA mci
+			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
+			JOIN vn.XDiario x ON x.id = mci.id
+			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
+			JOIN vn.supplier s ON s.id = ii.supplierFk
+			JOIN Naciones n ON n.countryFk = s.countryFk
+		SET mci.CodigoDivisa = ii.currencyFk,
+			mci.Año = YEAR(ii.issued),
+			mci.Serie = ii.serial,
+			mci.Factura = ii.id,
+			mci.FechaFactura = ii.issued,
+			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
+								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
+								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
+								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
+			mci.TipoFactura = IF(id.id,
+				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
+				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
+			mci.CodigoCuentaFactura = x.SUBCTA,
+			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
+			mci.Nombre = s.name,
+			mci.SiglaNacion = n.SiglaNacion,
+			mci.EjercicioFactura = YEAR(ii.issued),
+			mci.FechaOperacion = ii.issued,
+			mci.MantenerAsiento = TRUE,
+			mci.SuFacturaNo = ii.supplierRef,
+			mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
+			mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
+			mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
+			mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
+			mci.FechaFacturaOriginal = x.FECHA_EX
+		WHERE mci.id = vXDiarioFk;
+
+	-- RETENCIONES
+	UPDATE movContaIVA mci
+			JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
+			JOIN vn.XDiario x ON x.id = mci.id
+			JOIN vn.supplier s ON s.id = supplierFk
+			JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
+			JOIN vn.expense e ON e.id = iit.expenseFk
+			JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
+			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
+			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
+					FROM vn.XDiario x1
+						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
+					WHERE x2.BASEEURO <> 0
+						AND x1.id = vXDiarioFk
+				)sub
+			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
+		SET mci.CodigoRetencion = t.CodigoRetencion,
+			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
+			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
+			mci.PorRetencion = t.PorcentajeRetencion,
+			mci.ImporteRetencion = iit.taxableBase * - 1
+		WHERE mci.id = vXDiarioFk
+			AND e.name = 'Retenciones'
+			AND id.id IS NULL;
+
+	SELECT correctedFk INTO vInvoiceInOriginalFk
+		FROM vn.invoiceInCorrection
+		WHERE correctingFk = vInvoiceInFk;
+
+	IF vInvoiceInOriginalFk THEN 
+
+		UPDATE movContaIVA mci
+				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
+				JOIN (SELECT issued,
+							SUM(sub.taxableBase) taxableBase, 
+							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
+						FROM(SELECT issued,
+									SUM(iit.taxableBase) taxableBase, 
+									ti.PorcentajeIva
+								FROM vn.invoiceIn i 
+									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
+									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+								WHERE i.id = vInvoiceInOriginalFk
+								GROUP BY ti.CodigoIva)sub
+					)invoiceInOriginal
+				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
+			SET mci.TipoRectificativa = iir.refundCategoryFk,
+				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
+				mci.FechaOperacion = invoiceInOriginal.issued,
+				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
+				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
+				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
+			WHERE mci.id = vXDiarioFk;
+
+	END IF;
+END$$
+DELIMITER ;
--- a/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
+++ b/db/routines/vn/procedures/itemPlacementSupplyStockGetTargetList.sql
@ -8,16 +8,9 @@ BEGIN
 * @param vItemFk Identificador de vn.item
 * @param vSectorFk Identificador de vn.sector
 */
-	DECLARE vWarehouseAliasFk INT;
-
-	SELECT w.aliasFk INTO vWarehouseAliasFk
-		FROM vn.sector s
-		JOIN vn.warehouse w ON w.id = s.warehouseFk
-		WHERE s.id = vSectorFk;
-
 	SELECT ish.shelvingFk shelving,
 			p.code parking,
-		sum(ish.visible) as stockTotal,
+			SUM(ish.visible) stockTotal,
 			ish.created,
 			p.pickingOrder
 		FROM vn.itemShelving ish
@ -25,10 +18,12 @@ BEGIN
 			JOIN vn.parking p ON p.id = sh.parkingFk
 			JOIN vn.sector sc ON sc.id = p.sectorFk
 			JOIN vn.warehouse w ON w.id = sc.warehouseFk
-			WHERE w.aliasFk = vWarehouseAliasFk
+		WHERE sc.id = vSectorFk
 			AND ish.visible > 0
 			AND ish.itemFk = vItemFk
 		GROUP BY ish.id
-		ORDER BY (sc.id = vSectorFk) DESC, sh.priority DESC, ish.created, p.pickingOrder;
+		ORDER BY sh.priority DESC,
+			ish.created, 
+			p.pickingOrder;
 END$$
 DELIMITER ;
--- a/db/routines/vn/procedures/itemShelvingRadar.sql
+++ b/db/routines/vn/procedures/itemShelvingRadar.sql
@ -1,7 +1,13 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(vSectorFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemShelvingRadar`(
+	vSectorFk INT
+)
 proc:BEGIN
-	
+/**
+ * Calcula la información detallada respecto un sector.
+ *
+ * @param vSectorFk Id de sector
+ */
 	DECLARE vCalcVisibleFk INT;
 	DECLARE vCalcAvailableFk INT;
 	DECLARE hasFatherSector BOOLEAN;
--- a/db/routines/vn/triggers/warehouse_afterUpdate.sql
+++ b/db/routines/vn/triggers/warehouse_afterUpdate.sql
@ -1,12 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`warehouse_afterUpdate`
-	AFTER UPDATE ON `warehouse`
-	FOR EACH ROW
-BEGIN
-	IF NEW.isFeedStock IS TRUE AND OLD.isFeedStock IS FALSE THEN
-		INSERT IGNORE INTO warehouseAlias(`name`) VALUES(NEW.`name`);
-		INSERT IGNORE INTO warehouseJoined(warehouseFk, warehouseAliasFk)
-			VALUES(NEW.id,LAST_INSERT_ID());
-	END IF;
-END$$
-DELIMITER ;
--- a/db/routines/vn/views/itemShelvingAvailable.sql
+++ b/db/routines/vn/views/itemShelvingAvailable.sql
@ -1,7 +1,7 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`itemShelvingAvailable`
-AS SELECT `s`.`id` AS `saleFk`,
+AS SELECT `s`.`id` `saleFk`,
 	`tst`.`updated` AS `Modificado`,
 	`s`.`ticketFk` AS `ticketFk`,
 	0 AS `isPicked`,
@ -38,7 +38,7 @@ FROM (
 									)
 									JOIN `vn`.`agencyMode` `am` ON(`am`.`id` = `t`.`agencyModeFk`)
 								)
-								JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticket` = `t`.`id`)
+								JOIN `vn`.`ticketStateToday` `tst` ON(`tst`.`ticketFk` = `t`.`id`)
 							)
 							JOIN `vn`.`state` `st` ON(`st`.`id` = `tst`.`state`)
 						)
--- a/db/routines/vn/views/ticketStateToday.sql
+++ b/db/routines/vn/views/ticketStateToday.sql
@ -1,16 +1,15 @@
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn`.`ticketStateToday`
-AS SELECT `ts`.`ticketFk` AS `ticket`,
+AS SELECT
+	`ts`.`ticketFk` AS `ticketFk`,
 	`ts`.`state` AS `state`,
 	`ts`.`productionOrder` AS `productionOrder`,
 	`ts`.`alertLevel` AS `alertLevel`,
-	`ts`.`userFk` AS `worker`,
+	`ts`.`userFk` AS `userFk`,
 	`ts`.`code` AS `code`,
 	`ts`.`updated` AS `updated`,
 	`ts`.`isPicked` AS `isPicked`
-FROM (
-		`vn`.`ticketState` `ts`
-		JOIN `vn`.`ticket` `t` ON(`t`.`id` = `ts`.`ticketFk`)
-	)
-WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`())
+FROM `ticketState` `ts`
+	JOIN `ticket` `t` ON `t`.`id` = `ts`.`ticketFk`
+WHERE `t`.`shipped` BETWEEN `util`.`VN_CURDATE`() AND `MIDNIGHT`(`util`.`VN_CURDATE`());
--- a/db/routines/vn/views/warehouseJoined.sql
+++ b/db/routines/vn/views/warehouseJoined.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`warehouseJoined`
-AS SELECT `wj`.`warehouse_id` AS `warehouseFk`,
-	`wj`.`warehouse_alias_id` AS `warehouseAliasFk`
-FROM `vn2008`.`warehouse_joined` `wj`
--- a/db/routines/vn/views/zoneEstimatedDelivery.sql
+++ b/db/routines/vn/views/zoneEstimatedDelivery.sql
@ -9,12 +9,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 		lhp.m3,
 		dl.minSpeed
 	FROM ticket t
-		JOIN ticketStateToday tst ON tst.ticket = t.id
+		JOIN ticketStateToday tst ON tst.ticketFk = t.id
 		JOIN state s ON	s.id = tst.state
 		JOIN saleVolume sv ON sv.ticketFk = t.id
 		LEFT JOIN lastHourProduction lhp ON lhp.warehouseFk = t.warehouseFk
 		JOIN warehouse w ON w.id = t.warehouseFk
-		JOIN warehouseAlias wa ON wa.id = w.aliasFk
 		STRAIGHT_JOIN `zone` z ON z.id = t.zoneFk
 		LEFT JOIN zoneClosure zc ON zc.zoneFk = t.zoneFk
 			AND zc.dated = util.VN_CURDATE()
--- a/db/routines/vn2008/functions/intrastat_neto.sql
+++ b/db/routines/vn2008/functions/intrastat_neto.sql
@ -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 ;
--- a/db/routines/vn2008/functions/red.sql
+++ b/db/routines/vn2008/functions/red.sql
@ -1,14 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn2008`.`red`(intCANTIDAD DOUBLE)
-	RETURNS double
-	DETERMINISTIC
-BEGIN
-
-	DECLARE n DOUBLE;
-
-	SET n = SIGN(intCANTIDAD) * TRUNCATE(   (ABS(intCANTIDAD) * 100)   +  0.5001        ,0)           /100 ;
-
-	RETURN n;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/procedures/desglose_volume.sql
+++ b/db/routines/vn2008/procedures/desglose_volume.sql
@ -1,82 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`desglose_volume`(IN vAgencyFk INT)
-BEGIN
-	
-    DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
-    DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
-    DECLARE vIsHolland BOOL;
-    
-   	SELECT (wa.name = 'Holanda') INTO vIsHolland
-   		FROM vn.agency a 
-   			JOIN vn.warehouseAlias wa ON wa.id = a.warehouseAliasFk 
-   			WHERE a.id = vAgencyFk;
-	
-   	IF vIsHolland THEN
-   	
-   		DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-		CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-		(
-	         ticketFk INT PRIMARY KEY
-	        ,carros DECIMAL(5,1) DEFAULT 0
-	    );
-   	
-   		INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, carros)
-		SELECT sv.ticketFk, ROUND(vc.dutchCompressionRate * sum(sv.volume) / vc.trolleyM3,0)
-			FROM vn.ticket t
-	        JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-	        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-	        JOIN vn.volumeConfig vc
-	            WHERE t.shipped BETWEEN vStarted AND vEnded
-	            AND am.agencyFk = vAgencyFk
-	            GROUP BY t.id;
-	           
-	    SELECT 	a.nickname Provincia, 
-				count(*) expediciones, 
-				0 Bultos, 
-				sum(tpe.carros) Prevision
-	        FROM vn.ticket t
-	        	JOIN vn.address a ON a.id = t.addressFk 
-		        JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-	        GROUP BY a.nickname;
-   	
-   	ELSE
-   	
-   		DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
-		CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
-		(
-	         ticketFk INT PRIMARY KEY
-	        ,boxes INT DEFAULT 0
-	    );
-   	
-		INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
-		SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
-			FROM vn.ticket t
-	        JOIN vn.saleVolume sv ON sv.ticketFk = t.id
-	        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-	        JOIN vn.volumeConfig vc
-	            WHERE t.shipped BETWEEN vStarted AND vEnded
-	            AND IFNULL(t.packages,0) = 0
-	            AND am.agencyFk = vAgencyFk
-	            GROUP BY t.id;
-		
-		
-		SELECT 	p.name Provincia, 
-				count(*) expediciones, 
-				sum(t.packages) Bultos, 
-				sum(tpe.boxes) Prevision
-	        FROM vn.ticket t
-		        JOIN vn.address a ON a.id = t.addressFk 
-		        JOIN vn.province p ON a.provinceFk = p.id
-		        JOIN vn.agencyMode am ON am.id = t.agencyModeFk 
-		        JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
-		    WHERE t.warehouseFk = 60
-	            AND t.shipped BETWEEN vStarted AND vEnded
-	            AND am.agencyFk = vAgencyFk
-	        GROUP BY p.name;
-	       
-	 END IF;
-           SELECT * FROM tmp.ticket_PackagingEstimated;
-     DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
-
-END$$
-DELIMITER ;
--- a/db/routines/vn2008/views/Articles_botanical.sql
+++ b/db/routines/vn2008/views/Articles_botanical.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Articles_botanical`
-AS SELECT `ab`.`itemFk` AS `Id_Article`,
-	`ab`.`genusFk` AS `genus_id`,
-	`ab`.`specieFk` AS `specie_id`
-FROM `vn`.`itemBotanical` `ab`
--- a/db/routines/vn2008/views/Equipos.sql
+++ b/db/routines/vn2008/views/Equipos.sql
@ -1,8 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Equipos`
-AS SELECT `h`.`code` AS `alias`,
-	`h`.`description` AS `descripcion`,
-	`h`.`workerFk` AS `trabajador_id`,
-	`h`.`windowsSerial` AS `windowsSerial`
-FROM `vn`.`host` `h`
--- a/db/routines/vn2008/views/Prioridades.sql
+++ b/db/routines/vn2008/views/Prioridades.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Prioridades`
-AS SELECT `qp`.`id` AS `Id_Prioridad`,
-	`qp`.`priority` AS `Prioridad`
-FROM `vn`.`queuePriority` `qp`
--- a/db/routines/vn2008/views/agency.sql
+++ b/db/routines/vn2008/views/agency.sql
@ -4,7 +4,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 AS SELECT `a`.`id` AS `agency_id`,
 	`a`.`name` AS `name`,
 	`a`.`warehouseFk` AS `warehouse_id`,
-	`a`.`warehouseAliasFk` AS `warehouse_alias_id`,
 	`a`.`isOwn` AS `propios`,
 	`a`.`workCenterFk` AS `workCenterFk`
 FROM `vn`.`agency` `a`
--- a/db/routines/vn2008/views/bionic_updating_options.sql
+++ b/db/routines/vn2008/views/bionic_updating_options.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`bionic_updating_options`
-AS SELECT `t`.`id` AS `buo_id`,
-	`t`.`description` AS `description`
-FROM `vn`.`ticketUpdateAction` `t`
--- a/db/routines/vn2008/views/businessReasonEnd.sql
+++ b/db/routines/vn2008/views/businessReasonEnd.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`businessReasonEnd`
-AS SELECT `b`.`id` AS `id`,
-	`b`.`reason` AS `reason`
-FROM `vn`.`businessReasonEnd` `b`
--- a/db/routines/vn2008/views/cl_dev.sql
+++ b/db/routines/vn2008/views/cl_dev.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`cl_dev`
-AS SELECT `c`.`id` AS `id`,
-	`c`.`description` AS `devolucion`
-FROM `vn`.`claimRedelivery` `c`
--- a/db/routines/vn2008/views/cl_est.sql
+++ b/db/routines/vn2008/views/cl_est.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`cl_est`
-AS SELECT `c`.`id` AS `id`,
-	`c`.`description` AS `estado`,
-	`c`.`roleFk` AS `roleFk`
-FROM `vn`.`claimState` `c`
--- a/db/routines/vn2008/views/deliveryPoint.sql
+++ b/db/routines/vn2008/views/deliveryPoint.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`deliveryPoint`
-AS SELECT `dp`.`id` AS `id`,
-	`dp`.`name` AS `name`,
-	`dp`.`ubication` AS `ubication`
-FROM `vn`.`deliveryPoint` `dp`
--- a/db/routines/vn2008/views/device_user.sql
+++ b/db/routines/vn2008/views/device_user.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`device_user`
-AS SELECT `dpu`.`deviceProductionFk` AS `device_id`,
-	`dpu`.`userFk` AS `user_id`
-FROM `vn`.`deviceProductionUser` `dpu`
--- a/db/routines/vn2008/views/edi_feature.sql
+++ b/db/routines/vn2008/views/edi_feature.sql
@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_feature`
-AS SELECT `edi`.`feature`.`item_id` AS `item_id`,
-	`edi`.`feature`.`feature_type_id` AS `feature_type_id`,
-	`edi`.`feature`.`feature_value` AS `feature_value`,
-	`edi`.`feature`.`entry_date` AS `entry_date`,
-	`edi`.`feature`.`expiry_date` AS `expiry_date`,
-	`edi`.`feature`.`change_date_time` AS `change_date_time`
-FROM `edi`.`feature`
--- a/db/routines/vn2008/views/edi_genus.sql
+++ b/db/routines/vn2008/views/edi_genus.sql
@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_genus`
-AS SELECT `edi`.`genus`.`genus_id` AS `genus_id`,
-	`edi`.`genus`.`latin_genus_name` AS `latin_genus_name`,
-	`edi`.`genus`.`entry_date` AS `entry_date`,
-	`edi`.`genus`.`expiry_date` AS `expiry_date`,
-	`edi`.`genus`.`change_date_time` AS `change_date_time`
-FROM `edi`.`genus`
--- a/db/routines/vn2008/views/edi_item_feature.sql
+++ b/db/routines/vn2008/views/edi_item_feature.sql
@ -1,11 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_item_feature`
-AS SELECT `edi`.`item_feature`.`item_id` AS `item_id`,
-	`edi`.`item_feature`.`presentation_order` AS `presentation_order`,
-	`edi`.`item_feature`.`feature` AS `feature`,
-	`edi`.`item_feature`.`regulation_type` AS `regulation_type`,
-	`edi`.`item_feature`.`entry_date` AS `entry_date`,
-	`edi`.`item_feature`.`expiry_date` AS `expiry_date`,
-	`edi`.`item_feature`.`change_date_time` AS `change_date_time`
-FROM `edi`.`item_feature`
--- a/db/routines/vn2008/views/edi_plant.sql
+++ b/db/routines/vn2008/views/edi_plant.sql
@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_plant`
-AS SELECT `edi`.`plant`.`plant_id` AS `plant_id`,
-	`edi`.`plant`.`genus_id` AS `genus_id`,
-	`edi`.`plant`.`specie_id` AS `specie_id`,
-	`edi`.`plant`.`entry_date` AS `entry_date`,
-	`edi`.`plant`.`expiry_date` AS `expiry_date`,
-	`edi`.`plant`.`change_date_time` AS `change_date_time`
-FROM `edi`.`plant`
--- a/db/routines/vn2008/views/edi_type.sql
+++ b/db/routines/vn2008/views/edi_type.sql
@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_type`
-AS SELECT `edi`.`type`.`type_id` AS `type_id`,
-	`edi`.`type`.`type_group_id` AS `type_group_id`,
-	`edi`.`type`.`description` AS `description`,
-	`edi`.`type`.`entry_date` AS `entry_date`,
-	`edi`.`type`.`expiry_date` AS `expiry_date`,
-	`edi`.`type`.`change_date_time` AS `change_date_time`
-FROM `edi`.`type`
--- a/db/routines/vn2008/views/edi_value.sql
+++ b/db/routines/vn2008/views/edi_value.sql
@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`edi_value`
-AS SELECT `edi`.`value`.`type_id` AS `type_id`,
-	`edi`.`value`.`type_value` AS `type_value`,
-	`edi`.`value`.`type_description` AS `type_description`,
-	`edi`.`value`.`entry_date` AS `entry_date`,
-	`edi`.`value`.`expiry_date` AS `expiry_date`,
-	`edi`.`value`.`change_date_time` AS `change_date_time`
-FROM `edi`.`value`
--- a/db/routines/vn2008/views/escritos.sql
+++ b/db/routines/vn2008/views/escritos.sql
@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`escritos`
-AS SELECT `s`.`id` AS `id`,
-	`s`.`code` AS `abrev`,
-	`s`.`description` AS `descripcion`,
-	`s`.`isVisible` AS `visible`,
-	`s`.`hasCompany` AS `hasCompany`
-FROM `vn`.`sample` `s`
--- a/db/routines/vn2008/views/person_user.sql
+++ b/db/routines/vn2008/views/person_user.sql
@ -1,10 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`person_user`
-AS SELECT `u`.`id` AS `id`,
-	`u`.`role` AS `mysql_user_id`,
-	`u`.`name` AS `name`,
-	`u`.`password` AS `password`,
-	`u`.`active` AS `active`,
-	`u`.`lastPassChange` AS `last_pass_change`
-FROM `account`.`user` `u`
--- a/db/routines/vn2008/views/person_user_idtrabajador.sql
+++ b/db/routines/vn2008/views/person_user_idtrabajador.sql
@ -1,9 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`person_user_idtrabajador`
-AS SELECT `t`.`Id_Trabajador` AS `Id_Trabajador`
-FROM (
-		`vn2008`.`person_user` `p`
-		JOIN `vn2008`.`Trabajadores` `t` ON(`p`.`id` = `t`.`user_id`)
-	)
-WHERE `t`.`user_id` = `account`.`myUser_getId`()
--- a/db/routines/vn2008/views/reference_min.sql
+++ b/db/routines/vn2008/views/reference_min.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`reference_min`
-AS SELECT `rc`.`dated` AS `date`,
-	`rc`.`value` AS `rate`,
-	`rc`.`currencyFk` AS `moneda_id`
-FROM `vn`.`referenceCurrent` `rc`
--- a/db/versions/10856-greenAralia/00-cloneAcl.sql
+++ b/db/versions/10856-greenAralia/00-cloneAcl.sql
@ -0,0 +1,4 @@
+UPDATE salix.ACL
+	SET property='clone'
+    WHERE model = 'Sale'
+        AND property = 'refund'
--- a/db/versions/10857-navyArborvitae/00-firstScript.sql
+++ b/db/versions/10857-navyArborvitae/00-firstScript.sql
@ -0,0 +1,8 @@
+ALTER TABLE vn.agency 
+	CHANGE warehouseAliasFk warehouseAliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+ALTER TABLE vn.warehouse 
+	CHANGE aliasFk aliasFk__ SMALLINT(5) UNSIGNED DEFAULT NULL NULL COMMENT '@deprecated 2024-01-23 refs #5167';
+
+RENAME TABLE vn.warehouseAlias TO vn.warehouseAlias__;
+ALTER TABLE vn.warehouseAlias__ COMMENT='@deprecated 2024-01-23 refs #5167';
--- a/db/versions/10863-brownIvy/00-firstScript.sql
+++ b/db/versions/10863-brownIvy/00-firstScript.sql
@ -0,0 +1,4 @@
+-- Place your SQL code here
+UPDATE vn.supplier
+    SET name = UPPER(name),
+    nickname = UPPER(nickname);
--- a/db/versions/10866-whiteRaphis/00-firstScript.sql
+++ b/db/versions/10866-whiteRaphis/00-firstScript.sql
@ -0,0 +1 @@
+REVOKE EXECUTE ON FUNCTION vn2008.red FROM hrBoss, salesPerson;
--- a/db/versions/10867-yellowAsparagus/00-createAclInvoiceIn.sql
+++ b/db/versions/10867-yellowAsparagus/00-createAclInvoiceIn.sql
@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('InvoiceIn', 'corrective', 'WRITE', 'ALLOW', 'ROLE', 'administrative'),
+        ('InvoiceInCorrection', '*', '*', 'ALLOW', 'ROLE', 'administrative');
--- a/db/versions/10867-yellowAsparagus/01-createInvoiceInCorrection.sql
+++ b/db/versions/10867-yellowAsparagus/01-createInvoiceInCorrection.sql
@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS `vn`.`invoiceInCorrection` (
+    `correctingFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificativa',
+    `correctedFk` mediumint(8) UNSIGNED NOT NULL COMMENT 'Factura rectificada',
+    `cplusRectificationTypeFk` int(10) UNSIGNED NOT NULL,
+    `siiTypeInvoiceOutFk` int(10) UNSIGNED NOT NULL,
+    `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
+    PRIMARY KEY (`correctingFk`),
+    KEY `invoiceInCorrection_correctedFk` (`correctedFk`),
+    KEY `invoiceInCorrection_cplusRectificationTypeFk` (`cplusRectificationTypeFk`),
+    KEY `invoiceInCorrection_siiTypeInvoiceOut` (`siiTypeInvoiceOutFk`),
+    KEY `invoiceInCorrection_invoiceCorrectionTypeFk` (`invoiceCorrectionTypeFk`),
+    CONSTRAINT `invoiceInCorrection_correctedFk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `invoiceInCorrection_correctingFk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, 
+    CONSTRAINT `invoiceInCorrection_siiTypeInvoiceOut` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
+    CONSTRAINT `invoiceInCorrection_invoiceCorrectionTypeFk` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
+    CONSTRAINT `invoiceInCorrection_cplusRectificationTypeFk` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE
+);
--- a/db/versions/10869-crimsonDracena/00-firstScript.sql
+++ b/db/versions/10869-crimsonDracena/00-firstScript.sql
@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.reference_min FROM logistic;
--- a/db/versions/10871-wheatCyca/00-firstScript.sql
+++ b/db/versions/10871-wheatCyca/00-firstScript.sql
@ -0,0 +1 @@
+REVOKE SELECT ON TABLE vn2008.Articles_botanical FROM buyer, administrative;
--- a/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js
+++ b/e2e/paths/13-supplier/01_summary_and_descriptor.spec.js
@ -24,7 +24,7 @@ describe('Supplier summary & descriptor path', () => {
    it(`should confirm there's data on the summary header`, async() => {
        const result = await page.waitToGetProperty(selectors.supplierSummary.header, 'innerText');

-        expect(result).toContain('Plants SL - 1');
+        expect(result).toContain('PLANTS SL - 1');
    });

    it(`should confirm there's data on the summary basic data`, async() => {
--- a/e2e/paths/13-supplier/03_fiscal_data.spec.js
+++ b/e2e/paths/13-supplier/03_fiscal_data.spec.js
@ -24,7 +24,7 @@ describe('Supplier fiscal data path', () => {
            country: null,
            postcode: null,
            city: 'Valencia',
-            socialName: 'Farmer King SL',
+            socialName: 'FARMER KING SL',
            taxNumber: '12345678Z',
            account: '0123456789',
            sageWithholding: 'retencion estimacion objetiva',
@ -46,7 +46,7 @@ describe('Supplier fiscal data path', () => {
            country: 'España',
            postcode: '46000',
            city: 'Valencia',
-            socialName: 'Farmer King SL',
+            socialName: 'FARMER KING SL',
            taxNumber: '12345678Z',
            account: '0123456789',
            sageWithholding: 'RETENCION ESTIMACION OBJETIVA',
--- a/front/package-lock.json
+++ b/front/package-lock.json
@ -1,258 +0,0 @@
-{
-	"name": "salix-front",
-	"version": "1.0.0",
-	"lockfileVersion": 2,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "salix-front",
-			"version": "1.0.0",
-			"license": "GPL-3.0",
-			"dependencies": {
-				"@uirouter/angularjs": "^1.0.20",
-				"angular": "^1.7.5",
-				"angular-animate": "^1.7.8",
-				"angular-moment": "^1.3.0",
-				"angular-translate": "^2.18.1",
-				"angular-translate-loader-partial": "^2.18.1",
-				"croppie": "^2.6.5",
-				"js-yaml": "^3.13.1",
-				"mg-crud": "^1.1.2",
-				"oclazyload": "^0.6.3",
-				"require-yaml": "0.0.1",
-				"validator": "^6.3.0"
-			}
-		},
-		"node_modules/@uirouter/angularjs": {
-			"version": "1.0.30",
-			"license": "MIT",
-			"dependencies": {
-				"@uirouter/core": "6.0.8"
-			},
-			"engines": {
-				"node": ">=4.0.0"
-			},
-			"peerDependencies": {
-				"angular": ">=1.2.0"
-			}
-		},
-		"node_modules/@uirouter/core": {
-			"version": "6.0.8",
-			"license": "MIT",
-			"engines": {
-				"node": ">=4.0.0"
-			}
-		},
-		"node_modules/angular": {
-			"version": "1.8.3",
-			"license": "MIT"
-		},
-		"node_modules/angular-animate": {
-			"version": "1.8.2",
-			"license": "MIT"
-		},
-		"node_modules/angular-moment": {
-			"version": "1.3.0",
-			"license": "MIT",
-			"dependencies": {
-				"moment": ">=2.8.0 <3.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/angular-translate": {
-			"version": "2.19.1",
-			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.1.tgz",
-			"integrity": "sha512-SrU40ndnL422vXiVoqVveCmSnCzMcIXxQgnl7Cv9krOKUg6B8KZK3ddYzidHR/rxVuySezYHNDgRvzQNKwAdNQ==",
-			"deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-			"dependencies": {
-				"angular": "^1.8.0"
-			},
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/angular-translate-loader-partial": {
-			"version": "2.19.0",
-			"license": "MIT",
-			"dependencies": {
-				"angular-translate": "~2.19.0"
-			}
-		},
-		"node_modules/argparse": {
-			"version": "1.0.10",
-			"license": "MIT",
-			"dependencies": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"node_modules/croppie": {
-			"version": "2.6.5",
-			"license": "MIT"
-		},
-		"node_modules/esprima": {
-			"version": "4.0.1",
-			"license": "BSD-2-Clause",
-			"bin": {
-				"esparse": "bin/esparse.js",
-				"esvalidate": "bin/esvalidate.js"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/js-yaml": {
-			"version": "3.14.1",
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/mg-crud": {
-			"version": "1.1.2",
-			"license": "MIT",
-			"dependencies": {
-				"angular": "^1.6.1"
-			}
-		},
-		"node_modules/moment": {
-			"version": "2.29.4",
-			"license": "MIT",
-			"engines": {
-				"node": "*"
-			}
-		},
-		"node_modules/oclazyload": {
-			"version": "0.6.3",
-			"license": "MIT"
-		},
-		"node_modules/require-yaml": {
-			"version": "0.0.1",
-			"license": "BSD",
-			"dependencies": {
-				"js-yaml": ""
-			}
-		},
-		"node_modules/require-yaml/node_modules/argparse": {
-			"version": "2.0.1",
-			"license": "Python-2.0"
-		},
-		"node_modules/require-yaml/node_modules/js-yaml": {
-			"version": "4.1.0",
-			"license": "MIT",
-			"dependencies": {
-				"argparse": "^2.0.1"
-			},
-			"bin": {
-				"js-yaml": "bin/js-yaml.js"
-			}
-		},
-		"node_modules/sprintf-js": {
-			"version": "1.0.3",
-			"license": "BSD-3-Clause"
-		},
-		"node_modules/validator": {
-			"version": "6.3.0",
-			"license": "MIT",
-			"engines": {
-				"node": ">= 0.10"
-			}
-		}
-	},
-	"dependencies": {
-		"@uirouter/angularjs": {
-			"version": "1.0.30",
-			"requires": {
-				"@uirouter/core": "6.0.8"
-			}
-		},
-		"@uirouter/core": {
-			"version": "6.0.8"
-		},
-		"angular": {
-			"version": "1.8.3"
-		},
-		"angular-animate": {
-			"version": "1.8.2"
-		},
-		"angular-moment": {
-			"version": "1.3.0",
-			"requires": {
-				"moment": ">=2.8.0 <3.0.0"
-			}
-		},
-		"angular-translate": {
-			"version": "2.19.1",
-			"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.1.tgz",
-			"integrity": "sha512-SrU40ndnL422vXiVoqVveCmSnCzMcIXxQgnl7Cv9krOKUg6B8KZK3ddYzidHR/rxVuySezYHNDgRvzQNKwAdNQ==",
-			"requires": {
-				"angular": "^1.8.0"
-			}
-		},
-		"angular-translate-loader-partial": {
-			"version": "2.19.0",
-			"requires": {
-				"angular-translate": "~2.19.0"
-			}
-		},
-		"argparse": {
-			"version": "1.0.10",
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			}
-		},
-		"croppie": {
-			"version": "2.6.5"
-		},
-		"esprima": {
-			"version": "4.0.1"
-		},
-		"js-yaml": {
-			"version": "3.14.1",
-			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
-			}
-		},
-		"mg-crud": {
-			"version": "1.1.2",
-			"requires": {
-				"angular": "^1.6.1"
-			}
-		},
-		"moment": {
-			"version": "2.29.4"
-		},
-		"oclazyload": {
-			"version": "0.6.3"
-		},
-		"require-yaml": {
-			"version": "0.0.1",
-			"requires": {
-				"js-yaml": ""
-			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1"
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				}
-			}
-		},
-		"sprintf-js": {
-			"version": "1.0.3"
-		},
-		"validator": {
-			"version": "6.3.0"
-		}
-	}
-}
--- a/front/package.json
+++ b/front/package.json
@ -8,6 +8,7 @@
 		"type": "git",
 		"url": "https://gitea.verdnatura.es/verdnatura/salix"
 	},
+	"packageManager": "pnpm@8.15.1",
 	"dependencies": {
 		"@uirouter/angularjs": "^1.0.20",
 		"angular": "^1.7.5",
--- a/front/pnpm-lock.yaml
+++ b/front/pnpm-lock.yaml
@ -0,0 +1,156 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+dependencies:
+  '@uirouter/angularjs':
+    specifier: ^1.0.20
+    version: 1.1.0(@uirouter/core@6.1.0)(angular@1.8.3)
+  angular:
+    specifier: ^1.7.5
+    version: 1.8.3
+  angular-animate:
+    specifier: ^1.7.8
+    version: 1.8.3
+  angular-moment:
+    specifier: ^1.3.0
+    version: 1.3.0
+  angular-translate:
+    specifier: ^2.18.1
+    version: 2.19.1
+  angular-translate-loader-partial:
+    specifier: ^2.18.1
+    version: 2.19.1
+  croppie:
+    specifier: ^2.6.5
+    version: 2.6.5
+  js-yaml:
+    specifier: ^3.13.1
+    version: 3.14.1
+  mg-crud:
+    specifier: ^1.1.2
+    version: 1.1.2
+  oclazyload:
+    specifier: ^0.6.3
+    version: 0.6.3
+  require-yaml:
+    specifier: 0.0.1
+    version: 0.0.1
+  validator:
+    specifier: ^6.3.0
+    version: 6.3.0
+
+packages:
+
+  /@uirouter/angularjs@1.1.0(@uirouter/core@6.1.0)(angular@1.8.3):
+    resolution: {integrity: sha512-AhgxXhMfN6FU2HxDQqwDPbzmd6kTgvYCgV/kgoCAXfxAH6cFQrifViToC90Wdg6djBynHwA3L/KYP+iOYHkw6A==}
+    engines: {node: '>=4.0.0'}
+    peerDependencies:
+      '@uirouter/core': ^6.0.8
+      angular: '>=1.2.0'
+    dependencies:
+      '@uirouter/core': 6.1.0
+      angular: 1.8.3
+    dev: false
+
+  /@uirouter/core@6.1.0:
+    resolution: {integrity: sha512-WFYh5NPAqRX4L2qlI4k62tgR6pxoqOBSW1CM1uBWCau4mAmgasYd5etJ9RoSJrSnCpCQ2km2Jltf0n5ql684MQ==}
+    engines: {node: '>=4.0.0'}
+    dev: false
+
+  /angular-animate@1.8.3:
+    resolution: {integrity: sha512-/LtTKvy5sD6MZbV0v+nHgOIpnFF0mrUp+j5WIxVprVhcrJriYpuCZf4S7Owj1o76De/J0eRzANUozNJ6hVepnQ==}
+    deprecated: For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward.
+    dev: false
+
+  /angular-moment@1.3.0:
+    resolution: {integrity: sha512-KG8rvO9MoaBLwtGnxTeUveSyNtrL+RNgGl1zqWN36+HDCCVGk2DGWOzqKWB6o+eTTbO3Opn4hupWKIElc8XETA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      moment: 2.30.1
+    dev: false
+
+  /angular-translate-loader-partial@2.19.1:
+    resolution: {integrity: sha512-1rDe314zG09gwl/2qsLPwrxp5yehSsRi2vNJn/UwIJq20n0E0Fia/1K0nW9QAv67UFyvFuBOhl34n59I1qEHog==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+    dependencies:
+      angular-translate: 2.19.1
+    dev: false
+
+  /angular-translate@2.19.1:
+    resolution: {integrity: sha512-SrU40ndnL422vXiVoqVveCmSnCzMcIXxQgnl7Cv9krOKUg6B8KZK3ddYzidHR/rxVuySezYHNDgRvzQNKwAdNQ==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+    dependencies:
+      angular: 1.8.3
+    dev: false
+
+  /angular@1.8.3:
+    resolution: {integrity: sha512-5qjkWIQQVsHj4Sb5TcEs4WZWpFeVFHXwxEBHUhrny41D8UrBAd6T/6nPPAsLngJCReIOqi95W3mxdveveutpZw==}
+    deprecated: For the actively supported Angular, see https://www.npmjs.com/package/@angular/core. AngularJS support has officially ended. For extended AngularJS support options, see https://goo.gle/angularjs-path-forward.
+    dev: false
+
+  /argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+    dependencies:
+      sprintf-js: 1.0.3
+    dev: false
+
+  /argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+    dev: false
+
+  /croppie@2.6.5:
+    resolution: {integrity: sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ==}
+    dev: false
+
+  /esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+    dev: false
+
+  /js-yaml@3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+    dev: false
+
+  /js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+    dependencies:
+      argparse: 2.0.1
+    dev: false
+
+  /mg-crud@1.1.2:
+    resolution: {integrity: sha512-mAR6t0aQHKnT0QHKHpLOi0kNPZfO36iMpIoiLjFHxuio6mIJyuveBJ4VNlNXJRxLh32/FLADEb41/sYo7QUKFw==}
+    dependencies:
+      angular: 1.8.3
+    dev: false
+
+  /moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+    dev: false
+
+  /oclazyload@0.6.3:
+    resolution: {integrity: sha512-HpOSYUgjtt6sTB/C6+FWsExR+9HCnXKsUA96RWkDXfv11C8Cc9X2DlR0WIZwFIiG6FQU0pwB5dhoYyut8bFAOQ==}
+    dev: false
+
+  /require-yaml@0.0.1:
+    resolution: {integrity: sha512-M6eVEgLPRbeOhgSCnOTtdrOOEQzbXRchg24Xa13c39dMuraFKdI9emUo97Rih0YEFzSICmSKg8w4RQp+rd9pOQ==}
+    dependencies:
+      js-yaml: 4.1.0
+    dev: false
+
+  /sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+    dev: false
+
+  /validator@6.3.0:
+    resolution: {integrity: sha512-BylxTwhqwjQI5MDJF7amCy/L0ejJO+74DvCsLV52Lq3+3bhVcVMKqNqOiNcQJm2G48u9EAcw4xFERAmFbwXM9Q==}
+    engines: {node: '>= 0.10'}
+    dev: false
--- a/loopback/common/methods/schema/model-info.js
+++ b/loopback/common/methods/schema/model-info.js
@ -22,7 +22,7 @@ module.exports = Self => {
    });

    const modelsLocale = new Map();
-    const modulesDir = path.resolve(`${__dirname}/../../../../modules`);
+    const modulesDir = path.resolve(`${process.cwd()}/modules`);
    const modules = fs.readdirSync(modulesDir);

    for (const mod of modules) {
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -204,5 +204,8 @@
 	"Cannot past travels with entries": "Cannot past travels with entries",
 	"It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}",
 	"Incorrect pin": "Incorrect pin.",
-	"The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified"
+	"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"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -180,8 +180,7 @@
 	"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",
-    "CountryFK cannot be empty": "El país no puede estar vacío",
-    "This BIC already exist": "Este BIC ya existe",
+	"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",
@ -338,6 +337,7 @@
 	"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",
    "Bank entity must be specified": "La entidad bancaria es obligatoria",
 	"An email is necessary": "Es necesario un email"
 }
--- a/loopback/server/middleware/salix-version.js
+++ b/loopback/server/middleware/salix-version.js
@ -1,4 +1,4 @@
-const packageJson = require('../../../package.json');
+const packageJson = require(`${process.cwd()}/package.json`);

 module.exports = function(options) {
    return function(req, res, next) {
--- a/loopback/server/server.js
+++ b/loopback/server/server.js
@ -28,7 +28,7 @@ module.exports = app;

 let rootDir = __dirname;
 let lbDir = path.resolve(`${rootDir}/..`);
-let appDir = path.resolve(`${__dirname}/../..`);
+let appDir = process.cwd();
 let localeDir = `${lbDir}/locale`;
 let modulesDir = `${appDir}/modules`;

@ -80,13 +80,13 @@ app.boot = function(bootOptions, callback) {
        `${__dirname}/model-config.json`
    ];
    let modelSources = [
-        `loopback/common/models`,
-        `loopback/server/models`,
+        `${lbDir}/common/models`,
+        `${lbDir}/server/models`,
        `${__dirname}/../common/models`
    ];
    let mixinDirs = [
-        `loopback/common/mixins`,
-        `loopback/server/mixins`,
+        `${lbDir}/common/mixins`,
+        `${lbDir}/server/mixins`,
        `${__dirname}/../common/mixins`
    ];
    let bootDirs = [
--- a/modules/invoiceIn/back/methods/invoice-in/clone.js
+++ b/modules/invoiceIn/back/methods/invoice-in/clone.js
@ -2,13 +2,17 @@ module.exports = Self => {
    Self.remoteMethodCtx('clone', {
        description: 'Clone the invoiceIn and as many invoiceInTax and invoiceInDueDay referencing it',
        accessType: 'WRITE',
-        accepts: {
+        accepts: [{
            arg: 'id',
            type: 'number',
            required: true,
            description: 'The invoiceIn id',
            http: {source: 'path'}
-        },
+        }, {
+            arg: 'isRectification',
+            type: 'boolean',
+            description: 'Clone quantities in negative and clone Intrastat'
+        }],
        returns: {
            type: 'object',
            root: true
@ -19,7 +23,7 @@ module.exports = Self => {
        }
    });

-    Self.clone = async(ctx, id, options) => {
+    Self.clone = async(ctx, id, isRectification, options) => {
        const models = Self.app.models;
        let tx;
        const myOptions = {};
@ -45,14 +49,28 @@ module.exports = Self => {
                    'isVatDeductible',
                    'withholdingSageFk',
                    'deductibleExpenseFk',
-                ]
+                ],
+                include: [
+                    {
+                        relation: 'invoiceInTax',
+                    },
+                    {
+                        relation: 'invoiceInDueDay',
+                    },
+                    {
+                        relation: 'invoiceInIntrastat'
+                    }
+                ],
            }, myOptions);
-            const sourceInvoiceInTax = await models.InvoiceInTax.find({where: {invoiceInFk: id}}, myOptions);
-            const sourceInvoiceInDueDay = await models.InvoiceInDueDay.find({where: {invoiceInFk: id}}, myOptions);
+            const invoiceInTax = sourceInvoiceIn.invoiceInTax();
+            const invoiceInDueDay = sourceInvoiceIn.invoiceInDueDay();
+            const invoiceInIntrastat = sourceInvoiceIn.invoiceInIntrastat();

            const issued = new Date(sourceInvoiceIn.issued);
            issued.setMonth(issued.getMonth() + 1);
-            const clonedRef = sourceInvoiceIn.supplierRef + '(2)';
+            const totalCorrections = await models.InvoiceInCorrection.count({correctedFk: id}, myOptions);
+
+            const clonedRef = sourceInvoiceIn.supplierRef + `(${totalCorrections + 2})`;

            const clone = await models.InvoiceIn.create({
                serial: sourceInvoiceIn.serial,
@ -68,18 +86,19 @@ module.exports = Self => {

            const promises = [];

-            for (let tax of sourceInvoiceInTax) {
+            for (let tax of invoiceInTax) {
                promises.push(models.InvoiceInTax.create({
                    invoiceInFk: clone.id,
-                    taxableBase: tax.taxableBase,
+                    taxableBase: isRectification ? -tax.taxableBase : tax.taxableBase,
                    expenseFk: tax.expenseFk,
-                    foreignValue: tax.foreignValue,
+                    foreignValue: isRectification ? -tax.foreignValue : tax.foreignValue,
                    taxTypeSageFk: tax.taxTypeSageFk,
                    transactionTypeSageFk: tax.transactionTypeSageFk
                }, myOptions));
            }

-            for (let dueDay of sourceInvoiceInDueDay) {
+            if (!isRectification) {
+                for (let dueDay of invoiceInDueDay) {
                    const dueDated = dueDay.dueDated;
                    dueDated.setMonth(dueDated.getMonth() + 1);

@ -91,7 +110,20 @@ module.exports = Self => {
                        foreignValue: dueDated.foreignValue,
                    }, myOptions));
                }
-
+            } else {
+                for (let intrastat of invoiceInIntrastat) {
+                    promises.push(models.InvoiceInIntrastat.create({
+                        invoiceInFk: clone.id,
+                        net: -intrastat.net,
+                        intrastatFk: intrastat.intrastatFk,
+                        amount: -intrastat.amount,
+                        stems: -intrastat.stems,
+                        country: intrastat.countryFk,
+                        dated: Date.vnNew(),
+                        statisticalValue: intrastat.statisticalValue
+                    }, myOptions));
+                }
+            }
            await Promise.all(promises);

            if (tx) await tx.commit();
--- a/modules/invoiceIn/back/methods/invoice-in/corrective.js
+++ b/modules/invoiceIn/back/methods/invoice-in/corrective.js
@ -0,0 +1,58 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('corrective', {
+        description: 'Creates a rectificated invoice in',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'number'
+        }, {
+            arg: 'invoiceReason',
+            type: 'number',
+        }, {
+            arg: 'invoiceType',
+            type: 'number',
+        }, {
+            arg: 'invoiceClass',
+            type: 'number'
+        }],
+        returns: {
+            type: 'number',
+            root: true
+        },
+        http: {
+            path: '/corrective',
+            verb: 'POST'
+        }
+    });
+
+    Self.corrective = async(ctx, id, invoiceReason, invoiceType, invoiceClass, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            const clone = await Self.clone(ctx, id, true, myOptions);
+            await models.InvoiceInCorrection.create({
+                correctingFk: clone.id,
+                correctedFk: id,
+                cplusRectificationTypeFk: invoiceType,
+                siiTypeInvoiceOutFk: invoiceClass,
+                invoiceCorrectionTypeFk: invoiceReason
+            }, myOptions);
+
+            if (tx) await tx.commit();
+            return clone.id;
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
--- a/modules/invoiceIn/back/methods/invoice-in/filter.js
+++ b/modules/invoiceIn/back/methods/invoice-in/filter.js
@ -1,4 +1,3 @@
-
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
 const buildFilter = require('vn-loopback/util/filter').buildFilter;
 const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
@ -80,6 +79,11 @@ module.exports = Self => {
                type: 'boolean',
                description: 'Whether the invoice is booked or not',
            },
+            {
+                arg: 'correctedFk',
+                type: 'number',
+                description: 'The corrected invoice',
+            }
        ],
        returns: {
            type: ['object'],
@ -93,6 +97,7 @@ module.exports = Self => {

    Self.filter = async(ctx, filter, options) => {
        const conn = Self.dataSource.connector;
+        const models = Self.app.models;
        const args = ctx.args;

        const myOptions = {};
@ -105,6 +110,14 @@ module.exports = Self => {
            dateTo.setHours(23, 59, 0, 0);
        }

+        let correctings;
+        if (args.correctedFk) {
+            correctings = await models.InvoiceInCorrection.find({
+                fields: ['correctingFk'],
+                where: {correctedFk: args.correctedFk}
+            });
+        }
+
        const where = buildFilter(ctx.args, (param, value) => {
            switch (param) {
            case 'search':
@ -128,6 +141,8 @@ module.exports = Self => {
                return {[`ii.${param}`]: value};
            case 'awbCode':
                return {'sub.code': value};
+            case 'correctedFk':
+                return {'ii.id': {inq: correctings.map(x => x.correctingFk)}};
            }
        });

--- a/modules/invoiceIn/back/methods/invoice-in/specs/clone.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/clone.spec.js
@ -2,50 +2,75 @@ const models = require('vn-loopback/server/server').models;
 const LoopBackContext = require('loopback-context');

 describe('invoiceIn clone()', () => {
-    beforeAll(async() => {
-        const activeCtx = {
-            accessToken: {userId: 9},
-            http: {
+    let ctx;
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx = {
            req: {
+                accessToken: {userId: 1},
                headers: {origin: 'http://localhost'}
-                }
-            }
+            },
+            args: {}
        };
+
        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
+            active: ctx.req
        });
+
+        options = {transaction: tx};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
    });

    it('should return the cloned invoiceIn and also clone invoiceInDueDays and invoiceInTaxes if there are any referencing the invoiceIn', async() => {
-        const userId = 1;
-        const ctx = {
-            req: {
-
-                accessToken: {userId: userId},
-                headers: {origin: 'http://localhost:5000'},
-            }
-        };
-
-        const tx = await models.InvoiceIn.beginTransaction({});
-        const options = {transaction: tx};
-
-        try {
-            const clone = await models.InvoiceIn.clone(ctx, 1, options);
+        const clone = await models.InvoiceIn.clone(ctx, 1, false, options);

        expect(clone.supplierRef).toEqual('1234(2)');
-
-            const invoiceInTaxes = await models.InvoiceInTax.find({where: {invoiceInFk: clone.id}}, options);
-
-            expect(invoiceInTaxes.length).toEqual(2);
-
-            const invoiceInDueDays = await models.InvoiceInDueDay.find({where: {invoiceInFk: clone.id}}, options);
-
-            expect(invoiceInDueDays.length).toEqual(2);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
+        const invoiceIn = await models.InvoiceIn.findOne({
+            include: [
+                {
+                    relation: 'invoiceInTax',
+                },
+                {
+                    relation: 'invoiceInDueDay',
                }
+            ], where: {
+                id: clone.id
+            }
+        }, options);
+        const invoiceInTax = invoiceIn.invoiceInTax();
+        const invoiceInDueDay = invoiceIn.invoiceInDueDay();
+
+        expect(invoiceInTax.length).toEqual(2);
+        expect(invoiceInDueDay.length).toEqual(2);
+    });
+
+    it('should return the cloned invoiceIn and also clone invoiceInIntrastat and invoiceInTaxes if it is rectificative', async() => {
+        const clone = await models.InvoiceIn.clone(ctx, 1, true, options);
+
+        expect(clone.supplierRef).toEqual('1234(2)');
+        const invoiceIn = await models.InvoiceIn.findOne({
+            include: [
+                {
+                    relation: 'invoiceInTax',
+                },
+                {
+                    relation: 'invoiceInIntrastat',
+                }
+            ], where: {
+                id: clone.id
+            }
+        }, options);
+        const invoiceInTax = invoiceIn.invoiceInTax();
+        const invoiceInIntrastat = invoiceIn.invoiceInIntrastat();
+
+        expect(invoiceInTax.length).toEqual(2);
+        expect(invoiceInIntrastat.length).toEqual(2);
    });
 });
--- a/modules/invoiceIn/back/methods/invoice-in/specs/corrective.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/corrective.spec.js
@ -0,0 +1,49 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('invoiceIn corrective()', () => {
+    let ctx;
+    let options;
+    let tx;
+
+    beforeEach(async() => {
+        ctx = {
+            req: {
+                accessToken: {userId: 9},
+                headers: {origin: 'http://localhost'}
+            },
+            args: {}
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: ctx.req
+        });
+
+        options = {transaction: tx};
+        tx = await models.Sale.beginTransaction({});
+        options.transaction = tx;
+    });
+
+    afterEach(async() => {
+        await tx.rollback();
+    });
+
+    it('La función corrective debería devolver un id cuando se ejecuta correctamente', async() => {
+        const originalId = 1;
+        const invoiceReason = 3;
+        const invoiceType = 2;
+        const invoiceClass = 1;
+        const cloneId = await models.InvoiceIn.corrective(ctx,
+            originalId, invoiceReason, invoiceType, invoiceClass, options);
+
+        expect(cloneId).toBeDefined();
+
+        const correction = await models.InvoiceInCorrection.findOne({
+            where: {correctedFk: originalId, correctingFk: cloneId}
+        }, options);
+
+        expect(correction.cplusRectificationTypeFk).toEqual(invoiceType);
+        expect(correction.siiTypeInvoiceOutFk).toEqual(invoiceClass);
+        expect(correction.invoiceCorrectionTypeFk).toEqual(invoiceReason);
+    });
+});
--- a/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
+++ b/modules/invoiceIn/back/methods/invoice-in/specs/filter.spec.js
@ -8,14 +8,14 @@ describe('InvoiceIn filter()', () => {
        try {
            const ctx = {
                args: {
-                    search: 'Plants SL',
+                    search: 'PLANTS SL',
                }
            };

            const result = await models.InvoiceIn.filter(ctx, {}, options);

            expect(result.length).toEqual(5);
-            expect(result[0].supplierName).toEqual('Plants SL');
+            expect(result[0].supplierName).toEqual('PLANTS SL');

            await tx.rollback();
        } catch (e) {
--- a/modules/invoiceIn/back/model-config.json
+++ b/modules/invoiceIn/back/model-config.json
@ -5,6 +5,9 @@
    "InvoiceInConfig": {
        "dataSource": "vn"
    },
+    "InvoiceInCorrection": {
+        "dataSource": "vn"
+    },
    "InvoiceInDueDay": {
        "dataSource": "vn"
    },
--- a/modules/invoiceIn/back/models/invoice-in-correction.json
+++ b/modules/invoiceIn/back/models/invoice-in-correction.json
@ -0,0 +1,38 @@
+{
+    "name": "InvoiceInCorrection",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "invoiceInCorrection"
+        }
+    },
+    "properties": {
+        "correctingFk": {
+            "id": true,
+            "type": "number"
+        }
+    },
+    "relations": {
+        "invoiceIn": {
+            "type": "belongsTo",
+            "model": "InvoiceIn",
+            "foreignKey": "correctedFk"
+        },
+        "cplusRectificationType": {
+            "type": "belongsTo",
+            "model": "CplusRectificationType",
+            "foreignKey": "cplusRectificationTypeFk"
+        },
+        "invoiceCorrectionType": {
+            "type": "belongsTo",
+            "model": "InvoiceCorrectionType",
+            "foreignKey": "invoiceCorrectionTypeFk"
+        },
+        "siiTypeInvoiceOut": {
+            "type": "belongsTo",
+            "model": "SiiTypeInvoiceOut",
+            "foreignKey": "siiTypeInvoiceOutFk"
+        }
+
+    }
+}
--- a/modules/invoiceIn/back/models/invoice-in.js
+++ b/modules/invoiceIn/back/models/invoice-in.js
@ -9,6 +9,8 @@ module.exports = Self => {
    require('../methods/invoice-in/invoiceInPdf')(Self);
    require('../methods/invoice-in/invoiceInEmail')(Self);
    require('../methods/invoice-in/getSerial')(Self);
+    require('../methods/invoice-in/corrective')(Self);
+
    Self.rewriteDbError(function(err) {
        if (err.code === 'ER_ROW_IS_REFERENCED_2' && err.sqlMessage.includes('vehicleInvoiceIn'))
            return new UserError(`This invoice has a linked vehicle.`);
--- a/modules/invoiceIn/back/models/invoice-in.json
+++ b/modules/invoiceIn/back/models/invoice-in.json
@ -103,6 +103,11 @@
            "type": "belongsTo",
            "model": "Dms",
            "foreignKey": "dmsFk"
+        },
+        "invoiceInCorrection": {
+            "type": "hasOne",
+            "model": "InvoiceInCorrection",
+            "foreignKey": "correctedFk"
        }
    }
 }
--- a/modules/invoiceOut/back/models/sii-type-invoice-out.json
+++ b/modules/invoiceOut/back/models/sii-type-invoice-out.json
@ -17,6 +17,9 @@
        },
        "description": {
            "type": "string"
+        },
+        "code": {
+            "type": "string"
        }
    }
 }
--- a/modules/supplier/back/methods/supplier/specs/getSummary.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/getSummary.spec.js
@ -5,7 +5,7 @@ describe('Supplier getSummary()', () => {
        const supplier = await app.models.Supplier.getSummary(1);

        expect(supplier.id).toEqual(1);
-        expect(supplier.name).toEqual('Plants SL');
+        expect(supplier.name).toEqual('PLANTS SL');
        expect(supplier.nif).toEqual('06089160W');
        expect(supplier.account).toEqual('4100000001');
        expect(supplier.payDay).toEqual(15);
--- a/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/newSupplier.spec.js
@ -25,13 +25,13 @@ describe('Supplier newSupplier()', () => {
        try {
            const options = {transaction: tx};
            ctx.args = {
-                name: 'newSupplier',
+                name: 'NEWSUPPLIER',
                nif: '12345678Z'
            };

            const result = await models.Supplier.newSupplier(ctx, options);

-            expect(result.name).toEqual('newSupplier');
+            expect(result.name).toEqual('NEWSUPPLIER');
            await tx.rollback();
        } catch (e) {
            await tx.rollback();
--- a/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/updateFiscalData.spec.js
@ -6,7 +6,7 @@ describe('Supplier updateFiscalData', () => {
    const administrativeId = 5;
    const employeeId = 1;
    const defaultData = {
-        name: 'Plants SL',
+        name: 'PLANTS SL',
        nif: '06089160W',
        account: '4100000001',
        sageTaxTypeFk: 4,
@ -56,7 +56,7 @@ describe('Supplier updateFiscalData', () => {
        });

        ctx.args = {
-            name: 'Weapon Dealer',
+            name: 'WEAPON DEALER',
            nif: 'A68446004',
            account: '4000000005',
            sageTaxTypeFk: 5,
@ -72,7 +72,7 @@ describe('Supplier updateFiscalData', () => {

        const result = await app.models.Supplier.updateFiscalData(ctx, supplierId);

-        expect(result.name).toEqual('Weapon Dealer');
+        expect(result.name).toEqual('WEAPON DEALER');
        expect(result.nif).toEqual('A68446004');
        expect(result.account).toEqual('4000000005');
        expect(result.sageTaxTypeFk).toEqual(5);
--- a/modules/supplier/back/models/specs/supplier.spec.js
+++ b/modules/supplier/back/models/specs/supplier.spec.js
@ -129,7 +129,7 @@ describe('loopback model Supplier', () => {
            const options = {transaction: tx};

            try {
-                const newSupplier = await models.Supplier.create({name: 'Alfred Pennyworth'}, options);
+                const newSupplier = await models.Supplier.create({name: 'ALFRED PENNYWORTH'}, options);
                const fetchedSupplier = await models.Supplier.findById(newSupplier.id, null, options);

                expect(Number(fetchedSupplier.account)).toEqual(4100000000 + newSupplier.id);
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@ -46,6 +46,12 @@ module.exports = Self => {
    Self.validateAsync('postCode', hasValidPostcode, {
        message: `The postcode doesn't exist. Please enter a correct one`
    });
+    Self.validatesFormatOf('name', {
+        message: 'Name should be uppercase',
+        allowNull: false,
+        allowBlank: false,
+        with: /^[^a-z]*$/
+    });

    async function hasValidPostcode(err, done) {
        if (!this.postcode)
--- a/modules/supplier/front/create/index.html
+++ b/modules/supplier/front/create/index.html
@ -12,7 +12,8 @@
            <vn-textfield
                label="Supplier name"
                ng-model="$ctrl.supplier.name"
-                vn-focus>
+                vn-focus
+                ng-keyup="$ctrl.supplier.name = $ctrl.supplier.name.toUpperCase()">
            </vn-textfield>
        </vn-horizontal>
    </vn-card>
--- a/modules/ticket/back/methods/sale/clone.js
+++ b/modules/ticket/back/methods/sale/clone.js
@ -1,4 +1,32 @@
 module.exports = Self => {
+    Self.remoteMethodCtx('clone', {
+        description: 'Clone sales and services provided',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'salesIds',
+                type: ['number'],
+            }, {
+                arg: 'servicesIds',
+                type: ['number']
+            }, {
+                arg: 'withWarehouse',
+                type: 'boolean',
+                required: true
+            }, {
+                arg: 'negative',
+                type: 'boolean'
+            }
+        ],
+        returns: {
+            type: ['object'],
+            root: true
+        },
+        http: {
+            path: `/clone`,
+            verb: 'POST'
+        }
+    });
    Self.clone = async(ctx, salesIds, servicesIds, withWarehouse, negative, options) => {
        const models = Self.app.models;
        const myOptions = {};
--- a/modules/ticket/back/methods/sale/refund.js
+++ b/modules/ticket/back/methods/sale/refund.js
@ -1,61 +0,0 @@
-module.exports = Self => {
-    Self.remoteMethodCtx('refund', {
-        description: 'Create refund tickets with sales and services if provided',
-        accessType: 'WRITE',
-        accepts: [
-            {
-                arg: 'salesIds',
-                type: ['number'],
-            },
-            {
-                arg: 'servicesIds',
-                type: ['number']
-            },
-            {
-                arg: 'withWarehouse',
-                type: 'boolean',
-                required: true
-            }
-        ],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/refund`,
-            verb: 'post'
-        }
-    });
-
-    Self.refund = async(ctx, salesIds, servicesIds, withWarehouse, options) => {
-        const models = Self.app.models;
-        const myOptions = {userId: ctx.req.accessToken.userId};
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
-
-        try {
-            const refundsTicket = await models.Sale.clone(
-                ctx,
-                salesIds,
-                servicesIds,
-                withWarehouse,
-                true,
-                myOptions
-            );
-
-            if (tx) await tx.commit();
-
-            return refundsTicket;
-        } catch (e) {
-            if (tx) await tx.rollback();
-            throw e;
-        }
-    };
-};
--- a/modules/ticket/back/methods/sale/specs/clone.spec.js
+++ b/modules/ticket/back/methods/sale/specs/clone.spec.js
@ -67,4 +67,34 @@ describe('Ticket cloning - clone function', () => {
            expect(services.length).toBeGreaterThan(0);
        }
    });
+
+    it('should create a ticket  without sales', async() => {
+        const servicesIds = [4];
+
+        const tickets = await models.Sale.clone(ctx, null, servicesIds, false, false, options);
+        const refundedTicket = await getTicketRefund(tickets[0].id, options);
+
+        expect(refundedTicket).toBeDefined();
    });
+});
+
+async function getTicketRefund(id, options) {
+    return models.Ticket.findOne({
+        where: {
+            id
+        },
+        include: [
+            {
+                relation: 'ticketSales',
+                scope: {
+                    include: {
+                        relation: 'components'
+                    }
+                }
+            },
+            {
+                relation: 'ticketServices',
+            }
+        ]
+    }, options);
+}
--- a/modules/ticket/back/methods/sale/specs/refund.spec.js
+++ b/modules/ticket/back/methods/sale/specs/refund.spec.js
@ -1,101 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-const LoopBackContext = require('loopback-context');
-
-describe('Sale refund()', () => {
-    const userId = 5;
-    const ctx = {req: {accessToken: userId}, args: {}};
-    const activeCtx = {
-        accessToken: {userId},
-    };
-    const servicesIds = [3];
-    const withWarehouse = true;
-
-    beforeEach(() => {
-        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
-            active: activeCtx
-        });
-    });
-
-    it('should create ticket with the selected lines', async() => {
-        const tx = await models.Sale.beginTransaction({});
-        const salesIds = [7, 8];
-
-        try {
-            const options = {transaction: tx};
-
-            const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
-
-            expect(refundedTickets).toBeDefined();
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-
-    it('should create one ticket for each unique ticketFk in the sales', async() => {
-        const tx = await models.Sale.beginTransaction({});
-        const salesIds = [6, 7];
-
-        try {
-            const options = {transaction: tx};
-            const ticketsBefore = await models.Ticket.find({}, options);
-
-            const tickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, options);
-
-            const refundedTicket = await getTicketRefund(tickets[0].id, options);
-            const ticketsAfter = await models.Ticket.find({}, options);
-            const salesLength = refundedTicket.ticketSales().length;
-            const componentsLength = refundedTicket.ticketSales()[0].components().length;
-
-            expect(refundedTicket).toBeDefined();
-            expect(salesLength).toEqual(1);
-            expect(ticketsBefore.length).toEqual(ticketsAfter.length - 2);
-            expect(componentsLength).toEqual(4);
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-
-    it('should create a ticket  without sales', async() => {
-        const servicesIds = [4];
-        const tx = await models.Sale.beginTransaction({});
-        const options = {transaction: tx};
-        try {
-            const tickets = await models.Sale.refund(ctx, null, servicesIds, withWarehouse, options);
-            const refundedTicket = await getTicketRefund(tickets[0].id, options);
-
-            expect(refundedTicket).toBeDefined();
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-});
-
-async function getTicketRefund(id, options) {
-    return models.Ticket.findOne({
-        where: {
-            id
-        },
-        include: [
-            {
-                relation: 'ticketSales',
-                scope: {
-                    include: {
-                        relation: 'components'
-                    }
-                }
-            },
-            {
-                relation: 'ticketServices',
-            }
-        ]
-    }, options);
-}
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@ -108,6 +108,23 @@ module.exports = function(Self) {

            await Self.rawSql('CALL invoiceOutBooking(?)', [resultInvoice.id], myOptions);

+            const client = await models.Client.findById(clientId,
+                {fields: ['hasElectronicInvoice', 'name', 'email']}, myOptions);
+            if (client.hasElectronicInvoice) {
+                const url = await models.Url.getUrl();
+                await models.NotificationQueue.create({
+                    notificationFk: 'invoice-electronic',
+                    authorFk: client.id,
+                    params: JSON.stringify(
+                        {
+                            'name': client.name,
+                            'email': client.email,
+                            'ticketId': ticketsIds.join(','),
+                            'url': url + 'ticket/index?q=' + encodeURIComponent(JSON.stringify({clientFk: clientId}))
+                        })
+                }, myOptions);
+            }
+
            if (tx) await tx.commit();

            return resultInvoice.id;
--- a/modules/ticket/back/methods/ticket/refund.js
+++ b/modules/ticket/back/methods/ticket/refund.js
@ -20,7 +20,7 @@ module.exports = Self => {
        },
        http: {
            path: `/refund`,
-            verb: 'post'
+            verb: 'POST'
        }
    });

@ -45,7 +45,7 @@ module.exports = Self => {
            const services = await models.TicketService.find(filter, myOptions);
            const servicesIds = services.map(service => service.id);

-            const refundedTickets = await models.Sale.refund(ctx, salesIds, servicesIds, withWarehouse, myOptions);
+            const refundedTickets = await models.Sale.clone(ctx, salesIds, servicesIds, withWarehouse, true, myOptions);

            if (tx) await tx.commit();

--- a/modules/ticket/back/models/sale.js
+++ b/modules/ticket/back/models/sale.js
@ -9,7 +9,6 @@ module.exports = Self => {
    require('../methods/sale/updateQuantity')(Self);
    require('../methods/sale/updateConcept')(Self);
    require('../methods/sale/recalculatePrice')(Self);
-    require('../methods/sale/refund')(Self);
    require('../methods/sale/canEdit')(Self);
    require('../methods/sale/usesMana')(Self);
    require('../methods/sale/clone')(Self);
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@ -248,23 +248,6 @@ class Controller extends Section {
        if (this.ticket.address.incotermsFk && !this.ticket.weight && !force)
            return this.$.withoutWeightConfirmation.show();

-        const client = this.ticket.client;
-        if (client.hasElectronicInvoice) {
-            this.$http.post(`NotificationQueues`, {
-                notificationFk: 'invoice-electronic',
-                authorFk: client.id,
-                params: JSON.stringify(
-                    {
-                        'name': client.name,
-                        'email': client.email,
-                        'ticketId': this.id,
-                        'url': window.location.href
-                    })
-            }).then(() => {
-                this.vnApp.showSuccess(this.$t('Invoice sent'));
-            });
-        }
-
        return this.$http.post(`Tickets/invoiceTicketsAndPdf`, {ticketsIds: [this.id]})
            .then(() => this.reload())
            .then(() => this.vnApp.showSuccess(this.$t('Ticket invoiced')));
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@ -523,8 +523,8 @@ class Controller extends Section {
        if (!sales) return;

        const salesIds = sales.map(sale => sale.id);
-        const params = {salesIds: salesIds, withWarehouse: withWarehouse};
-        const query = 'Sales/refund';
+        const params = {salesIds: salesIds, withWarehouse: withWarehouse, negative: true};
+        const query = 'Sales/clone';
        this.$http.post(query, params).then(res => {
            const [refundTicket] = res.data;
            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
--- a/modules/ticket/front/sale/index.spec.js
+++ b/modules/ticket/front/sale/index.spec.js
@ -727,9 +727,10 @@ describe('Ticket', () => {
                jest.spyOn(controller.$state, 'go');
                const params = {
                    salesIds: [1, 4],
+                    negative: true
                };
                const refundTicket = {id: 99};
-                $httpBackend.expect('POST', 'Sales/refund', params).respond(200, [refundTicket]);
+                $httpBackend.expect('POST', 'Sales/clone', params).respond(200, [refundTicket]);
                controller.createRefund();
                $httpBackend.flush();

--- a/modules/ticket/front/services/index.js
+++ b/modules/ticket/front/services/index.js
@ -55,10 +55,10 @@ class Controller extends Section {
    createRefund() {
        if (!this.checkeds.length) return;

-        const params = {servicesIds: this.checkeds, withWarehouse: false};
-        const query = 'Sales/refund';
+        const params = {servicesIds: this.checkeds, withWarehouse: false, negative: true};
+        const query = 'Sales/clone';
        this.$http.post(query, params).then(res => {
-            const refundTicket = res.data;
+            const [refundTicket] = res.data;
            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
                ticketId: refundTicket.id
            }));
--- a/modules/worker/back/methods/worker/mySubordinates.js
+++ b/modules/worker/back/methods/worker/mySubordinates.js
@ -30,13 +30,12 @@ module.exports = Self => {
        if (typeof options == 'object')
            Object.assign(myOptions, options);

-        stmts.push(new ParameterizedSQL('CALL vn.subordinateGetList(?)', [userId]));
-        const queryIndex = stmts.push('SELECT * FROM tmp.subordinate') - 1;
-        stmts.push('DROP TEMPORARY TABLE tmp.subordinate');
+        stmts.push(new ParameterizedSQL('CALL vn.worker_getHierarchy(?)', [userId]));
+        const queryIndex = stmts.push('SELECT * FROM tmp.workerHierarchyList') - 1;
+        stmts.push('DROP TEMPORARY TABLE tmp.workerHierarchyList');

        const sql = ParameterizedSQL.join(stmts, ';');
        const result = await conn.executeStmt(sql, myOptions);
-
        return result[queryIndex];
    };
 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -11,10 +11,13 @@
    "engines": {
        "node": ">=20"
    },
+    "packageManager": "pnpm@8.15.1",
    "dependencies": {
        "axios": "^1.2.2",
        "base64url": "^3.0.1",
+        "body-parser": "^1.19.2",
        "compression": "^1.7.3",
+        "ejs": "2.3.1",
        "form-data": "^4.0.0",
        "fs-extra": "^5.0.0",
        "ftps": "^1.2.0",
@ -30,18 +33,22 @@
        "loopback-boot": "3.3.1",
        "loopback-component-explorer": "^6.5.0",
        "loopback-component-storage": "3.6.1",
-        "loopback-connector-mysql": "^6.2.0",
+        "loopback-connector": "4.11.1",
+        "loopback-connector-mysql": "6.2.0",
        "loopback-connector-remote": "^3.4.1",
        "loopback-context": "^3.5.2",
+        "loopback-datasource-juggler": "3.36.1",
        "md5": "^2.2.1",
+        "mysql": "2.18.1",
        "node-ssh": "^11.0.0",
        "object.pick": "^1.3.0",
        "puppeteer": "^21.10.0",
        "require-yaml": "0.0.1",
        "smbhash": "0.0.1",
        "strong-error-handler": "^2.3.2",
-        "vn-loopback": "file:./loopback",
-        "vn-print": "file:./print"
+        "vn-loopback": "link:./loopback",
+        "vn-print": "link:./print",
+        "xmldom": "^0.6.0"
    },
    "devDependencies": {
        "@babel/core": "^7.7.7",
@ -74,11 +81,12 @@
        "html-loader-jest": "^0.2.1",
        "html-webpack-plugin": "^5.5.1",
        "identity-obj-proxy": "^3.0.0",
-        "jasmine": "^5.0.0",
+        "jasmine": "^5.0.2",
        "jasmine-reporters": "^2.4.0",
        "jasmine-spec-reporter": "^7.0.0",
        "jest": "^26.0.1",
        "jest-junit": "^8.0.0",
+        "js-yaml": "^4.1.0",
        "json-loader": "^0.5.7",
        "merge-stream": "^1.0.1",
        "minimist": "^1.2.5",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/print/package-lock.json
+++ b/print/package-lock.json
--- a/print/package.json
+++ b/print/package.json
@ -11,7 +11,9 @@
    "url": "https://git.verdnatura.es/salix"
  },
  "license": "GPL-3.0",
+  "packageManager": "pnpm@8.15.1",
  "dependencies": {
+    "express": "4.14.0",
    "fs-extra": "^7.0.1",
    "intl": "^1.2.5",
    "js-yaml": "^3.13.1",
--- a/print/pnpm-lock.yaml
+++ b/print/pnpm-lock.yaml
--- a/print/templates/email/invoice-electronic/invoice-electronic.js
+++ b/print/templates/email/invoice-electronic/invoice-electronic.js
@ -10,7 +10,7 @@ module.exports = {
            required: true
        },
        ticketId: {
-            type: [Number],
+            type: [String],
            required: true
        },
        url: {
--- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql
+++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
@ -15,7 +15,7 @@ SELECT pack.packages,
        LEFT JOIN vn.province p ON p.id = c.provinceFk
        JOIN vn.ticket t ON t.refFk = io.ref
        JOIN vn.address a ON a.id = t.addressFk
-        LEFT JOIN vn.incoterms ic ON ic.code = a.incotermsFk
+        JOIN vn.incoterms ic ON ic.code = a.incotermsFk
        LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk
        JOIN vn.sale s ON s.ticketFk = t.id
        JOIN (
--- a/print/templates/reports/invoice/sql/hasIncoterms.sql
+++ b/print/templates/reports/invoice/sql/hasIncoterms.sql
@ -1,8 +1,5 @@
-SELECT IF(incotermsFk IS NULL, FALSE, TRUE) AS hasIncoterms
-    FROM ticket t
-        JOIN invoiceOut io ON io.ref = t.refFk
-        JOIN client c ON c.id = t.clientFk  
-        JOIN address a ON a.id = t.addressFk  
-    WHERE t.refFk = ?
-        AND IF(c.hasToinvoiceByAddress = FALSE, c.defaultAddressFk, TRUE)  
-    LIMIT 1
+SELECT COUNT(*) AS hasIncoterms
+    FROM invoiceOut io
+       JOIN vn.invoiceOutSerial ios ON ios.code = io.serial
+            AND ios.taxAreaFk = 'WORLD'
+    WHERE io.ref = ?
				`@ -0,0 +1 @@`
				`REVOKE EXECUTE ON FUNCTION vn2008.red FROM hrBoss, salesPerson;`
				`@ -0,0 +1 @@`
				`REVOKE SELECT ON TABLE vn2008.reference_min FROM logistic;`
				`@ -0,0 +1 @@`
				`REVOKE SELECT ON TABLE vn2008.Articles_botanical FROM buyer, administrative;`