.vscode/settings.json

@@ -12,6 +12,7 @@
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"
     },
     "cSpell.words": [
-        "salix"
+        "salix",
+        "fdescribe"
     ]
 }

db/.archive/225201/00-invoiceOut_new.sql

@@ -74,7 +74,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 		SELECT
 				1,

db/.archive/231001/02-invoiceOut_new.sql

@@ -96,7 +96,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,

db/.archive/232001/00-invoiceOut_new.sql

@@ -96,7 +96,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,

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');

db/changes/234602/00-roleSync.sql

@@ -0,0 +1 @@
+CALL `account`.`role_sync`();

db/changes/234801/00-ACL_executeRoutine.sql

@@ -0,0 +1,4 @@
+INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
+    VALUES
+        ('Application', 'executeProc', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('Application', 'executeFunc', '*', 'ALLOW', 'ROLE', 'employee');

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;
+LOCK TABLES `siiTypeInvoiceOut` WRITE;
-/*!40000 ALTER TABLE `cplusInvoiceType477` DISABLE KEYS */;
+/*!40000 ALTER TABLE `siiTypeInvoiceOut` 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');
+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 `cplusInvoiceType477` ENABLE KEYS */;
+/*!40000 ALTER TABLE `siiTypeInvoiceOut` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --

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);
 

db/dump/structure.sql

@@ -2352,6 +2352,90 @@ BEGIN
 	END IF;
 END ;;
 DELIMITER ;
+
+
+DELIMITER ;;
+CREATE DEFINER=`root`@`localhost` FUNCTION `account`.`user_hasRoutinePriv`(vType ENUM('PROCEDURE', 'FUNCTION'),
+	vChain VARCHAR(100),
+	vUserFk INT
+) RETURNS tinyint(1)
+    READS SQL DATA
+BEGIN
+
+/**
+ * Search if the user has privileges on routines.
+ *
+ * @param vType procedure or function
+ * @param vChain string passed with this syntax dbName.tableName
+ * @param vUserFk user to ckeck
+ * @return vHasPrivilege
+ */
+	DECLARE vHasPrivilege BOOL DEFAULT FALSE;
+	DECLARE vDb VARCHAR(50);
+	DECLARE vObject VARCHAR(50);
+	DECLARE vChainExists BOOL;
+	DECLARE vExecutePriv INT DEFAULT 262144;
+	-- 262144 = CONV(1000000000000000000, 2, 10)
+	-- 1000000000000000000 execution permission expressed in binary base
+
+	SET vDb = SUBSTRING_INDEX(vChain, '.', 1);
+	SET vChain = SUBSTRING(vChain, LENGTH(vDb) + 2);
+	SET vObject = SUBSTRING_INDEX(vChain, '.', 1);
+
+	SELECT COUNT(*) INTO vChainExists
+		FROM mysql.proc
+			WHERE db = vDb
+				AND `name` = vObject
+				AND `type` = vType
+			LIMIT 1;
+
+	IF NOT vChainExists THEN
+		RETURN FALSE;
+	END IF;
+
+	DROP TEMPORARY TABLE IF EXISTS tRole;
+	CREATE TEMPORARY TABLE tRole
+		(INDEX (`name`))
+		ENGINE = MEMORY
+		SELECT r.`name`
+			FROM user u
+				JOIN roleRole rr ON rr.role = u.role
+				JOIN `role` r ON r.id = rr.inheritsFrom
+			WHERE u.id = vUserFk;
+
+	SELECT TRUE INTO vHasPrivilege
+		FROM mysql.global_priv gp
+			JOIN tRole tr ON tr.name = gp.`User`
+				OR CONCAT('$', tr.name) = gp.`User`
+		WHERE JSON_VALUE(gp.Priv, '$.access') >= vExecutePriv
+			AND gp.Host = ''
+		LIMIT 1;
+
+	IF NOT vHasPrivilege THEN
+		SELECT TRUE INTO vHasPrivilege
+			FROM mysql.db db
+				JOIN tRole tr ON tr.name = db.`User`
+			WHERE db.Db = vDb
+				AND db.Execute_priv = 'Y';
+	END IF;
+
+	IF NOT vHasPrivilege THEN
+		SELECT TRUE INTO vHasPrivilege
+			FROM mysql.procs_priv pp
+				JOIN tRole tr ON tr.name = pp.`User`
+			WHERE pp.Db = vDb
+				AND pp.Routine_name = vObject
+				AND pp.Routine_type = vType
+				AND pp.Proc_priv = 'Execute'
+			LIMIT 1;
+	END IF;
+
+	DROP TEMPORARY TABLE tRole;
+	RETURN vHasPrivilege;
+END ;;
+DELIMITER ;
+
+
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
@@ -25993,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`)
@@ -29450,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.';
@@ -30130,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,
@@ -30140,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`),
@@ -30308,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,
@@ -58288,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,
@@ -58868,7 +58952,7 @@ BEGIN
 			clientFk,
 			dued,
 			companyFk,
-			cplusInvoiceType477Fk
+			siiTypeInvoiceOutFk
 		)
 			SELECT
 					1,

db/export-data.sh

@@ -46,7 +46,7 @@ TABLES=(
     bookingPlanner
     businessType
     cplusInvoiceType472
-    cplusInvoiceType477
+    siiTypeInvoiceOut
     cplusRectificationType
     cplusSubjectOp
     cplusTaxBreak

loopback/common/methods/application/execute.js

@@ -0,0 +1,28 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.execute = async(ctx, type, query, params, options) => {
+        const userId = ctx.req.accessToken.userId;
+        const models = Self.app.models;
+        params = params ?? [];
+
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const chain = query.split(' ')[1];
+
+        const [canExecute] = await models.ProcsPriv.rawSql(
+            'SELECT account.user_hasRoutinePriv(?,?,?)',
+            [type, chain, userId],
+            myOptions);
+
+        if (!Object.values(canExecute)[0]) throw new UserError(`You don't have enough privileges`, 'ACCESS_DENIED');
+
+        const argString = params.map(() => '?').join(',');
+
+        const response = await models.ProcsPriv.rawSql(query + `(${argString})`, params, myOptions);
+        if (!Array.isArray(response)) return;
+        return response[0];
+    };
+};

loopback/common/methods/application/executeFunc.js

@@ -0,0 +1,41 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('executeFunc', {
+        description: 'Return result of function',
+        accessType: 'EXECUTE',
+        accepts: [
+            {
+                arg: 'routine',
+                type: 'string',
+                description: 'The routine name',
+                required: true,
+                http: {source: 'path'}
+            },
+            {
+                arg: 'schema',
+                type: 'string',
+                description: 'The routine schema',
+                required: true,
+            },
+            {
+                arg: 'params',
+                type: ['any'],
+                description: 'The params array',
+            },
+        ],
+        returns: {
+            type: 'any',
+            root: true
+        },
+        http: {
+            path: `/:routine/execute-func`,
+            verb: 'POST'
+        }
+    });
+
+    Self.executeFunc = async(ctx, routine, schema, params, options) => {
+        const query = `SELECT ${schema}.${routine}`;
+
+        const response = await Self.execute(ctx, 'FUNCTION', query, params, options);
+        return Object.values(response)[0];
+    };
+};

loopback/common/methods/application/executeProc.js

@@ -0,0 +1,39 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('executeProc', {
+        description: 'Return result of procedure',
+        accessType: 'EXECUTE',
+        accepts: [
+            {
+                arg: 'routine',
+                type: 'string',
+                description: 'The routine name',
+                required: true,
+                http: {source: 'path'}
+            },
+            {
+                arg: 'schema',
+                type: 'string',
+                description: 'The routine schema',
+                required: true,
+            },
+            {
+                arg: 'params',
+                type: ['any'],
+                description: 'The params array',
+            },
+        ],
+        returns: {
+            type: 'any',
+            root: true
+        },
+        http: {
+            path: `/:routine/execute-proc`,
+            verb: 'POST'
+        }
+    });
+
+    Self.executeProc = async(ctx, routine, schema, params, options) => {
+        const query = `CALL ${schema}.${routine}`;
+        return Self.execute(ctx, 'PROCEDURE', query, params, options);
+    };
+};

loopback/common/methods/application/spec/execute.spec.js

@@ -0,0 +1,161 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Application execute()/executeProc()/executeFunc()', () => {
+    const userWithoutPrivileges = 1;
+    const userWithPrivileges = 9;
+    const userWithInheritedPrivileges = 120;
+    let tx;
+
+    function getCtx(userId) {
+        return {
+            req: {
+                accessToken: {userId},
+                headers: {origin: 'http://localhost'}
+            }
+        };
+    }
+
+    beforeEach(async() => {
+        tx = await models.Application.beginTransaction({});
+        const options = {transaction: tx};
+
+        await models.Application.rawSql(`
+            CREATE OR REPLACE PROCEDURE vn.myProcedure(vMyParam INT)
+            BEGIN
+                SELECT vMyParam myParam, t.*
+                    FROM ticket t
+                    LIMIT 2;
+            END
+        `, null, options);
+
+        await models.Application.rawSql(`
+            CREATE OR REPLACE FUNCTION bs.myFunction(vMyParam INT) RETURNS int(11)
+            BEGIN
+                RETURN vMyParam;
+            END
+        `, null, options);
+
+        await models.Application.rawSql(`
+            GRANT EXECUTE ON PROCEDURE vn.myProcedure TO developer;
+            GRANT EXECUTE ON FUNCTION bs.myFunction TO developer;
+        `, null, options);
+    });
+
+    it('should throw error when execute procedure and not have privileges', async() => {
+        const ctx = getCtx(userWithoutPrivileges);
+
+        let error;
+        try {
+            const options = {transaction: tx};
+
+            await models.Application.execute(
+                ctx,
+                'PROCEDURE',
+                'CALL vn.myProcedure',
+                [1],
+                options
+            );
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            error = e;
+        }
+
+        expect(error.message).toEqual(`You don't have enough privileges`);
+    });
+
+    it('should execute procedure and get data', async() => {
+        const ctx = getCtx(userWithPrivileges);
+        try {
+            const options = {transaction: tx};
+
+            const response = await models.Application.execute(
+                ctx,
+                'PROCEDURE',
+                'CALL vn.myProcedure',
+                [1],
+                options
+            );
+
+            expect(response.length).toEqual(2);
+            expect(response[0].myParam).toEqual(1);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    describe('Application executeProc()', () => {
+        it('should execute procedure and get data (executeProc)', async() => {
+            const ctx = getCtx(userWithPrivileges);
+            try {
+                const options = {transaction: tx};
+
+                const response = await models.Application.executeProc(
+                    ctx,
+                    'myProcedure',
+                    'vn',
+                    [1],
+                    options
+                );
+
+                expect(response.length).toEqual(2);
+                expect(response[0].myParam).toEqual(1);
+
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                throw e;
+            }
+        });
+    });
+
+    describe('Application executeFunc()', () => {
+        it('should execute function and get data', async() => {
+            const ctx = getCtx(userWithPrivileges);
+            try {
+                const options = {transaction: tx};
+
+                const response = await models.Application.executeFunc(
+                    ctx,
+                    'myFunction',
+                    'bs',
+                    [1],
+                    options
+                );
+
+                expect(response).toEqual(1);
+
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                throw e;
+            }
+        });
+
+        it('should execute function and get data with user with inherited privileges', async() => {
+            const ctx = getCtx(userWithInheritedPrivileges);
+            try {
+                const options = {transaction: tx};
+
+                const response = await models.Application.executeFunc(
+                    ctx,
+                    'myFunction',
+                    'bs',
+                    [1],
+                    options
+                );
+
+                expect(response).toEqual(1);
+
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                throw e;
+            }
+        });
+    });
+});

loopback/common/models/application.js

@@ -2,4 +2,7 @@
 module.exports = function(Self) {
     require('../methods/application/status')(Self);
     require('../methods/application/post')(Self);
+    require('../methods/application/execute')(Self);
+    require('../methods/application/executeProc')(Self);
+    require('../methods/application/executeFunc')(Self);
 };

loopback/common/models/procs-priv.json

@@ -0,0 +1,44 @@
+{
+    "name": "ProcsPriv",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "mysql.procs_priv"
+        }
+    },
+    "properties": {
+        "name": {
+            "id": 1,
+            "type": "string",
+            "mysql": {
+                "columnName": "Routine_name"
+            }
+        },
+        "schema": {
+            "id": 3,
+			"type": "string",
+			"mysql": {
+				"columnName": "Db"
+			}
+		},
+        "role": {
+			"type": "string",
+			"mysql": {
+				"columnName": "user"
+			}
+		},
+        "type": {
+            "id": 2,
+			"type": "string",
+			"mysql": {
+				"columnName": "Routine_type"
+			}
+		},
+        "host": {
+			"type": "string",
+			"mysql": {
+				"columnName": "Host"
+			}
+		}
+    }
+}

loopback/locale/es.json

@@ -325,5 +325,6 @@
 	"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",
+	"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"
 }

loopback/server/model-config.json

@@ -49,5 +49,13 @@
     },
     "Container": {
         "dataSource": "vn"
+    },
+    "ProcsPriv": {
+        "dataSource": "vn",
+        "options": {
+            "mysql": {
+                "table": "mysql.procs_priv"
+            }
+        }
     }
-}
+}

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;

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);
 

modules/invoiceOut/back/model-config.json

@@ -41,7 +41,7 @@
     "InvoiceCorrection": {
         "dataSource": "vn"
     },
-    "CplusInvoiceType477": {
+    "SiiTypeInvoiceOut": {
         "dataSource": "vn"
     }
 }

modules/invoiceOut/back/models/invoice-correction.json

@@ -18,11 +18,11 @@
         "cplusRectificationTypeFk": {
             "type": "number"
         },
-        "cplusInvoiceType477Fk": {
+        "siiTypeInvoiceOutFk": {
             "type": "number"
         },
         "invoiceCorrectionTypeFk": {
             "type": "number"
         }
     }
-}
+}

modules/invoiceOut/back/models/sii-type-invoice-out.json

@@ -1,9 +1,9 @@
 {
-    "name": "CplusInvoiceType477",
+    "name": "SiiTypeInvoiceOut",
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "cplusInvoiceType477"
+            "table": "siiTypeInvoiceOut"
         }
     },
     "properties": {
@@ -16,4 +16,4 @@
             "type": "string"
         }
     }
-}
+}

modules/invoiceOut/front/descriptor-menu/index.html

@@ -6,8 +6,8 @@
 </vn-crud-model>
 <vn-crud-model
     auto-load="true"
-    url="CplusInvoiceType477s"
+    url="SiiTypeInvoiceOuts"
-    data="cplusInvoiceType477">
+    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>

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 => {

modules/ticket/back/methods/ticket/closure.js

@@ -5,177 +5,177 @@ const config = require('vn-print/core/config');
 const storage = require('vn-print/core/storage');
 
 module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
-	const userId = ctx.req.accessToken.userId;
+    const userId = ctx.req.accessToken.userId;
-	if (tickets.length == 0) return;
+    if (tickets.length == 0) return;
 
-	const failedtickets = [];
+    const failedtickets = [];
-	for (const ticket of tickets) {
+    for (const ticket of tickets) {
-		try {
+        try {
-			await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
+            await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
 
-			const [invoiceOut] = await Self.rawSql(`
+            const [invoiceOut] = await Self.rawSql(`
-						SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
+                    SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
-							FROM ticket t
+                        FROM ticket t
-								JOIN invoiceOut io ON io.ref = t.refFk
+                            JOIN invoiceOut io ON io.ref = t.refFk
-								JOIN company cny ON cny.id = io.companyFk
+                            JOIN company cny ON cny.id = io.companyFk
-							WHERE t.id = ?
+                        WHERE t.id = ?
-					`, [ticket.id]);
+                `, [ticket.id]);
 
-			const mailOptions = {
+            const mailOptions = {
-				overrideAttachments: true,
+                overrideAttachments: true,
-				attachments: []
+                attachments: []
-			};
+            };
 
-			const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
+            const isToBeMailed = ticket.recipient && ticket.salesPersonFk && ticket.isToBeMailed;
 
-			if (invoiceOut) {
+            if (invoiceOut) {
-				const args = {
+                const args = {
-					reference: invoiceOut.ref,
+                    reference: invoiceOut.ref,
-					recipientId: ticket.clientFk,
+                    recipientId: ticket.clientFk,
-					recipient: ticket.recipient,
+                    recipient: ticket.recipient,
-					replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail
-				};
+                };
 
-				const invoiceReport = new Report('invoice', args);
+                const invoiceReport = new Report('invoice', args);
-				const stream = await invoiceReport.toPdfStream();
+                const stream = await invoiceReport.toPdfStream();
 
-				const issued = invoiceOut.issued;
+                const issued = invoiceOut.issued;
-				const year = issued.getFullYear().toString();
+                const year = issued.getFullYear().toString();
-				const month = (issued.getMonth() + 1).toString();
+                const month = (issued.getMonth() + 1).toString();
-				const day = issued.getDate().toString();
+                const day = issued.getDate().toString();
 
-				const fileName = `${year}${invoiceOut.ref}.pdf`;
+                const fileName = `${year}${invoiceOut.ref}.pdf`;
 
-				// Store invoice
+                // Store invoice
-				await storage.write(stream, {
+                await storage.write(stream, {
-					type: 'invoice',
+                    type: 'invoice',
-					path: `${year}/${month}/${day}`,
+                    path: `${year}/${month}/${day}`,
-					fileName: fileName
+                    fileName: fileName
-				});
+                });
 
-				await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
+                await Self.rawSql('UPDATE invoiceOut SET hasPdf = true WHERE id = ?', [invoiceOut.id], {userId});
 
-				if (isToBeMailed) {
+                if (isToBeMailed) {
-					const invoiceAttachment = {
+                    const invoiceAttachment = {
-						filename: fileName,
+                        filename: fileName,
-						content: stream
+                        content: stream
-					};
+                    };
 
-					if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
+                    if (invoiceOut.serial == 'E' && invoiceOut.companyCode == 'VNL') {
-						const exportation = new Report('exportation', args);
+                        const exportation = new Report('exportation', args);
-						const stream = await exportation.toPdfStream();
+                        const stream = await exportation.toPdfStream();
-						const fileName = `CITES-${invoiceOut.ref}.pdf`;
+                        const fileName = `CITES-${invoiceOut.ref}.pdf`;
 
-						mailOptions.attachments.push({
+                        mailOptions.attachments.push({
-							filename: fileName,
+                            filename: fileName,
-							content: stream
+                            content: stream
-						});
+                        });
-					}
+                    }
 
-					mailOptions.attachments.push(invoiceAttachment);
+                    mailOptions.attachments.push(invoiceAttachment);
 
-					const email = new Email('invoice', args);
+                    const email = new Email('invoice', args);
-					await email.send(mailOptions);
+                    await email.send(mailOptions);
-				}
+                }
-			} else if (isToBeMailed) {
+            } else if (isToBeMailed) {
-				const args = {
+                const args = {
-					id: ticket.id,
+                    id: ticket.id,
-					recipientId: ticket.clientFk,
+                    recipientId: ticket.clientFk,
-					recipient: ticket.recipient,
+                    recipient: ticket.recipient,
-					replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail
-				};
+                };
 
-				const email = new Email('delivery-note-link', args);
+                const email = new Email('delivery-note-link', args);
-				await email.send();
+                await email.send();
-			}
+            }
 
-			// Incoterms authorization
+            // Incoterms authorization
-			const [{firstOrder}] = await Self.rawSql(`
+            const [{firstOrder}] = await Self.rawSql(`
-						SELECT COUNT(*) as firstOrder
+                    SELECT COUNT(*) as firstOrder
-							FROM ticket t
+                        FROM ticket t
-								JOIN client c ON c.id = t.clientFk
+                            JOIN client c ON c.id = t.clientFk
-							WHERE t.clientFk = ?
+                        WHERE t.clientFk = ?
-								AND NOT t.isDeleted
+                            AND NOT t.isDeleted
-								AND c.isVies
+                            AND c.isVies
-					`, [ticket.clientFk]);
+                `, [ticket.clientFk]);
 
-			if (firstOrder == 1) {
+            if (firstOrder == 1) {
-				const args = {
+                const args = {
-					id: ticket.clientFk,
+                    id: ticket.clientFk,
-					companyId: ticket.companyFk,
+                    companyId: ticket.companyFk,
-					recipientId: ticket.clientFk,
+                    recipientId: ticket.clientFk,
-					recipient: ticket.recipient,
+                    recipient: ticket.recipient,
-					replyTo: ticket.salesPersonEmail
+                    replyTo: ticket.salesPersonEmail
-				};
+                };
 
-				const email = new Email('incoterms-authorization', args);
+                const email = new Email('incoterms-authorization', args);
-				await email.send();
+                await email.send();
 
-				const [sample] = await Self.rawSql(
+                const [sample] = await Self.rawSql(
-					`SELECT id
+                    `SELECT id
-						FROM sample
+                            FROM sample
-					WHERE code = 'incoterms-authorization'
+                        WHERE code = 'incoterms-authorization'
-				`);
+                    `);
 
-				await Self.rawSql(`
+                await Self.rawSql(`
-					INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
+                        INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-				`, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
+                    `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
-			};
+            }
-		} catch (error) {
+        } catch (error) {
-			// Domain not found
+            // Domain not found
-			if (error.responseCode == 450)
+            if (error.responseCode == 450)
-				return invalidEmail(ticket);
+                return invalidEmail(ticket);
 
-			// Save tickets on a list of failed ids
+            // Save tickets on a list of failed ids
-			failedtickets.push({
+            failedtickets.push({
-				id: ticket.id,
+                id: ticket.id,
-				stacktrace: error
+                stacktrace: error
-			});
+            });
-		}
+        }
-	}
+    }
 
-	// Send email with failed tickets
+    // Send email with failed tickets
-	if (failedtickets.length > 0) {
+    if (failedtickets.length > 0) {
-		let body = 'This following tickets have failed:<br/><br/>';
+        let body = 'This following tickets have failed:<br/><br/>';
 
-		for (const ticket of failedtickets) {
+        for (const ticket of failedtickets) {
-			body += `Ticket: <strong>${ticket.id}</strong>
+            body += `Ticket: <strong>${ticket.id}</strong>
-						<br/> <strong>${ticket.stacktrace}</strong><br/><br/>`;
+                    <br/> <strong>${ticket.stacktrace}</strong><br/><br/>`;
-		}
+        }
 
-		smtp.send({
+        smtp.send({
-			to: config.app.reportEmail,
+            to: config.app.reportEmail,
-			subject: '[API] Nightly ticket closure report',
+            subject: '[API] Nightly ticket closure report',
-			html: body
+            html: body
-		});
+        });
-	}
+    }
 
-	async function invalidEmail(ticket) {
+    async function invalidEmail(ticket) {
-		await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
+        await Self.rawSql(`UPDATE client SET email = NULL WHERE id = ?`, [
-			ticket.clientFk
+            ticket.clientFk
-		], {userId});
+        ], {userId});
 
-		const oldInstance = `{"email": "${ticket.recipient}"}`;
+        const oldInstance = `{"email": "${ticket.recipient}"}`;
-		const newInstance = `{"email": ""}`;
+        const newInstance = `{"email": ""}`;
-		await Self.rawSql(`
+        await Self.rawSql(`
-			INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
+                INSERT INTO clientLog (originFk, userFk, action, changedModel, oldInstance, newInstance)
-				VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
+                    VALUES (?, NULL, 'UPDATE', 'Client', ?, ?)`, [
-			ticket.clientFk,
+            ticket.clientFk,
-			oldInstance,
+            oldInstance,
-			newInstance
+            newInstance
-		], {userId});
+        ], {userId});
 
-		const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
+        const body = `No se ha podido enviar el albarán <strong>${ticket.id}</strong>
-		al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
+            al cliente <strong>${ticket.clientFk} - ${ticket.clientName}</strong>
-		porque la dirección de email <strong>"${ticket.recipient}"</strong> no es correcta
+            porque la dirección de email <strong>"${ticket.recipient}"</strong> no es correcta
-		o no está disponible.<br/><br/>
+            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.
+            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.`;
+            Actualiza la dirección de email con una correcta.`;
 
-		smtp.send({
+        smtp.send({
-			to: ticket.salesPersonEmail,
+            to: ticket.salesPersonEmail,
-			subject: 'No se ha podido enviar el albarán',
+            subject: 'No se ha podido enviar el albarán',
-			html: body
+            html: body
-		});
+        });
-	}
+    }
 };

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);

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`);
+    });
 });

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