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

e2e/paths/ticket-module/02_ticket_expeditions_and_log.spec.js

@@ -1,13 +1,12 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';
 
-// #776
-xdescribe('Ticket expeditions and log path', () => {
+describe('Ticket expeditions and log path', () => {
     const nightmare = createNightmare();
 
     beforeAll(() => {
         return nightmare
-            .loginAndModule('developer', 'ticket')
+            .loginAndModule('production', 'ticket')
             .accessToSearchResult('id:1')
             .accessToSection('ticket.card.expedition');
     });

services/db/install/changes/1.2-CHECK/03-vn2008expeditions.sql

@@ -1,13 +0,0 @@
-DROP TRIGGER IF EXISTS vn2008.expeditionsBeforeDelete;
-USE vn2008;
-
-DELIMITER $$
-$$
-CREATE DEFINER=`root`@`%` TRIGGER `vn2008`.`expeditionsBeforeDelete`
-BEFORE DELETE ON `expeditions` FOR EACH ROW
-BEGIN
-    UPDATE Tickets SET Bultos = (SELECT COUNT(counter)-1 
-		FROM expeditions WHERE ticket_id = OLD.ticket_id and EsBulto)
-		WHERE Id_Ticket = OLD.ticket_id;	
-END$$
-DELIMITER ;