Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate

2023-11-16 09:58:51 +01:00 · 2023-11-16 09:58:51 +01:00 · b8d256e4e4
parent bc6389fd66 f677382f96
commit b8d256e4e4
36 changed files with 239 additions and 163 deletions
--- a/README.md
+++ b/README.md
@ -8,7 +8,7 @@ Salix is also the scientific name of a beautifull tree! :)

 Required applications.

-* Node.js >= 16.x LTS
+* Node.js
 * Docker
 * Git

@ -17,20 +17,7 @@ You will need to install globally the following items.
 $ sudo npm install -g jest gulp-cli
 ```

-For the usage of jest --watch on macOs.
-```
-$ brew install watchman
-```
-* [watchman](https://facebook.github.io/watchman/)
-
-## Linux Only Prerequisites
-
-Your user must be on the docker group to use it so you will need to run this command:
-```
-$ sudo usermod -a -G docker yourusername
-```
-
-## Getting Started // Installing
+## Installing dependencies and launching

 Pull from repository.

@ -76,29 +63,6 @@ In Visual Studio Code we use the ESLint extension.
 ext install dbaeumer.vscode-eslint
 ```

-Gitlens for visualization of code authorship
-```
-ext install eamodio.gitlens
-```
-
-Spanish language pack
-```
-ext install ms-ceintl.vscode-language-pack-es
-```
-
-### Recommended extensions
-
-Material icon Theme
-```
-ext install pkief.material-icon-theme
-```
-
-Material UI Themes
-```
-ext install equinusocio.vsc-material-theme
-```
-
-
 ## Built With

 * [angularjs](https://angularjs.org/)
--- a/back/methods/vn-user/sign-in.js
+++ b/back/methods/vn-user/sign-in.js
@ -49,8 +49,13 @@ module.exports = Self => {
            if (vnUser.twoFactor)
                throw new ForbiddenError(null, 'REQUIRES_2FA');
        }
-
-        return Self.validateLogin(user, password);
+        const validateLogin = await Self.validateLogin(user, password);
+        await Self.app.models.SignInLog.create({
+            id: validateLogin.token,
+            userFk: vnUser.id,
+            ip: ctx.req.ip
+        });
+        return validateLogin;
    };

    Self.passExpired = async vnUser => {
--- a/back/models/vn-user.js
+++ b/back/models/vn-user.js
@ -2,6 +2,7 @@ const vnModel = require('vn-loopback/common/models/vn-model');
 const {Email} = require('vn-print');
 const ForbiddenError = require('vn-loopback/util/forbiddenError');
 const LoopBackContext = require('loopback-context');
+const UserError = require('vn-loopback/util/user-error');

 module.exports = function(Self) {
    vnModel(Self);
@ -92,7 +93,11 @@ module.exports = function(Self) {
    };

    Self.on('resetPasswordRequest', async function(info) {
-        const url = await Self.app.models.Url.getUrl();
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http.req;
+        const headers = httpRequest.headers;
+        const origin = headers.origin;

        const defaultHash = '/reset-password?access_token=$token$';
        const recoverHashes = {
@ -108,7 +113,7 @@ module.exports = function(Self) {
        const params = {
            recipient: info.email,
            lang: user.lang,
-            url: url.slice(0, -1) + recoverHash
+            url: origin + '/#!' + recoverHash
        };

        const options = Object.assign({}, info.options);
@ -121,10 +126,16 @@ module.exports = function(Self) {
    });

    Self.validateLogin = async function(user, password) {
-        let loginInfo = Object.assign({password}, Self.userUses(user));
-        token = await Self.login(loginInfo, 'user');
+        const loginInfo = Object.assign({password}, Self.userUses(user));
+        const token = await Self.login(loginInfo, 'user');

        const userToken = await token.user.get();
+
+        if (userToken.username.toLowerCase() !== user.toLowerCase()) {
+            console.error('ERROR!!! - Signin with other user', userToken, user);
+            throw new UserError('Try again');
+        }
+
        try {
            await Self.app.models.Account.sync(userToken.name, password);
        } catch (err) {
@ -220,8 +231,11 @@ module.exports = function(Self) {

        class Mailer {
            async send(verifyOptions, cb) {
+                const url = new URL(verifyOptions.verifyHref);
+                if (process.env.NODE_ENV) url.port = '';
+
                const params = {
-                    url: verifyOptions.verifyHref,
+                    url: url.href,
                    recipient: verifyOptions.to
                };

--- a/db/.archive/225201/00-invoiceOut_new.sql
+++ b/db/.archive/225201/00-invoiceOut_new.sql
@ -74,7 +74,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 		SELECT
 				1,
--- a/db/.archive/231001/02-invoiceOut_new.sql
+++ b/db/.archive/231001/02-invoiceOut_new.sql
@ -96,7 +96,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,
--- a/db/.archive/232001/00-invoiceOut_new.sql
+++ b/db/.archive/232001/00-invoiceOut_new.sql
@ -96,7 +96,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,
--- a/db/changes/234601/00-transferInvoice.sql
+++ b/db/changes/234601/00-transferInvoice.sql
@ -1,6 +1,6 @@
 INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
    VALUES
        ('CplusRectificationType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
-        ('CplusInvoiceType477', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
+        ('SiiTypeInvoiceOut', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
        ('InvoiceCorrectionType', '*', 'READ', 'ALLOW', 'ROLE', 'administrative'),
        ('InvoiceOut', 'transferInvoice', 'WRITE', 'ALLOW', 'ROLE', 'administrative');
--- a/db/changes/234602/00-roleSync.sql
+++ b/db/changes/234602/00-roleSync.sql
@ -0,0 +1 @@
+CALL `account`.`role_sync`();
--- a/db/changes/234603/00-createSignInLogTable.sql
+++ b/db/changes/234603/00-createSignInLogTable.sql
@ -0,0 +1,19 @@
+
+
+--
+-- Table structure for table `signInLog`
+--
+
+DROP TABLE IF EXISTS `account`.`signInLog`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `account`.`signInLog` (
+  `id` varchar(10) NOT NULL ,
+  `userFk` int(10) unsigned DEFAULT NULL,
+  `creationDate` timestamp NULL DEFAULT current_timestamp(),
+  `ip` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `userFk` (`userFk`),
+  CONSTRAINT `signInLog_ibfk_1` FOREIGN KEY (`userFk`) REFERENCES `user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
--- a/db/dump/dumpedFixtures.sql
+++ b/db/dump/dumpedFixtures.sql
@ -275,13 +275,13 @@ INSERT INTO `cplusInvoiceType472` VALUES (1,'F1 - Factura'),(2,'F2 - Factura sim
 UNLOCK TABLES;

 --
-- Dumping data for table `cplusInvoiceType477`
+-- Dumping data for table `siiTypeInvoiceOut`
 --

-LOCK TABLES `cplusInvoiceType477` WRITE;
-/*!40000 ALTER TABLE `cplusInvoiceType477` DISABLE KEYS */;
-INSERT INTO `cplusInvoiceType477` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas  simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'R1 - Factura rectificativa (Art. 80.1, 80.2  y error fundado en derecho)'),(6,'R2 - Factura rectificativa (Art. 80.3)'),(7,'R3 - Factura rectificativa (Art. 80.4)'),(8,'R4 - Factura rectificativa (Resto)'),(9,'R5 - Factura rectificativa en facturas simplificadas');
-/*!40000 ALTER TABLE `cplusInvoiceType477` ENABLE KEYS */;
+LOCK TABLES `siiTypeInvoiceOut` WRITE;
+/*!40000 ALTER TABLE `siiTypeInvoiceOut` DISABLE KEYS */;
+INSERT INTO `siiTypeInvoiceOut` VALUES (1,'F1 - Factura'),(2,'F2 - Factura simplificada (ticket)'),(3,'F3 - Factura emitida en sustitución de facturas  simplificadas facturadas y declaradas'),(4,'F4 - Asiento resumen de facturas'),(5,'R1 - Factura rectificativa (Art. 80.1, 80.2  y error fundado en derecho)'),(6,'R2 - Factura rectificativa (Art. 80.3)'),(7,'R3 - Factura rectificativa (Art. 80.4)'),(8,'R4 - Factura rectificativa (Resto)'),(9,'R5 - Factura rectificativa en facturas simplificadas');
+/*!40000 ALTER TABLE `siiTypeInvoiceOut` ENABLE KEYS */;
 UNLOCK TABLES;

 --
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -367,7 +367,7 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
        (1105,     'Max Eisenhardt',     '251628698',  'MAGNETO',        'Rogue',            'UNKNOWN WHEREABOUTS',                          'Gotham', 46460, 1111111111, 222222222, 1, 'MaxEisenhardt@mydomain.com',         NULL, 0, 1234567890, 0, 3, 1, 300,  8,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 18,   0, 1, 'florist','normal'),
        (1106,     'DavidCharlesHaller', '53136686Q',  'LEGION',         'Charles Xavier',   'CITY OF NEW YORK, NEW YORK, USA',              'Gotham', 46460, 1111111111, 222222222, 1, 'DavidCharlesHaller@mydomain.com',    NULL, 0, 1234567890, 0, 1, 1, 300,  1,  0, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
        (1107,     'Hank Pym',           '09854837G',  'ANT MAN',        'Hawk',             'ANTHILL, SAN FRANCISCO, CALIFORNIA',           'Gotham', 46460, 1111111111, 222222222, 1, 'HankPym@mydomain.com',               NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
-        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
+        (1108,     'Charles Xavier',     '22641921P',  'PROFESSOR X',    'Beast',            '3800 VICTORY PKWY, CINCINNATI, OH 45207, USA', 'Gotham', 46460, 1111111111, 222222222, 1, 'CharlesXavier@mydomain.com',         NULL, 0, 1234567890, 0, 5, 1, 300,  13, 1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 1, 1, NULL, 0, 0, 19,   0, 1, 'florist','normal'),
        (1109,     'Bruce Banner',       '16104829E',  'HULK',           'Black widow',      'SOMEWHERE IN NEW YORK',                        'Gotham', 46460, 1111111111, 222222222, 1, 'BruceBanner@mydomain.com',           NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, 9,    0, 1, 'florist','normal'),
        (1110,     'Jessica Jones',      '58282869H',  'JESSICA JONES',  'Luke Cage',        'NYCC 2015 POSTER',                             'Gotham', 46460, 1111111111, 222222222, 1, 'JessicaJones@mydomain.com',          NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 1, 1, 0, 0, NULL, 0, 0, NULL, 0, 1, 'florist','normal'),
        (1111,     'Missing',            NULL,         'MISSING MAN',    'Anton',            'THE SPACE, UNIVERSE FAR AWAY',                 'Gotham', 46460, 1111111111, 222222222, 1, NULL,                                 NULL, 0, 1234567890, 0, 1, 1, 300,  1,  1, NULL, 10, 5,    util.VN_CURDATE(), 1, 5, 1, 1, 1, '0000-00-00', 4, 0, 1, 0, NULL, 1, 0, NULL, 0, 1, 'others','normal'),
@ -405,7 +405,7 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
        (5,     'Max Eisenhardt',               'Unknown Whereabouts',                          'Gotham', 46460,        1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 1),
        (6,     'DavidCharlesHaller',           'Evil hideout',                                 'Gotham', 46460,        1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 1),
        (7,     'Hank Pym',                     'Anthill',                                      'Gotham', 46460,        1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 1),
-        (8,     'Charles Xavier',               '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460,        1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 1),
+        (8,     'Charles Xavier',               '3800 Victory Pkwy, Cincinnati, OH 45207, USA', 'Gotham', 46460,        5, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 1),
        (9,     'Bruce Banner',                 'Somewhere in New York',                        'Gotham', 46460,        1, 1111111111, 222222222, 1, 1109,    2, NULL, NULL, 0, 1),
        (10,    'Jessica Jones',                'NYCC 2015 Poster',                             'Gotham', 46460,        1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 1),
        (11,    'Missing',                      'The space',                                    'Gotham', 46460,        1, 1111111111, 222222222, 1, 1111,   10, NULL, NULL, 0, 1),
@ -437,7 +437,7 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
        (125,   'The plastic cell',             'address 25',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1105,    2, NULL, NULL, 0, 0),
        (126,   'Many places',                  'address 26',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1106,    2, NULL, NULL, 0, 0),
        (127,   'Your pocket',                  'address 27',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1107,    2, NULL, NULL, 0, 0),
-        (128,   'Cerebro',                      'address 28',                                   'Gotham', 46460,        1, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 0),
+        (128,   'Cerebro',                      'address 28',                                   'Gotham', 46460,        5, 1111111111, 222222222, 1, 1108,    2, NULL, NULL, 0, 0),
        (129,   'Luke Cages Bar',               'address 29',                                   'Gotham', 'EC170150',   1, 1111111111, 222222222, 1, 1110,    2, NULL, NULL, 0, 0),
        (130,   'Non valid address',            'address 30',                                   'Gotham', 46460,        1, 1111111111, 222222222, 0, 1101,    2, NULL, NULL, 0, 0);

--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -26077,13 +26077,13 @@ CREATE TABLE `cplusInvoiceType472` (
 /*!40101 SET character_set_client = @saved_cs_client */;

 --
-- Table structure for table `cplusInvoiceType477`
+-- Table structure for table `siiTypeInvoiceOut`
 --

-DROP TABLE IF EXISTS `cplusInvoiceType477`;
+DROP TABLE IF EXISTS `siiTypeInvoiceOut`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `cplusInvoiceType477` (
+CREATE TABLE `siiTypeInvoiceOut` (
  `id` int(10) unsigned NOT NULL,
  `description` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
  PRIMARY KEY (`id`)
@ -29534,16 +29534,16 @@ CREATE TABLE `invoiceCorrection` (
  `correctingFk` int(10) unsigned NOT NULL COMMENT 'Factura rectificativa',
  `correctedFk` int(10) unsigned NOT NULL COMMENT 'Factura rectificada',
  `cplusRectificationTypeFk` int(10) unsigned NOT NULL,
-  `cplusInvoiceType477Fk` int(10) unsigned NOT NULL,
+  `siiTypeInvoiceOutFk` int(10) unsigned NOT NULL,
  `invoiceCorrectionTypeFk` int(11) NOT NULL DEFAULT 3,
  PRIMARY KEY (`correctingFk`),
  KEY `correctedFk_idx` (`correctedFk`),
  KEY `invoiceCorrection_ibfk_1_idx` (`cplusRectificationTypeFk`),
-  KEY `cplusInvoiceTyoeFk_idx` (`cplusInvoiceType477Fk`),
+  KEY `cplusInvoiceTyoeFk_idx` (`siiTypeInvoiceOutFk`),
  KEY `invoiceCorrectionTypeFk_idx` (`invoiceCorrectionTypeFk`),
  CONSTRAINT `corrected_fk` FOREIGN KEY (`correctedFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `correcting_fk` FOREIGN KEY (`correctingFk`) REFERENCES `invoiceOut` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `cplusInvoiceTyoeFk` FOREIGN KEY (`cplusInvoiceType477Fk`) REFERENCES `cplusInvoiceType477` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `cplusInvoiceTyoeFk` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
  CONSTRAINT `invoiceCorrectionType_Fk33` FOREIGN KEY (`invoiceCorrectionTypeFk`) REFERENCES `invoiceCorrectionType` (`id`) ON UPDATE CASCADE,
  CONSTRAINT `invoiceCorrection_ibfk_1` FOREIGN KEY (`cplusRectificationTypeFk`) REFERENCES `cplusRectificationType` (`id`) ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci COMMENT='Relacion entre las facturas rectificativas y las rectificadas.';
@ -30214,7 +30214,7 @@ CREATE TABLE `invoiceOut` (
  `companyFk` int(10) unsigned NOT NULL DEFAULT 442,
  `hasPdf` tinyint(3) unsigned NOT NULL DEFAULT 0,
  `booked` date DEFAULT NULL,
-  `cplusInvoiceType477Fk` int(10) unsigned NOT NULL DEFAULT 1,
+  `siiTypeInvoiceOutFk` int(10) unsigned NOT NULL DEFAULT 1,
  `cplusTaxBreakFk` int(10) unsigned NOT NULL DEFAULT 1,
  `cplusSubjectOpFk` int(10) unsigned NOT NULL DEFAULT 1,
  `cplusTrascendency477Fk` int(10) unsigned NOT NULL DEFAULT 1,
@ -30224,13 +30224,13 @@ CREATE TABLE `invoiceOut` (
  KEY `Id_Cliente` (`clientFk`),
  KEY `empresa_id` (`companyFk`),
  KEY `Fecha` (`issued`),
-  KEY `Facturas_ibfk_2_idx` (`cplusInvoiceType477Fk`),
+  KEY `Facturas_ibfk_2_idx` (`siiTypeInvoiceOutFk`),
  KEY `Facturas_ibfk_3_idx` (`cplusSubjectOpFk`),
  KEY `Facturas_ibfk_4_idx` (`cplusTaxBreakFk`),
  KEY `Facturas_ibfk_5_idx` (`cplusTrascendency477Fk`),
  KEY `Facturas_idx_Vencimiento` (`dued`),
  KEY `invoiceOut_serial` (`serial`),
-  CONSTRAINT `invoiceOut_ibfk_2` FOREIGN KEY (`cplusInvoiceType477Fk`) REFERENCES `cplusInvoiceType477` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `invoiceOut_ibfk_2` FOREIGN KEY (`siiTypeInvoiceOutFk`) REFERENCES `siiTypeInvoiceOut` (`id`) ON UPDATE CASCADE,
  CONSTRAINT `invoiceOut_ibfk_3` FOREIGN KEY (`cplusSubjectOpFk`) REFERENCES `cplusSubjectOp` (`id`) ON UPDATE CASCADE,
  CONSTRAINT `invoiceOut_ibfk_4` FOREIGN KEY (`cplusTaxBreakFk`) REFERENCES `cplusTaxBreak` (`id`) ON UPDATE CASCADE,
  CONSTRAINT `invoiceOut_serial` FOREIGN KEY (`serial`) REFERENCES `invoiceOutSerial` (`code`),
@ -30392,7 +30392,7 @@ CREATE TABLE `invoiceOutSerial` (
  `isTaxed` tinyint(1) NOT NULL DEFAULT 1,
  `taxAreaFk` varchar(15) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'NATIONAL',
  `isCEE` tinyint(1) NOT NULL DEFAULT 0,
-  `cplusInvoiceType477Fk` int(10) unsigned DEFAULT 1,
+  `siiTypeInvoiceOutFk` int(10) unsigned DEFAULT 1,
  `footNotes` longtext DEFAULT NULL,
  `isRefEditable` tinyint(4) NOT NULL DEFAULT 0,
  `type` enum('global','quick') DEFAULT NULL,
@ -58372,7 +58372,7 @@ BEGIN
 				io.cplusTrascendency477Fk AS TIPOCLAVE,
 				io.cplusTaxBreakFk AS TIPOEXENCI,
 				io.cplusSubjectOpFk AS TIPONOSUJE,
-				io.cplusInvoiceType477Fk AS TIPOFACT,
+				io.siiTypeInvoiceOutFk AS TIPOFACT,
 				ic.cplusRectificationTypeFk AS TIPORECTIF,
 				io.companyFk,
 				RIGHT(io.ref, LENGTH(io.ref) - 1) AS invoiceNum,
@ -58952,7 +58952,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,
--- a/db/export-data.sh
+++ b/db/export-data.sh
@ -46,7 +46,7 @@ TABLES=(
    bookingPlanner
    businessType
    cplusInvoiceType472
-    cplusInvoiceType477
+    siiTypeInvoiceOut
    cplusRectificationType
    cplusSubjectOp
    cplusTaxBreak
--- a/loopback/common/methods/application/execute.js
+++ b/loopback/common/methods/application/execute.js
@ -21,7 +21,8 @@ module.exports = Self => {

        const argString = params.map(() => '?').join(',');

-        const [response] = await models.ProcsPriv.rawSql(query + `(${argString})`, params, myOptions);
-        return response;
+        const response = await models.ProcsPriv.rawSql(query + `(${argString})`, params, myOptions);
+        if (!Array.isArray(response)) return;
+        return response[0];
    };
 };
--- a/loopback/common/methods/application/executeFunc.js
+++ b/loopback/common/methods/application/executeFunc.js
@ -1,7 +1,7 @@
 module.exports = Self => {
    Self.remoteMethodCtx('executeFunc', {
        description: 'Return result of function',
-        accessType: '*',
+        accessType: 'EXECUTE',
        accepts: [
            {
                arg: 'routine',
--- a/loopback/common/methods/application/executeProc.js
+++ b/loopback/common/methods/application/executeProc.js
@ -1,7 +1,7 @@
 module.exports = Self => {
    Self.remoteMethodCtx('executeProc', {
        description: 'Return result of procedure',
-        accessType: '*',
+        accessType: 'EXECUTE',
        accepts: [
            {
                arg: 'routine',
--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -196,5 +196,6 @@
 	"Negative basis of tickets: 23": "Negative basis of tickets: 23",
 	"Booking completed": "Booking complete",
 	"The ticket is in preparation": "The ticket [{{ticketId}}]({{{ticketUrl}}}) of the sales person {{salesPersonId}} is in preparation",
-	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets"
+	"You can only add negative amounts in refund tickets": "You can only add negative amounts in refund tickets",
+	"Try again": "Try again"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -323,7 +323,9 @@
 	"The response is not a PDF": "La respuesta no es un PDF",
 	"Booking completed": "Reserva completada",
 	"The ticket is in preparation": "El ticket [{{ticketId}}]({{{ticketUrl}}}) del comercial {{salesPersonId}} está en preparación",
-	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mímina",
-	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mímina",
-	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada"
+	"Incoterms data for consignee is missing": "Faltan los datos de los Incoterms para el consignatario",
+	"The notification subscription of this worker cant be modified": "La subscripción a la notificación de este trabajador no puede ser modificada",
+	"User disabled": "Usuario desactivado",
+	"The amount cannot be less than the minimum": "La cantidad no puede ser menor que la cantidad mínima",
+	"quantityLessThanMin": "La cantidad no puede ser menor que la cantidad mínima"
 }
--- a/modules/account/back/model-config.json
+++ b/modules/account/back/model-config.json
@ -35,6 +35,9 @@
    "SambaConfig": {
        "dataSource": "vn"
    },
+    "SignInLog": {
+        "dataSource": "vn"
+    },
    "Sip": {
        "dataSource": "vn"
    },
--- a/modules/account/back/models/sign_in-log.json
+++ b/modules/account/back/models/sign_in-log.json
@ -0,0 +1,34 @@
+{
+	"name": "SignInLog",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "account.signInLog"
+		}
+	},
+    "properties": {
+        "id": {
+			"id": true,
+			"type": "string"
+		},
+        "creationDate": {
+			"type": "date"
+		},
+        "userFk": {
+			"type": "number"
+		},
+        "ip": {
+			"type": "string"
+		}
+    },
+    "relations": {
+		"user": {
+			"type": "belongsTo",
+			"model": "VnUser",
+			"foreignKey": "userFk"
+		}
+	},
+	"scope": {
+		"order": ["creationDate DESC", "id DESC"]
+	}
+}
--- a/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/specs/transferinvoice.spec.js
@ -27,7 +27,7 @@ describe('InvoiceOut tranferInvoice()', () => {
            ref: 'T4444444',
            newClientFk: 1,
            cplusRectificationId: 1,
-            cplusInvoiceType477Id: 1,
+            siiTypeInvoiceOutId: 1,
            invoiceCorrectionTypeId: 1
        };
        ctx.args = args;
@ -52,7 +52,7 @@ describe('InvoiceOut tranferInvoice()', () => {
            ref: 'T1111111',
            newClientFk: 1101,
            cplusRectificationId: 1,
-            cplusInvoiceType477Id: 1,
+            siiTypeInvoiceOutId: 1,
            invoiceCorrectionTypeId: 1
        };
        ctx.args = args;
--- a/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
+++ b/modules/invoiceOut/back/methods/invoiceOut/transferInvoice.js
@ -27,7 +27,7 @@ module.exports = Self => {
                required: true
            },
            {
-                arg: 'cplusInvoiceType477Id',
+                arg: 'siiTypeInvoiceOutId',
                type: 'number',
                required: true
            },
@ -93,7 +93,7 @@ module.exports = Self => {
                correctingFk: invoiceId,
                correctedFk: args.id,
                cplusRectificationTypeFk: args.cplusRectificationId,
-                cplusInvoiceType477Fk: args.cplusInvoiceType477Id,
+                siiTypeInvoiceOutFk: args.siiTypeInvoiceOutId,
                invoiceCorrectionTypeFk: args.invoiceCorrectionTypeId
            }, myOptions);

--- a/modules/invoiceOut/back/model-config.json
+++ b/modules/invoiceOut/back/model-config.json
@ -41,7 +41,7 @@
    "InvoiceCorrection": {
        "dataSource": "vn"
    },
-    "CplusInvoiceType477": {
+    "SiiTypeInvoiceOut": {
        "dataSource": "vn"
    }
 }
--- a/modules/invoiceOut/back/models/invoice-correction.json
+++ b/modules/invoiceOut/back/models/invoice-correction.json
@ -18,11 +18,11 @@
        "cplusRectificationTypeFk": {
            "type": "number"
        },
-        "cplusInvoiceType477Fk": {
+        "siiTypeInvoiceOutFk": {
            "type": "number"
        },
        "invoiceCorrectionTypeFk": {
            "type": "number"
        }
    }
-}
+}
--- a/modules/invoiceOut/back/models/cplus-invoice-type-477.json
+++ b/modules/invoiceOut/back/models/cplus-invoice-type-477.json
@ -1,9 +1,9 @@
 {
-    "name": "CplusInvoiceType477",
+    "name": "SiiTypeInvoiceOut",
    "base": "VnModel",
    "options": {
        "mysql": {
-            "table": "cplusInvoiceType477"
+            "table": "siiTypeInvoiceOut"
        }
    },
    "properties": {
@ -16,4 +16,4 @@
            "type": "string"
        }
    }
-}
+}
--- a/modules/invoiceOut/front/descriptor-menu/index.html
+++ b/modules/invoiceOut/front/descriptor-menu/index.html
@ -6,8 +6,8 @@
 </vn-crud-model>
 <vn-crud-model
    auto-load="true"
-    url="CplusInvoiceType477s"
-    data="cplusInvoiceType477">
+    url="SiiTypeInvoiceOuts"
+    data="siiTypeInvoiceOut">
 </vn-crud-model>
 <vn-crud-model
    auto-load="true"
@ -24,7 +24,7 @@
        <vn-item
        vn-acl="administrative"
        vn-acl-action="remove"
-        ng-click="transferInvoice.show()" 
+        ng-click="transferInvoice.show()"
        translate>
            Transfer invoice to...
        </vn-item>
@ -223,15 +223,15 @@
            <vn-autocomplete
            vn-one
            vn-id="cplusInvoiceType"
-            data="cplusInvoiceType477"
+            data="siiTypeInvoiceOut"
            show-field="description"
            value-field="id"
            required="true"
-            ng-model="$ctrl.cplusInvoiceType477"
+            ng-model="$ctrl.siiTypeInvoiceOut"
            search-function="{or: [{id: $search}, {description: {like: '%'+ $search +'%'}}]}"
            label="Class">
            </vn-autocomplete>
-            <vn-autocomplete 
+            <vn-autocomplete
                vn-one
                vn-id="invoiceCorrectionType"
                data="invoiceCorrectionTypes"
@ -247,4 +247,4 @@
    <tpl-buttons>
        <button response="accept" translate>Transfer client</button>
    </tpl-buttons>
-</vn-dialog>
+</vn-dialog>
--- a/modules/invoiceOut/front/descriptor-menu/index.js
+++ b/modules/invoiceOut/front/descriptor-menu/index.js
@ -132,7 +132,7 @@ class Controller extends Section {
            ref: this.invoiceOut.ref,
            newClientFk: this.invoiceOut.client.id,
            cplusRectificationId: this.cplusRectificationType,
-            cplusInvoiceType477Id: this.cplusInvoiceType477,
+            siiTypeInvoiceOutId: this.siiTypeInvoiceOut,
            invoiceCorrectionTypeId: this.invoiceCorrectionType
        };
        this.$http.post(`InvoiceOuts/transferInvoice`, params).then(res => {
--- a/modules/item/back/methods/item/setVisibleDiscard.js
+++ b/modules/item/back/methods/item/setVisibleDiscard.js
@ -20,8 +20,7 @@ module.exports = Self => {
        },
        {
            arg: 'addressFk',
-            type: 'Number',
-            required: true,
+            type: 'Any',
            description: 'The address id'
        }],
        http: {
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@ -1,6 +1,6 @@
 {
 	"name": "ItemShelving",
-	"base": "VnModel",
+	"base": "Loggable",
 	"options": {
 		"mysql": {
 			"table": "itemShelving"
--- a/modules/ticket/back/methods/sale/updateQuantity.js
+++ b/modules/ticket/back/methods/sale/updateQuantity.js
@ -64,7 +64,10 @@ module.exports = Self => {
            const sale = await models.Sale.findById(id, filter, myOptions);

            const oldQuantity = sale.quantity;
-            const result = await sale.updateAttributes({quantity: newQuantity}, myOptions);
+            const result = await sale.updateAttributes({
+                quantity: newQuantity,
+                originalQuantity: newQuantity
+            }, myOptions);

            const salesPerson = sale.ticket().client().salesPersonUser();
            if (salesPerson) {
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@ -32,31 +32,30 @@ module.exports = Self => {
            throw new UserError('You cannot close tickets for today');

        const tickets = await Self.rawSql(`
-            SELECT
-                t.id,
-                t.clientFk,
-                t.companyFk,
-                c.name clientName,
-                c.email recipient,
-                c.salesPersonFk,
-                c.isToBeMailed,
-                c.hasToInvoice,
-                co.hasDailyInvoice,
-                eu.email salesPersonEmail
-            FROM ticket t
-                JOIN agencyMode am ON am.id = t.agencyModeFk
-                JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
-                JOIN ticketState ts ON ts.ticketFk = t.id
-                JOIN alertLevel al ON al.id = ts.alertLevel
-                JOIN client c ON c.id = t.clientFk
-                JOIN province p ON p.id = c.provinceFk
-                JOIN country co ON co.id = p.countryFk
-                LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
-                AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
-                    AND util.dayEnd(?)
-                AND t.refFk IS NULL
-            GROUP BY t.id
+            SELECT t.id,
+                    t.clientFk,
+                    t.companyFk,
+                    c.name clientName,
+                    c.email recipient,
+                    c.salesPersonFk,
+                    c.isToBeMailed,
+                    c.hasToInvoice,
+                    co.hasDailyInvoice,
+                    eu.email salesPersonEmail,
+                    t.addressFk
+                FROM ticket t
+                    JOIN agencyMode am ON am.id = t.agencyModeFk
+                    JOIN warehouse wh ON wh.id = t.warehouseFk AND wh.hasComission
+                    JOIN ticketState ts ON ts.ticketFk = t.id
+                    JOIN alertLevel al ON al.id = ts.alertLevel
+                    JOIN client c ON c.id = t.clientFk
+                    JOIN province p ON p.id = c.provinceFk
+                    JOIN country co ON co.id = p.countryFk
+                    LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
+                WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
+                    AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY) AND util.dayEnd(?)
+                    AND t.refFk IS NULL
+                GROUP BY t.id
        `, [toDate, toDate]);

        await closure(ctx, Self, tickets);
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@ -14,12 +14,12 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
            await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});

            const [invoiceOut] = await Self.rawSql(`
-                    SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
-                        FROM ticket t
-                            JOIN invoiceOut io ON io.ref = t.refFk
-                            JOIN company cny ON cny.id = io.companyFk
-                        WHERE t.id = ?
-                `, [ticket.id]);
+                SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
+                    FROM ticket t
+                        JOIN invoiceOut io ON io.ref = t.refFk
+                        JOIN company cny ON cny.id = io.companyFk
+                    WHERE t.id = ?
+            `, [ticket.id]);

            const mailOptions = {
                overrideAttachments: true,
@ -91,13 +91,13 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {

            // Incoterms authorization
            const [{firstOrder}] = await Self.rawSql(`
-                    SELECT COUNT(*) as firstOrder
-                        FROM ticket t
-                            JOIN client c ON c.id = t.clientFk
-                        WHERE t.clientFk = ?
-                            AND NOT t.isDeleted
-                            AND c.isVies
-                `, [ticket.clientFk]);
+                        SELECT COUNT(*) as firstOrder
+                            FROM ticket t
+                                JOIN client c ON c.id = t.clientFk
+                            WHERE t.clientFk = ?
+                                AND NOT t.isDeleted
+                                AND c.isVies
+                    `, [ticket.clientFk]);

            if (firstOrder == 1) {
                const args = {
@ -105,7 +105,8 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                    companyId: ticket.companyFk,
                    recipientId: ticket.clientFk,
                    recipient: ticket.recipient,
-                    replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail,
+                    addressId: ticket.addressFk
                };

                const email = new Email('incoterms-authorization', args);
@ -113,13 +114,13 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {

                const [sample] = await Self.rawSql(
                    `SELECT id
-                            FROM sample
-                        WHERE code = 'incoterms-authorization'
-                    `);
+                        FROM sample
+                    WHERE code = 'incoterms-authorization'
+                `);

                await Self.rawSql(`
-                        INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-                    `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+                    INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
+                `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
            }
        } catch (error) {
            // Domain not found
@ -140,7 +141,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {

        for (const ticket of failedtickets) {
            body += `Ticket: <strong>${ticket.id}</strong>
-                    <br/> <strong>${ticket.stacktrace}</strong><br/><br/>`;
+                        <br/> <strong>${ticket.stacktrace}</strong><br/><br/>`;
        }

        smtp.send({
@ -158,19 +159,19 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
        const oldInstance = `{"email": "${ticket.recipient}"}`;
        const newInstance = `{"email": ""}`;
        await Self.rawSql(`
-                INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
-                    VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+            INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
+                VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
            ticket.clientFk,
            oldInstance,
            newInstance
        ], {userId});

        const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
-            al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
-            porque la dirección de email <strong>"${ticket.recipient}"</strong> no es correcta
-            o no está disponible.<br/><br/>
-            Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
-            Actualiza la dirección de email con una correcta.`;
+        al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
+        porque la dirección de email <strong>"${ticket.recipient}"</strong> no es correcta
+        o no está disponible.<br/><br/>
+        Para evitar que se repita este error, se ha eliminado la dirección de email de la ficha del cliente.
+        Actualiza la dirección de email con una correcta.`;

        smtp.send({
            to: ticket.salesPersonEmail,
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@ -49,7 +49,6 @@ module.exports = function(Self) {
            myOptions.transaction = tx;
        }

-        let serial;
        try {
            const ticketToInvoice = await Self.rawSql(`
                SELECT id
@ -60,7 +59,7 @@ module.exports = function(Self) {
                where: {
                    id: {inq: ticketsIds}
                },
-                fields: ['id', 'clientFk']
+                fields: ['id', 'clientFk', 'addressFk']
            }, myOptions);

            await models.Ticket.canBeInvoiced(ctx, ticketsIds, myOptions);
@ -72,13 +71,19 @@ module.exports = function(Self) {
                throw new UserError(`This client can't be invoiced`);

            const query = `SELECT vn.invoiceSerial(?, ?, ?) AS serial`;
-            const [result] = await Self.rawSql(query, [
+            const [{serial}] = await Self.rawSql(query, [
                clientId,
                companyFk,
                invoiceType,
            ], myOptions);
-            serial = result.serial;

+            const invoiceOutSerial = await models.InvoiceOutSerial.findById(serial);
+            if (invoiceOutSerial?.taxAreaFk == 'WORLD') {
+                const address = await models.Address.findById(firstTicket.addressFk);
+
+                if (!address || !address.customsAgentFk || !address.incotermsFk)
+                    throw new UserError('Incoterms data for consignee is missing');
+            }
            await Self.rawSql('CALL invoiceOut_new(?, ?, null, @invoiceId)', [serial, invoiceDate], myOptions);

            const [resultInvoice] = await Self.rawSql('SELECT @invoiceId id', [], myOptions);
--- a/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/makeInvoice.spec.js
@ -52,4 +52,31 @@ describe('ticket makeInvoice()', () => {
            throw e;
        }
    });
+
+    it('should throw an error when invoicing a client without incoterms', async() => {
+        const tx = await models.Ticket.beginTransaction({});
+        let error;
+        try {
+            const options = {transaction: tx};
+
+            const ticketsId = [18];
+            await models.Ticket.rawSql(`
+                DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;
+                CREATE TEMPORARY TABLE tmp.ticketToInvoice
+                (PRIMARY KEY  (id))
+                    ENGINE = MEMORY
+                    SELECT id
+                        FROM vn.ticket
+                        WHERE id IN (?)
+            `, [ticketsId], options);
+
+            await models.Ticket.makeInvoice(ctx, invoiceType, companyFk, invoiceDate, options);
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual(`Incoterms data for consignee is missing`);
+    });
 });
--- a/modules/worker/front/descriptor/index.html
+++ b/modules/worker/front/descriptor/index.html
@ -38,7 +38,7 @@
            </vn-label-value>
            <vn-label-value
                label="Extension"
-            > 
+            >
                <vn-link-phone
                    phone-number="$ctrl.worker.sip.extension"
                ></vn-link-phone>
@ -61,8 +61,6 @@
            </div>
            <div ng-transclude="btnTwo">
                <vn-quick-link
-                    vn-acl="hr"
-                    vn-acl-action="remove"
                    tooltip="Go to user"
                    state="['account.card.summary', {id: $ctrl.id}]"
                    icon="face">
@ -75,13 +73,13 @@
 <vn-popup vn-id="summary">
    <vn-worker-summary worker="$ctrl.worker"></vn-worker-summary>
 </vn-popup>
-<vn-dialog 
+<vn-dialog
    vn-id="setPassword"
    on-accept="$ctrl.setPassword($ctrl.worker.password)"
    message="Reset password"
 >
    <tpl-body>
-        <vn-textfield 
+        <vn-textfield
            vn-one
            label="New password"
            required="true"
--- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql
+++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql
@ -1,7 +1,7 @@
 SELECT  io.issued,
        c.socialName,
        c.street postalAddress,
-        IF (ios.taxAreaFk IS NOT NULL, CONCAT(cty.code, c.fi), c.fi) fi,
+        c.fi,
        io.clientFk,
        c.postcode,
        c.city,
@ -50,7 +50,7 @@ SELECT  io.issued,
             ) sub2 ON TRUE
        JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk AND itc.itemFk = s.itemFk
        JOIN vn.taxClass tc ON tc.id = itc.taxClassFk
-        LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial AND ios.taxAreaFk = 'CEE'
+        JOIN vn.invoiceOutSerial ios ON ios.code = io.serial AND ios.taxAreaFk = 'WORLD'
        JOIN vn.country cty ON cty.id = c.countryFk
        JOIN vn.payMethod pm ON pm.id = c .payMethodFk
        JOIN vn.company co ON co.id=io.companyFk