Merge branch 'test' into dev

db/routines/vn/procedures/entry_splitByShelving.sql

@@ -23,12 +23,13 @@ BEGIN
 				LEAST(bb.stickers, FLOOR(ish.visible / ish.packing)) ishStickers,
 				bb.stickers buyStickers
 			FROM itemShelving ish
+				JOIN shelving sh ON sh.id = ish.shelvingFk
 				JOIN (SELECT b.id, b.itemFk, b.stickers 
 						FROM buy b
 						WHERE b.entryFk = vFromEntryFk
 						ORDER BY b.stickers DESC
 						LIMIT 10000000000000000000) bb ON bb.itemFk = ish.itemFk
-			WHERE ish.shelvingFk = vShelvingCode COLLATE utf8_general_ci
+			WHERE sh.code = vShelvingCode COLLATE utf8_general_ci
 				AND NOT ish.isSplit
 			GROUP BY ish.id;
 			

db/routines/vn/triggers/travel_beforeUpdate.sql

@@ -20,10 +20,6 @@ BEGIN
 		CALL travel_checkWarehouseIsFeedStock(NEW.warehouseInFk);
 	END IF;
 
-	IF NOT (NEW.isRaid <=> OLD.isRaid)  OR NOT (NEW.daysInForward <=> OLD.daysInForward) THEN
-		CALL travel_checkRaid(NEW.isRaid, NEW.daysInForward);
-	END IF;
-
 	IF NOT (NEW.awbFk <=> OLD.awbFk)THEN
 		SELECT COUNT(*) INTO vHasAnyInvoiceBooked
 			FROM travel t

print/templates/reports/buy-label-barcode/buy-label-barcode.html

@@ -38,7 +38,7 @@
 			<tr>
 				<td class="md-txt xl-width bold center">
 					<div class="overflow-line">
-						{{buy.itemFk}}
+						{{formatNumber(buy.itemFk)}}
 					</div>
 				</td>
 				<td colspan="2" class="md-txt md-width center">
@@ -56,7 +56,7 @@
 						{{'LAID'}}
 					</div>
 					<div v-else class="overflow-line">
-						{{buy.entryFk}}
+						{{formatNumber(buy.entryFk)}}
 					</div>
 				</td>
 			</tr>
@@ -73,17 +73,17 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="center xl-width">
+				<td class="center xs-txt xl-width">
 					<div class="overflow-line">
-						{{buy.buyFk}}
+						{{formatNumber(buy.buyFk)}}
 					</div>
 				</td>
-				<td class="xs-txt sm-width center">
+				<td class="center xs-txt sm-width">
 					<div class="overflow-line">
 						{{date}}
 					</div>
 				</td>
-				<td class="xs-txt sm-width cursive center bold">
+				<td class="cursive center bold xs-txt sm-width">
 					<div class="overflow-line">
 						{{`${buy.labelNum}/${buy.quantity / (packing || buy.packing)}`}}
 					</div>

print/templates/reports/buy-label-barcode/buy-label-barcode.js

@@ -9,7 +9,7 @@ module.exports = {
         this.date = Date.vnNew();
         this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
         if (!this.buys.length) throw new UserError(`Empty data source`);
-        this.date = moment(this.date).format('WW/E');
+        this.date = moment(this.date).format('WW/DD');
     },
     methods: {
         getBarcode(data) {
@@ -25,6 +25,9 @@ module.exports = {
                 margin: 0
             });
             return new XMLSerializer().serializeToString(svgNode);
+        },
+        formatNumber(number) {
+            return new Intl.NumberFormat('es-ES', {maximumFractionDigits: 0}).format(number);
         }
     },
     props: {

print/templates/reports/buy-label-qr/assets/css/style.css

@@ -34,6 +34,9 @@ html {
     background-color: black;
     color: white;
 }
+.sm-txt {
+    font-size: 18px;
+}
 .md-txt {
     font-size: 20px;
 }

print/templates/reports/buy-label-qr/buy-label-qr.html

@@ -11,8 +11,8 @@
 				</td>
 			</tr>
 			<tr>
-				<td colspan="2">
+				<td colspan="2" class="sm-txt">
-					{{buy.buyFk}}
+					{{formatNumber(buy.buyFk)}}
 				</td>
 			</tr>
 			<tr>
@@ -28,7 +28,7 @@
 		<tr>
 			<td colspan="3" class="lg-width black-bg center bold xl-txt padding">
 				<div class="overflow-line">
-					{{buy.itemFk}}
+					{{formatNumber(buy.itemFk)}}
 				</div>
 			</td>
 		</tr>
@@ -78,8 +78,7 @@
 				<div v-if="buy.isLaid && typeId === 'buy'" class="overflow-line black-bg bold">
 					{{'LAID'}}
 				</div>
-				<div v-else class="overflow-line">
+				<div v-else class="overflow-line xs-txt">
-					{{buy.entryFk}}
 				</div>
 			</td>
 		</tr>
@@ -103,7 +102,7 @@
 		<tr>
 			<td class="sm-width">
 				<div class="overflow-line">
-					<i>Entrada:</i> {{buy.entryFk}}
+					<i>Entrada:</i> {{formatNumber(buy.entryFk)}}
 				</div>
 			</td>
 		</tr>

print/templates/reports/buy-label-qr/buy-label-qr.js

@@ -9,7 +9,7 @@ module.exports = {
         this.buys = await this.rawSqlFromDef('buy', [this.copies || 1, this.id]);
         if (!this.buys.length) throw new UserError(`Empty data source`);
         this.qr = await this.getQr(this.buys[0].buyFk);
-        this.date = moment(this.date).format('WW/E');
+        this.date = moment(this.date).format('WW/DD');
     },
     methods: {
         getQr(data) {
@@ -24,6 +24,9 @@ module.exports = {
                 margin: 0,
                 errorCorrectionLevel: 'L'
             });
+        },
+        formatNumber(number) {
+            return new Intl.NumberFormat('es-ES', {maximumFractionDigits: 0}).format(number);
         }
     },
     props: {