Merge branch 'dev' into 7709-supplierPackaging_ReportSource_2

Reviewed-on: #3174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

db/dump/fixtures.before.sql

@@ -2476,7 +2476,8 @@ INSERT INTO `vn`.`dmsType`
         (20, 	'Reclamación',         	1,      		1,      		'claim'),
         (21, 	'Entrada',             	1,      		1,      		'entry'),
 		(22, 	'Proveedor',           	1,      		1,      		'supplier'),
-		(23, 	'Termografos',			35,    			35,    			'thermograph');
+		(23, 	'Termografos',			35,    			35,    			'thermograph'),
+		(24, 	'Sello de calidad',		1,    			1,    			'qualitySeal');
 
 INSERT INTO `vn`.`dms`(`id`, `dmsTypeFk`, `file`, `contentType`, `workerFk`, `warehouseFk`, `companyFk`, `hardCopyNumber`, `hasFile`, `reference`, `description`, `created`)
     VALUES
@@ -2954,9 +2955,9 @@ INSERT INTO `vn`.`routeConfig` (`id`, `defaultWorkCenterFk`)
     VALUES
         (1, 9);
 
-INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`)
+INSERT INTO `vn`.`productionConfig` (`isPreviousPreparationRequired`, `ticketPrintedMax`, `ticketTrolleyMax`, `rookieDays`, `notBuyingMonths`, `id`, `isZoneClosedByExpeditionActivated`, `maxNotReadyCollections`, `minTicketsToCloseZone`, `movingTicketDelRoute`, `defaultZone`, `defautlAgencyMode`, `hasUniqueCollectionTime`, `maxCollectionWithoutUser`, `pendingCollectionsOrder`, `pendingCollectionsAge`, `backupPrinterNotificationDelay`, `clientSelfConsumptionFk`, `addressSelfConsumptionFk`)
     VALUES
-        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600);
+        (0, 8, 80, 0, 0, 1, 0, 15, 25, -1, 697, 1328, 0, 1, 8, 6, 3600, 1112, 12);
 
 INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPackingTypeFk`, `saleTotalCount`, `salePickedCount`, `trainFk`, `sectorFk`, `wagons`)
     VALUES

db/routines/vn/procedures/clean.sql

@@ -56,7 +56,7 @@ BEGIN
 			AND ts.id IS NULL;
 	DELETE FROM claim WHERE ticketCreated < v4Years;
 	-- Robert ubicacion anterior de travelLog comentario para debug
-	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
+	DELETE FROM zoneEvent WHERE dated < v2Months OR ended < v2Months;
 	DELETE b FROM buy b
 			JOIN entryConfig e ON e.defaultEntry = b.entryFk
 		WHERE b.created < v2Months;

db/routines/vn/procedures/collection_new.sql

@@ -146,8 +146,6 @@ BEGIN
 		DELETE pb
 			FROM tmp.productionBuffer pb
 				JOIN state s ON s.id = pb.state
-				JOIN agencyMode am ON am.id = pb.agencyModeFk
-				JOIN agency a ON a.id = am.agencyFk
 				LEFT JOIN (
 					SELECT pb.ticketFk, MAX(i.`size`) maxSize
 						FROM tmp.productionBuffer pb
@@ -158,7 +156,7 @@ BEGIN
 				) sub ON sub.ticketFk = pb.ticketFk
 				JOIN productionConfig pc
 			WHERE pb.shipped <> util.VN_CURDATE()
-				OR (pb.ubicacion IS NULL AND a.isOwn)
+				OR pb.ubicacion IS NULL
 				OR (NOT s.isPreparable AND NOT s.isPrintable)
 				OR pb.collectionH IS NOT NULL
 				OR pb.collectionV IS NOT NULL

db/routines/vn/triggers/expedition_afterDelete.sql

@@ -8,7 +8,5 @@ BEGIN
 			`changedModel` = 'Expedition',
 			`changedModelId` = OLD.id,
 			`userFk` = account.myUser_getId();
-	
-	CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
 END$$
 DELIMITER ;

db/routines/vn/triggers/expedition_beforeDelete.sql

@@ -8,5 +8,6 @@ BEGIN
 		FROM expedition e WHERE e.ticketFk = OLD.ticketFk and e.freightItemFk)
 		WHERE t.id = OLD.ticketFk;	
 
+	CALL expedition_selfConsumptionPackaging(OLD.id, 'remove');
 END$$
 DELIMITER ;

db/versions/11331-bronzeBirch/00-firstScript.sql

@@ -0,0 +1,2 @@
+ALTER TABLE vn.supplier ADD companySize ENUM('small', 'medium', 'big') NULL;
+

modules/supplier/back/methods/supplier/getSummary.js

@@ -43,7 +43,8 @@ module.exports = Self => {
                 'sageWithholdingFk',
                 'workerFk',
                 'supplierActivityFk',
-                'healthRegister'
+                'healthRegister',
+                'companySize'
             ],
             include: [
                 {

modules/supplier/back/models/supplier.json

@@ -113,6 +113,9 @@
         },
         "isVies": {
             "type": "boolean"
+        },
+        "companySize": {
+            "type": "string"
         }
     },
     "relations": {