Merge pull request 'hotfix' (!2919) from hotFix-Miriam into master

Reviewed-on: #2919
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

db/routines/vn/procedures/sale_getProblems.sql

@@ -23,43 +23,36 @@ BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	DELETE tt.*
+	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
-		FROM tmp.sale_getProblems tt
+		ticketFk INT(11),
-			JOIN ticketObservation tto ON tto.ticketFk = tt.ticketFk
+		saleFk INT(11),
-			JOIN observationType ot ON ot.id = tto.observationTypeFk
+		isFreezed INTEGER(1) DEFAULT 0,
-		WHERE ot.code = 'administrative'
+		risk DECIMAL(10,1) DEFAULT 0,
-			AND tto.description = 'Miriam';
+		hasRisk TINYINT(1) DEFAULT 0,
+		hasHighRisk TINYINT(1) DEFAULT 0,
+		hasTicketRequest INTEGER(1) DEFAULT 0,
+		itemShortage VARCHAR(255),
+		isTaxDataChecked  INTEGER(1) DEFAULT 1,
+		itemDelay VARCHAR(255),
+		itemLost VARCHAR(255),
+		hasComponentLack INTEGER(1),
+		hasRounding VARCHAR(255),
+		isTooLittle BOOL DEFAULT FALSE,
+		isVip BOOL DEFAULT FALSE,
+		PRIMARY KEY (ticketFk, saleFk)
+	) ENGINE = MEMORY;
 
-		CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
+	INSERT INTO tmp.sale_problems(ticketFk,
-			ticketFk INT(11),
+									saleFk,
-			saleFk INT(11),
+									isFreezed,
-			isFreezed INTEGER(1) DEFAULT 0,
+									risk,
-			risk DECIMAL(10,1) DEFAULT 0,
+									hasRisk,
-			hasRisk TINYINT(1) DEFAULT 0,
+									hasHighRisk,
-			hasHighRisk TINYINT(1) DEFAULT 0,
+									hasTicketRequest,
-			hasTicketRequest INTEGER(1) DEFAULT 0,
+									isTaxDataChecked,
-			itemShortage VARCHAR(255),
+									hasComponentLack,
-			isTaxDataChecked  INTEGER(1) DEFAULT 1,
+									hasRounding,
-			itemDelay VARCHAR(255),
+									isTooLittle)
-			itemLost VARCHAR(255),
-			hasComponentLack INTEGER(1),
-			hasRounding VARCHAR(255),
-			isTooLittle BOOL DEFAULT FALSE,
-			isVip BOOL DEFAULT FALSE,
-			PRIMARY KEY (ticketFk, saleFk)
-		) ENGINE = MEMORY;
-
-		INSERT INTO tmp.sale_problems(ticketFk,
-										saleFk,
-										isFreezed,
-										risk,
-										hasRisk,
-										hasHighRisk,
-										hasTicketRequest,
-										isTaxDataChecked,
-										hasComponentLack,
-										hasRounding,
-										isTooLittle)
 			SELECT sgp.ticketFk,
 					s.id,
 					IF(FIND_IN_SET('isFreezed', t.problem), TRUE, FALSE) isFreezed,

db/versions/11205-grayCymbidium/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN isPrinted int(11) DEFAULT 0 NOT NULL COMMENT '0.- Not Printed ; 1.- Printed; 2.- Selected ; 3.- Error ;  4.- Waiting to be printed';