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

Jenkinsfile

@@ -60,7 +60,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'salix'
-        STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {

db/routines/vn/procedures/travel_throwAwb.sql

@@ -0,0 +1,14 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_throwAwb`(vSelf INT)
+BEGIN
+/**
+ * Throws an error if travel does not have a logical AWB
+ * or there are several AWBs associated with the same DUA
+ *
+ * @param vSelf The travel id
+ */
+	IF NOT travel_hasUniqueAwb(vSelf) THEN
+		CALL util.throw('A different AWB is found in the entries');
+	END IF;
+END$$
+DELIMITER ;

db/routines/vn/triggers/entry_beforeInsert.sql

@@ -7,8 +7,8 @@ BEGIN
 	CALL supplier_checkIsActive(NEW.supplierFk);
 	SET NEW.currencyFk = entry_getCurrency(NEW.currencyFk, NEW.supplierFk);
 	SET NEW.commission = entry_getCommission(NEW.travelFk, NEW.currencyFk,NEW.supplierFk);
-	IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+	IF NEW.travelFk IS NOT NULL THEN
-		CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');	
+		CALL travel_throwAwb(NEW.travelFk);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/entry_beforeUpdate.sql

@@ -25,8 +25,8 @@ BEGIN
 
 	IF NOT (NEW.travelFk <=> OLD.travelFk) THEN
 
-		IF NEW.travelFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.travelFk) THEN
+		IF NEW.travelFk IS NOT NULL THEN
-			CALL util.throw('The travel is incorrect, there is a different AWB in the associated entries');
+			CALL travel_throwAwb(NEW.travelFk);
 		END IF;
 	
 		SELECT COUNT(*) > 0 INTO vIsVirtual

db/routines/vn/triggers/travel_beforeInsert.sql

@@ -9,8 +9,8 @@ BEGIN
 
 	CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	
-	IF NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+	IF NEW.awbFk IS NOT NULL THEN
-		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');	
+		CALL travel_throwAwb(NEW.id);
 	END IF;
 END$$
 DELIMITER ;

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -33,8 +33,8 @@ BEGIN
 		END IF;
 	END IF;	
 	
-	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL AND NOT travel_hasUniqueAwb(NEW.id) THEN
+	IF (NOT(NEW.awbFk <=> OLD.awbFk)) AND NEW.awbFk IS NOT NULL THEN
-		CALL util.throw('The AWB is incorrect, there is a different AWB in the associated entries');
+		CALL travel_throwAwb(NEW.id);
 	END IF;
 END$$
 DELIMITER ;

e2e/paths/02-client/05_add_address.spec.js

@@ -59,7 +59,7 @@ describe('Client Add address path', () => {
         await page.waitToClick(selectors.clientAddresses.saveButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Customs agent is required for a non UEE member');
+        expect(message.text).toContain('Incoterms and Customs agent are required for a non UEE member');
     });
 
     it(`should create a new custom agent and then save the address`, async() => {

loopback/locale/es.json

@@ -360,5 +360,6 @@
 	"ticketCommercial": "El ticket {{ ticket }} para el vendedor {{ salesMan }} está en preparación. (mensaje generado automáticamente)",
 	"This PDA is already assigned to another user": "Este PDA ya está asignado a otro usuario",
 	"You can only have one PDA": "Solo puedes tener un PDA",
-    "Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE"
+	"Incoterms and Customs agent are required for a non UEE member": "Se requieren Incoterms y agente de aduanas para un no miembro de la UEE",
+	"You can not use the same password": "No puedes usar la misma contraseña"
 }