Merge branch 'dev' into 7648_myEntries_filter

db/routines/vn/triggers/productionConfig_afterDelete.sql

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

db/routines/vn/triggers/productionConfig_beforeInsert.sql

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

db/routines/vn/triggers/productionConfig_beforeUpdate.sql

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

db/versions/11130-crimsonIvy/00-firstScript.sql

@@ -0,0 +1,23 @@
+ALTER TABLE vn.productionConfig
+    ADD editorFk int(10) unsigned DEFAULT NULL NULL;
+ALTER TABLE vn.productionConfig
+    ADD CONSTRAINT productionConfig_user_FK FOREIGN KEY (editorFk) REFERENCES account.`user`(id);
+
+CREATE OR REPLACE TABLE `vn`.`productionConfigLog` (
+    `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('ProductionConfig') NOT NULL DEFAULT 'ProductionConfig',
+    `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,
+    PRIMARY KEY (`id`),
+    KEY `productionConfigLog_userFk` (`userFk`),
+    KEY `productionConfigLog_changedModel` (`changedModel`,`changedModelId`,`creationDate`),
+    KEY `productionConfigLog_originFk` (`originFk`,`creationDate`),
+    CONSTRAINT `productionConfigUserFk` 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;

print/templates/reports/invoice/invoice.html

@@ -104,7 +104,7 @@
                         <tr>
                             <td width="5%">{{sale.itemFk}}</td>
                             <td class="number">{{sale.quantity}}</td>
-                            <td width="50%">{{sale.concept}}</td>
+                            <td width="50%">{{sale.concept}} <span class="font light-gray">{{sale.subName}}</span></td>
                             <td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td>
                             <td class="centered" width="5%">{{(sale.discount / 100) | percentage}}</td>
                             <td class="centered">{{sale.vatType}}</td>

print/templates/reports/invoice/locale/es.yml

@@ -35,3 +35,4 @@ observations: Observaciones
 wireTransfer: "Forma de pago: Transferencia"
 accountNumber: "Número de cuenta: {0}"
 services: Servicios
+

print/templates/reports/invoice/sql/sales.sql

@@ -8,7 +8,8 @@ SELECT
         s.itemFk,
         s.concept,
 		tc.code vatType,
-		it.isPackaging
+		it.isPackaging,
+        i.subName
 	FROM vn.invoiceOut io
         JOIN vn.ticket t ON t.refFk = io.ref
         JOIN vn.supplier su ON su.id = io.companyFk
@@ -38,6 +39,7 @@ SELECT
         NULL,
         ts.description,
         tc.code,
+        NULL,
         NULL
     FROM vn.invoiceOut io
         JOIN vn.ticket t ON t.refFk = io.ref