Merge branch 'master' into test

db/routines/vn/procedures/ticket_setState.sql

@@ -3,21 +3,25 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`ticket_setState`(
 	vSelf INT,
 	vStateCode VARCHAR(255) COLLATE utf8_general_ci
 )
-BEGIN
+proc:BEGIN
 /**
  * Modifica el estado de un ticket si se cumplen las condiciones necesarias.
  *
  * @param vSelf el id del ticket
  * @param vStateCode estado a modificar del ticket
  */
-	DECLARE vticketAlertLevel INT;
-	DECLARE vTicketStateCode VARCHAR(255);
+	DECLARE vTicketAlertLevel INT;
+	DECLARE vTicketStateCode VARCHAR(255) COLLATE utf8_general_ci;
 	DECLARE vCanChangeState BOOL;
 	DECLARE vPackedAlertLevel INT;
 	DECLARE vZoneFk INT;
+	DECLARE vOldWorkerFk INT;
+	DECLARE vNewWorkerFk INT;
 
-	SELECT s.alertLevel, s.`code`, t.zoneFk
-		INTO vticketAlertLevel, vTicketStateCode,  vZoneFk
+	SET vNewWorkerFk = account.myUser_getId();
+
+	SELECT s.alertLevel, s.`code`, t.zoneFk, tt.userFk
+		INTO vTicketAlertLevel, vTicketStateCode, vZoneFk, vOldWorkerFk
 		FROM state s
 			JOIN ticketTracking tt ON tt.stateFk = s.id
 			JOIN ticket t ON t.id = tt.ticketFk
@@ -33,24 +37,27 @@ BEGIN
 
 	SET vCanChangeState = ((
 			vStateCode <> 'ON_CHECKING' AND vStateCode <> 'CHECKED') OR 
-			vticketAlertLevel < vPackedAlertLevel
-		)AND NOT (
+			vTicketAlertLevel < vPackedAlertLevel
+		) AND NOT (
 			vTicketStateCode IN ('CHECKED', 'CHECKING')
 			AND vStateCode IN ('PREPARED', 'ON_PREPARATION')
 		);
 
 	IF vCanChangeState THEN
-		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
-			SELECT id, vSelf, account.myUser_getId()
-				FROM state
-				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
-				
 		IF vStateCode = 'PACKED' THEN
 			CALL ticket_doCmr(vSelf);
 		END IF;
+
+		IF vStateCode = vTicketStateCode AND vOldWorkerFk = vNewWorkerFk THEN
+			LEAVE proc;
+		END IF;
+
+		INSERT INTO ticketTracking (stateFk, ticketFk, userFk)
+			SELECT id, vSelf, vNewWorkerFk
+				FROM state
+				WHERE `code` = vStateCode COLLATE utf8_unicode_ci;
 	ELSE
 		CALL util.throw('INCORRECT_TICKET_STATE');
 	END IF;
-	
 END$$
 DELIMITER ;

print/templates/reports/delivery-note/delivery-note.html

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