Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter

back/Dockerfile

@@ -13,6 +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 corepack@0.31.0 \
     && corepack enable pnpm
 
 # Puppeteer

db/routines/vn/procedures/ticket_getWarnings.sql

@@ -25,7 +25,7 @@ BEGIN
 				LEFT JOIN agencyMode am ON am.id = tt.agencyModeFk
 				LEFT JOIN deliveryMethod dm ON dm.id = am.deliveryMethodFk
 			WHERE dm.code IN ('AGENCY')
-				AND it.isFragile;
+				AND (it.isFragile OR i.isFragile);
 
 	CREATE OR REPLACE TEMPORARY TABLE tmp.ticket_warnings
 		(PRIMARY KEY (ticketFk))

db/routines/vn/triggers/mandate_afterDelete.sql

@@ -0,0 +1,12 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_afterDelete`
+	AFTER DELETE ON `mandate`
+	FOR EACH ROW
+BEGIN
+	INSERT INTO mandateLog
+		SET `action` = 'delete',
+			`changedModel` = 'mandate',
+			`changedModelId` = OLD.id,
+			`userFk` = account.myUser_getId();
+END$$
+DELIMITER ;

db/routines/vn/triggers/mandate_beforeInsert.sql

@@ -3,10 +3,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_beforeInsert`
 	BEFORE INSERT ON `mandate`
 	FOR EACH ROW
 BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+
 	IF (NEW.code IS NULL) THEN
-		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT 
+		SET NEW.code=CONCAT(NEW.clientFk,'-',(SELECT AUTO_INCREMENT
-		    FROM information_schema.TABLES 
+			FROM information_schema.TABLES
-		    WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
+			WHERE TABLE_SCHEMA='vn' and TABLE_NAME='mandate'));
-    END IF;
+	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/mandate_beforeUpdate.sql

@@ -0,0 +1,8 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_beforeUpdate`
+	BEFORE INSERT ON `mandate`
+	FOR EACH ROW
+BEGIN
+	SET NEW.editorFk = account.myUser_getId();
+END$$
+DELIMITER ;

db/versions/11432-yellowRoebelini/00-firstScript.sql

@@ -0,0 +1,23 @@
+CREATE OR REPLACE TABLE vn.mandateLog (
+    `id` int(11) NOT NULL AUTO_INCREMENT,
+    `originFk` int(11) DEFAULT NULL,
+    `userFk` int(10) unsigned DEFAULT NULL,
+    `action` set('insert','update','delete','select') NOT NULL,
+    `creationDate` timestamp NULL DEFAULT current_timestamp(),
+    `description` text CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+    `changedModel` enum('client') NOT NULL DEFAULT 'client',
+    `oldInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`oldInstance`)),
+    `newInstance` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`newInstance`)),
+    `changedModelId` int(11) NOT NULL,
+    `changedModelValue` varchar(45) DEFAULT NULL,
+    `summaryId` varchar(30) DEFAULT NULL,
+    `reason` varchar(255) DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `logMandate_userFk` (`userFk`),
+    KEY `mandateLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+    KEY `mandateLog_originFk` (`originFk`,`creationDate`),
+    KEY `mandateLog_creationDate_IDX` (`creationDate` DESC) USING BTREE,
+    CONSTRAINT `mandateUserFk` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+ALTER TABLE vn.mandate ADD editorFk INT UNSIGNED DEFAULT NULL NULL;

db/versions/11433-chocolateIvy/00-firstScript.sql

@@ -0,0 +1 @@
+ALTER TABLE vn.recovery DROP FOREIGN KEY cliente333;

modules/client/back/locale/client-sample/es.yml

@@ -1,4 +1,4 @@
-name: muestra
+name: plantilla
 columns:
     id: id
     created: creado

modules/client/back/locale/mandate/en.yml

@@ -0,0 +1,10 @@
+name: mandate
+columns:
+    id: id
+    clientFk: client
+    companyFk: company
+    code: code
+    created: created
+    finished: finished
+    mandateTypeFk: mandate type
+    editorFk: editor

modules/client/back/locale/mandate/es.yml

@@ -0,0 +1,10 @@
+name: mandate
+columns:
+    id: id
+    clientFk: cliente
+    companyFk: empresa
+    code: código
+    created: creado
+    finished: finalizado
+    mandateTypeFk: tipo de mandato
+    editorFk: editor

modules/client/back/models/client.js

@@ -250,7 +250,7 @@ module.exports = Self => {
         const loopBackContext = LoopBackContext.getCurrentContext();
         const accessToken = {req: loopBackContext.active.accessToken};
 
-        const editVerifiedDataWithoutTaxDataChecked = models.ACL.checkAccessAcl(
+        const editVerifiedDataWithoutTaxDataChecked = await models.ACL.checkAccessAcl(
             accessToken,
             'Client',
             'editVerifiedDataWithoutTaxDataCheck',

modules/client/back/models/mandate.json

@@ -1,6 +1,9 @@
 {
     "name": "Mandate",
     "base": "VnModel",
+    "mixins": {
+        "Loggable": true
+    },
     "options": {
       "mysql": {
         "table": "mandate"
@@ -39,4 +42,4 @@
         "foreignKey": "mandateTypeFk"
       }
     }
-  }
+  }