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

db/routines/hedera/procedures/order_confirmWithUser.sql

@@ -22,7 +22,6 @@ BEGIN
 	DECLARE vItemFk INT;
 	DECLARE vConcept VARCHAR(30);
 	DECLARE vAmount INT;
-	DECLARE vAvailable INT;
 	DECLARE vPrice DECIMAL(10,2);
 	DECLARE vSaleFk INT;
 	DECLARE vRowFk INT;
@@ -32,7 +31,6 @@ BEGIN
 	DECLARE vClientFk INT;
 	DECLARE vCompanyFk INT;
 	DECLARE vAgencyModeFk INT;
-	DECLARE vCalcFk INT;
 	DECLARE vIsTaxDataChecked BOOL;
 
 	DECLARE vDates CURSOR FOR
@@ -109,7 +107,7 @@ BEGIN
 	) INTO vHas0Amount;
 
 	IF vHas0Amount THEN
-		CALL util.throw('Remove lines with quantity = 0 before confirming');
+		CALL util.throw('Hay líneas vacías. Por favor, elimínelas');
 	END IF;
 
 	START TRANSACTION;

db/routines/hedera/triggers/orderRow_afterInsert.sql

@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `hedera`.`orderRow_afterIns
 	FOR EACH ROW
 BEGIN
 	UPDATE `order`
-		SET rowUpdated = NOW()
+		SET rowUpdated = util.VN_NOW()
 	WHERE id = NEW.orderFk;
 END$$
 DELIMITER ;

db/versions/11288-purpleFern/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE hedera.`order` ADD IF NOT EXISTS rowUpdated DATETIME NULL 
+    COMMENT 'Timestamp for last updated record in orderRow table';

db/versions/11295-brownLaurel/00-firstScript.sql

@@ -0,0 +1,3 @@
+-- Place your SQL code here
+ALTER TABLE vn.itemShelving DROP COLUMN IF EXISTS isMoving;
+ALTER TABLE vn.itemShelving ADD IF NOT EXISTS movingState ENUM('selected','printed') NULL;

modules/worker/back/methods/worker/new.js

@@ -217,6 +217,7 @@ module.exports = Self => {
             const code = e.code;
             const message = e.sqlMessage;
 
+            if (e.message && e.message.includes('Invalid email')) throw new UserError('Invalid email');
             if (e.message && e.message.includes(`Email already exists`)) throw new UserError(`This personal mail already exists`);
             if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`)) throw new UserError(`This worker code already exists`);
             if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`)) throw new UserError(`This worker already exists`);