CHANGELOG.md

@@ -1,3 +1,89 @@
+# Version 24.38 - 2024-09-17
+
+### Added 🆕
+
+- chore: refs #7323 filter data  by:jorgep
+- chore: refs #7323 fix test  by:jorgep
+- chore: refs #7323 worker changes  by:jorgep
+- chore: refs #7323 worker changes wip  by:jorgep
+- chore: refs #7524 add select limit  by:jorgep
+- feat(AccessToken&ACL): refs #7547 upgrade security  by:alexm
+- feat: deleted code and redirect to Lilium  by:Jon
+- feat: refs #4515 New throw buy_checkItem  by:guillermo
+- feat: refs #6650 Added saleGroupLog  by:guillermo
+- feat: refs #6650 new itemShelvingLog  by:guillermo
+- feat: refs #6760 refs #actualiza campo nickname  by:jgallego
+- feat: refs #7277 fdescribe  by:jgallego
+- feat: refs #7277 fit  by:jgallego
+- feat: refs #7277 refundInvoices  by:jgallego
+- feat: refs #7277 test with warehouse  by:jgallego
+- feat: refs #7277 traducciones  by:jgallego
+- feat: refs #7277 transfer addressFk  by:jgallego
+- feat: refs #7532 Requested changes  by:guillermo
+- feat: refs #7564 Added proc  by:guillermo
+- feat: refs #7564 Added ticket_setVolumeItemCost  by:guillermo
+- feat: refs #7564 Added volume column  by:guillermo
+- feat: refs #7564 Fix version  by:guillermo
+- feat: refs #7564 Requested changes  by:guillermo
+- feat: refs #7615 setDeleted  by:robert
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- feat: refs #7650 Fix tests  by:guillermo
+- feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval  by:ivanm
+- feat: refs #7759 Changed defined only of vn objects  by:guillermo
+- feat: refs #7759 Changed definer root to vn-admin  by:guillermo
+- feat: refs #7759 Changed name  by:guillermo
+- feat: refs #7759 Deleted version 11163-maroonEucalyptus  by:guillermo
+- feat: refs #7759 Revoke routine grants vn  by:guillermo
+- feat: refs #7811 Added comment  by:guillermo
+- feat: refs #7811 Added new params in datasources.json  by:guillermo
+- feat: refs #7898 Add column "floor" in vn.parking  by:ivanm
+- feat: refs #7898 Modify default  by:ivanm
+- feat: refs #7905 Added new method getBuysCsv  by:guillermo
+- feat: refs #7905 Added param toCsv  by:guillermo
+- feat: refs #7938 remove unnecessary insert in clientLog  by:alexm
+- feat: refs #7953 pullinfo  (7953-devToTest_2438) by:alexm
+- feat(salix): #7671 define isDestiny field in model  by:Javier Segarra
+- feat(salix): refs #7896 update version and changelog  (origin/7896_down_devToTest_2436) by:Javier Segarra
+- feat(salix): refs #7905 #7905 use getBuys toCSV flattened  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates  by:Javier Segarra
+- feat(ssalix): refs #7671 #7671 checkDates to present  by:Javier Segarra
+- feat: ticket 215005 Changed acl show transferClient  by:guillermo
+
+### Changed 📦
+
+- perf: refs #7671 improve showBadDates  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refactor: deleted e2e & added back descriptor and summary  by:Jon
+
+### Fixed 🛠️
+
+- chore: refs #7323 fix test  by:jorgep
+- feat: refs #7650 Added no transfer lines to inventory entry and fixtures  by:guillermo
+- fix  by:guillermo
+- fixes: refs #7760 collection problems  by:Carlos Andrés
+- fix merge dev  (7407-workerMedical) by:alexm
+- fix: refs #6727 No delete log tables data in clean procedures  by:guillermo
+- fix: refs #6897 back and tests  by:carlossa
+- fix: refs #6897 back  by:carlossa
+- fix: refs #6897 fix filter  by:carlossa
+- fix: refs #6897 fix json  by:carlossa
+- fix: refs #6897 travel filter  by:carlossa
+- fix: refs #6897 error test  by:jgallego
+- fix: refs #7323 fetch from right source  by:jorgep
+- fix: refs #7564 Deleted query  by:guillermo
+- fix: refs #7759 Added user 'vn'@'localhost' & grants  by:guillermo
+- fix: refs #7760 collection problems  by:Carlos Andrés
+- fix: refs #7760 tmp.ticketIPT  by:Carlos Andrés
+- fix: refs #7905 added comments to flatten.js  by:guillermo
+- fix: refs ##7905 Handle error  by:guillermo
+- fix(salix): refs #7905 #7905 use right fn to flatten data  by:Javier Segarra
+- perf(salix): refs #7671 #7671 imrpove and revert where changes  by:Javier Segarra
+- refs #6898 fix supplier remove  by:carlossa
+- refs #7407 fix acls fixtures  by:carlossa
+- test: fix connections e2e  (7547-accessToken-security) by:alexm
+- test: refs #7277 fix test proposal  by:Javier Segarra
+- test(salix): refs #7671 #7671 improve and revert where changes  by:Javier Segarra
+
 # Version 24.36 - 2024-09-03
 
 ### Added 🆕

db/dump/dump.after.sql

@@ -4,7 +4,9 @@ GRANT SELECT,
         INSERT,
         UPDATE,
         DELETE,
+        DROP,
         CREATE TEMPORARY TABLES,
         EXECUTE,
+        EVENT,
         TRIGGER
     ON *.* TO 'vn'@'localhost';

db/dump/fixtures.before.sql

@@ -1521,23 +1521,23 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed
 INSERT INTO `vn`.`entryConfig` (`defaultEntry`, `inventorySupplierFk`, `defaultSupplierFk`)
 	VALUES (2, 4, 1);
 
-INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleInternalWaste`, `saleExternalWaste`)
+INSERT INTO `bs`.`waste`(`buyerFk`, `year`, `week`, `itemFk`, `itemTypeFk`, `saleTotal`, `saleWasteQuantity`, `saleExternalWaste`, `saleFaultWaste`, `saleContainerWaste`, `saleBreakWaste`, `saleOtherWaste`)
     VALUES
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             1, 1, '1062',     '51',     '56.20',   '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             2, 1, '35074',    '687',    '53.12',   '89.69'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             3, 1, '1777',     '13',     '12.02',   '53.12'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             4, 1, '3182',     '59',     '51',      '56.20'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             5, 1, '1747',     '13',     '53.12',   '53.12'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             6, 1, '7182',     '59',     '51',      '53.12'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             7, 1, '1777',     '13',     '89.69',   '89.69'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             8, 1, '4181',     '59',     '53.12',   '53.12'),
-        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             9, 1, '7268',     '59',     '12.02',   '56.20'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 2, 1, '-74',      '0',      '51',      '89.69'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 3, 1, '-7',       '0',      '12.02',   '53.12'),
-        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 4, 1, '1100',     '0',      '51',      '56.20'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      5, 1, '848',      '-187',   '12.02',   '89.69'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12'),
-        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20');
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             1, 1, '1062',     '51',     '56.20',   '56.20',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             2, 1, '35074',    '687',    '53.12',   '89.69',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             3, 1, '1777',     '13',     '12.02',   '53.12',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             4, 1, '3182',     '59',     '51',      '56.20',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             5, 1, '1747',     '13',     '53.12',   '53.12',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             6, 1, '7182',     '59',     '51',      '53.12',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             7, 1, '1777',     '13',     '89.69',   '89.69',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             8, 1, '4181',     '59',     '53.12',   '53.12',   '56.20',   '56.20',   '56.20'),
+        ('35',        YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),             9, 1, '7268',     '59',     '12.02',   '56.20',   '56.20',   '56.20',   '56.20'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 2, 1, '-74',      '0',      '51',      '89.69',   '56.20',   '56.20',   '56.20'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 3, 1, '-7',       '0',      '12.02',   '53.12',   '56.20',   '56.20',   '56.20'),
+        ('103',   YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),                 4, 1, '1100',     '0',      '51',      '56.20',   '56.20',   '56.20',   '56.20'),
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      5, 1, '848',      '-187',   '12.02',   '89.69',   '56.20',   '56.20',   '56.20'),
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      6, 1, '186',      '0',      '51',      '53.12',   '56.20',   '56.20',   '56.20'),
+        ('103',              YEAR(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK)),   WEEK(DATE_ADD(util.VN_CURDATE(), INTERVAL -1 WEEK), 1),      7, 1, '277',      '0',      '53.12',   '56.20',   '56.20',   '56.20',   '56.20');
 
 INSERT INTO `vn`.`buy`(`id`,`entryFk`,`itemFk`,`buyingValue`,`quantity`,`packagingFk`,`stickers`,`freightValue`,`packageValue`,`comissionValue`,`packing`,`grouping`,`groupingMode`,`location`,`price1`,`price2`,`price3`, `printedStickers`,`isChecked`,`isIgnored`,`weight`, `created`)
     VALUES

db/routines/bs/procedures/waste_addSales.sql

@@ -14,16 +14,32 @@ BEGIN
 				s.itemFk,
 				SUM((b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity),
 				SUM(IF(aw.`type`, s.quantity, 0)),
-				SUM(
-					IF(
-						aw.`type` = 'internal',
+				SUM(IF(
+						aw.`type` = 'external',
 						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
 						0
 					)
 				),
-				SUM(
-					IF(
-						aw.`type` = 'external',
+				SUM(IF(
+						aw.`type` = 'fault',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'container',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'break',
+						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
+						0
+					)
+				),
+				SUM(IF(
+						aw.`type` = 'other',
 						(b.buyingValue + b.freightValue + b.comissionValue + b.packageValue) * s.quantity,
 						0
 					)

db/routines/vn/procedures/itemShelvingSale_addBySale.sql

@@ -75,6 +75,9 @@ proc: BEGIN
 				WHERE saleFk = vSaleFk;
 
 			IF vTotalReservedQuantity <> vSaleQuantity THEN
+			CALL util.debugAdd('itemShelvingSale_addBySale',
+				CONCAT(vSaleFk, ' - ', vSaleQuantity,' - ', vTotalReservedQuantity,'-', vOutStanding,'-', account.myUser_getId()));
+	
 				UPDATE sale 
 					SET quantity = vTotalReservedQuantity
 					WHERE id = vSaleFk;
@@ -93,7 +96,8 @@ proc: BEGIN
 		SET vOutStanding = vOutStanding - vReservedQuantity;
 		
 		IF vReservedQuantity > 0 THEN 
-
+	CALL util.debugAdd('itemShelvingSale_addBySale_reservedQuantity',
+				CONCAT(vSaleFk, ' - ', vReservedQuantity, ' - ', vOutStanding, account.myUser_getId()));
 			INSERT INTO itemShelvingSale(
 					itemShelvingFk,
 					saleFk,

db/routines/vn/procedures/item_getSimilar.sql

@@ -3,25 +3,24 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
     vSelf INT,
     vWarehouseFk INT,
     vDated DATE,
-	vShowType BOOL
+    vShowType BOOL,
+    vDaysInForward INT
 )
 BEGIN
 /**
-* Propone articulos disponibles ordenados, con la cantidad
+* Propone articulos ordenados, con la cantidad
 * de veces usado y segun sus caracteristicas.
 *
 * @param vSelf Id de artículo
 * @param vWarehouseFk Id de almacen
 * @param vDated Fecha
 * @param vShowType Mostrar tipos
+* @param vDaysInForward Días de alcance para las ventas
 */
     DECLARE vAvailableCalcFk INT;
-	DECLARE vVisibleCalcFk INT;
-	DECLARE vTypeFk INT;
     DECLARE vPriority INT DEFAULT 1;
 
     CALL cache.available_refresh(vAvailableCalcFk, FALSE, vWarehouseFk, vDated);
-	CALL cache.visible_refresh(vVisibleCalcFk, FALSE, vWarehouseFk);
 
     WITH itemTags AS (
         SELECT i.id,
@@ -41,8 +40,25 @@ BEGIN
 					AND it.priority = vPriority
 				LEFT JOIN vn.tag t ON t.id = it.tagFk
 			WHERE i.id = vSelf
+    ),
+    stock AS (
+        SELECT itemFk, SUM(visible) stock
+			FROM vn.itemShelvingStock
+			WHERE warehouseFk = vWarehouseFk
+			GROUP BY itemFk
+    ),
+    sold AS (
+        SELECT SUM(s.quantity) quantity, s.itemFk
+			FROM vn.sale s
+				JOIN vn.ticket t ON t.id = s.ticketFk
+				LEFT JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
+			WHERE t.shipped BETWEEN CURDATE() AND CURDATE() + INTERVAL vDaysInForward DAY
+				AND iss.saleFk IS NULL
+				AND t.warehouseFk = vWarehouseFk
+			GROUP BY s.itemFk
     )
     SELECT i.id itemFk,
+			CAST(sd.quantity AS INT) advanceable,
 			i.longName,
 			i.subName,
 			i.tag5,
@@ -64,13 +80,13 @@ BEGIN
 				WHEN b.groupingMode = 'packing' THEN b.packing
 				ELSE 1
 			END minQuantity,
-			v.visible located,
+			sk.stock located,
 			b.price2
 		FROM vn.item i
+			LEFT JOIN sold sd ON sd.itemFk = i.id
 			JOIN cache.available a ON a.item_id = i.id
 				AND a.calc_id = vAvailableCalcFk
-			LEFT JOIN cache.visible v ON v.item_id = i.id
-				AND v.calc_id = vVisibleCalcFk
+			LEFT JOIN stock sk ON sk.itemFk = i.id
 			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
 				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id
@@ -80,10 +96,11 @@ BEGIN
 			LEFT JOIN vn.tag t ON t.id = it.tagFk
 			LEFT JOIN vn.buy b ON b.id = lb.buy_id
 			JOIN itemTags its
-		WHERE a.available > 0
+		WHERE (a.available > 0 OR sd.quantity < sk.stock)
 			AND (i.typeFk = its.typeFk OR NOT vShowType)
 			AND i.id <> vSelf
-		ORDER BY `counter` DESC,
+		ORDER BY (a.available > 0) DESC,
+				`counter` DESC,
 				(t.name = its.name) DESC,
 				(it.value = its.value) DESC,
 				(i.tag5 = its.tag5) DESC,

db/routines/vn/procedures/productionControl.sql

@@ -276,7 +276,8 @@ proc: BEGIN
 			JOIN productionConfig pc
 		SET hasPlantTray = TRUE
 		WHERE ic.code = 'plant'
-			AND p.`depth` >= pc.minPlantTrayLength;		
+			AND p.`depth` >= pc.minPlantTrayLength
+			AND pb.isOwn;
 
 	DROP TEMPORARY TABLE
 		tmp.productionTicket,

db/routines/vn/procedures/ticket_splitItemPackingType.sql

@@ -10,6 +10,7 @@ BEGIN
  *
  * @param vSelf Id ticket
  * @param vOriginalItemPackingTypeFk Tipo empaquetado al que se mantiene el ticket original
+ * @return table tmp.ticketIPT(ticketFk, itemPackingTypeFk)
  */
 	DECLARE vDone INT DEFAULT FALSE;
 	DECLARE vHasItemPackingType BOOL;
@@ -72,6 +73,16 @@ BEGIN
 		SET s.ticketFk = stm.ticketFk
 		WHERE stm.ticketFk;
 
+	CREATE OR REPLACE TEMPORARY TABLE tmp.ticketIPT(
+		ticketFk INT,
+		itemPackingTypeFk VARCHAR(1)
+	) ENGINE=MEMORY
+		SELECT ticketFk, itemPackingTypeFk
+			FROM tSalesToMove
+			GROUP BY ticketFk
+		UNION
+		SELECT vSelf, vOriginalItemPackingTypeFk;
+
 	DROP TEMPORARY TABLE tSalesToMove;
 END$$
 DELIMITER ;

db/versions/11088-bronzeAspidistra/00-firstScript.sql

@@ -1,10 +1,10 @@
 ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY IF EXISTS collectionWagonTicket_tray;
 ALTER TABLE vn.wagonConfig DROP FOREIGN KEY IF EXISTS wagonConfig_wagonTypeColor_FK;
 CREATE OR REPLACE TABLE vn.wagonTypeTray (
-	id INT(11) UNSIGNED,
-	wagonTypeFk INT(11) unsigned NULL,
+	id INT(11) UNSIGNED auto_increment,
+	wagonTypeFk INT(11) UNSIGNED NULL,
 	height INT(11) UNSIGNED NULL,
-	wagonTypeColorFk int(11) unsigned NULL,
+	wagonTypeColorFk int(11) UNSIGNED NULL,
 	CONSTRAINT wagonTypeTray_pk PRIMARY KEY (id),
 	CONSTRAINT wagonTypeTray_wagonType_FK FOREIGN KEY (wagonTypeFk) REFERENCES vn.wagonType(id) ON DELETE CASCADE ON UPDATE RESTRICT,
 	CONSTRAINT wagonTypeTray_wagonTypeColor_FK FOREIGN KEY (wagonTypeColorFk) REFERENCES vn.wagonTypeColor(id)
@@ -14,6 +14,6 @@ DEFAULT CHARSET=utf8mb3
 COLLATE=utf8mb3_unicode_ci;
 
 ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultHeight INT UNSIGNED DEFAULT 0 NULL COMMENT 'Default height in cm for a base tray';
-ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultTrayColorFk int(11) unsigned NULL COMMENT 'Default color for a base tray';
+ALTER TABLE vn.wagonConfig ADD IF NOT EXISTS defaultTrayColorFk int(11) UNSIGNED NULL COMMENT 'Default color for a base tray';
 ALTER TABLE vn.wagonConfig ADD CONSTRAINT wagonConfig_wagonTypeColor_FK FOREIGN KEY (defaultTrayColorFk) REFERENCES vn.wagonTypeColor(id);
 ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_tray FOREIGN KEY (trayFk) REFERENCES vn.wagonTypeTray(id);

db/versions/11227-maroonEucalyptus/00-addWorkerTimeControlMailAcl.sql

@@ -0,0 +1,4 @@
+-- Place your SQL code here
+INSERT INTO salix.ACL (model, property, accessType, permission, principalType, principalId) 
+	VALUES ('WorkerTimeControlMail', 'count', 'READ', 'ALLOW', 'ROLE', 'employee'),
+		('Worker', '__get__mail', 'READ', 'ALLOW', 'ROLE', 'hr');

db/versions/11229-salmonAsparagus/00-firstScript.sql

@@ -1,3 +1,2 @@
--- Place your SQL code here
-ALTER TABLE vn.productionConfig ADD minPlantTrayLength INT DEFAULT 53 NOT NULL 
+ALTER TABLE vn.productionConfig ADD IF NOT EXISTS minPlantTrayLength INT DEFAULT 53 NOT NULL
 COMMENT 'minimum length for plant tray restriction. Avoid to make collection of the ticket with this kind of item';

db/versions/11234-yellowRuscus/00-firstScript.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `vn`.`payrollWorkCenter` DROP PRIMARY KEY;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `empresa_id__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `Centro__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `nss_cotizacion__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `domicilio__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `poblacion__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `cp__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `nss__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codpuesto__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codcontrato__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `FAntiguedad__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codcategoria__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `ContratoTemporal__`;

db/versions/11235-purpleCordyline/00-firstScript.sql

@@ -0,0 +1,12 @@
+ALTER TABLE vn.collectionWagon DROP FOREIGN KEY IF EXISTS collectionWagon_FK_1;
+ALTER TABLE vn.collectionWagonTicket DROP FOREIGN KEY IF EXISTS collectionWagonTicket_FK_1;
+ALTER TABLE vn.wagonVolumetry DROP FOREIGN KEY IF EXISTS wagonVolumetry_FK_1;
+
+ALTER TABLE vn.wagon MODIFY COLUMN id int(11) unsigned auto_increment NOT NULL COMMENT '26 letras de alfabeto inglés';
+ALTER TABLE vn.collectionWagon MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+ALTER TABLE vn.collectionWagonTicket MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+ALTER TABLE vn.wagonVolumetry MODIFY COLUMN wagonFk int(11) unsigned NOT NULL;
+
+ALTER TABLE vn.collectionWagon ADD CONSTRAINT collectionWagon_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.collectionWagonTicket ADD CONSTRAINT collectionWagonTicket_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE vn.wagonVolumetry ADD CONSTRAINT wagonVolumetry_FK_1 FOREIGN KEY (wagonFk) REFERENCES vn.wagon(id) ON DELETE RESTRICT ON UPDATE CASCADE;

db/versions/11236-blackMedeola/00-firstScript.sql

@@ -0,0 +1,19 @@
+ALTER TABLE vn.addressWaste
+    MODIFY COLUMN `type` enum('external', 'fault', 'container', 'break', 'other')
+        CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+
+UPDATE vn.addressWaste
+	SET `type`='container'
+	WHERE addressFk=77;
+
+UPDATE vn.addressWaste
+	SET `type`='fault'
+	WHERE addressFk=317;
+
+UPDATE vn.addressWaste
+	SET `type`='break'
+	WHERE addressFk=57702;
+
+UPDATE vn.addressWaste
+	SET `type`='other'
+	WHERE addressFk=43432;

db/versions/11236-blackMedeola/01-firstScript.sql

@@ -0,0 +1,6 @@
+ALTER TABLE bs.waste
+    DROP COLUMN saleInternalWaste,
+    ADD saleFaultWaste decimal(10,2) DEFAULT NULL NULL,
+    ADD saleContainerWaste decimal(10,2) DEFAULT NULL NULL,
+    ADD saleBreakWaste decimal(10,2) DEFAULT NULL NULL,
+    ADD saleOtherWaste decimal(10,2) DEFAULT NULL NULL;

modules/item/back/methods/item/getWasteByItem.js

@@ -52,7 +52,13 @@ module.exports = Self => {
                             it.name family,
                             w.itemFk,
                             SUM(w.saleTotal) total,
-                            SUM(w.saleInternalWaste + w.saleExternalWaste) dwindle
+                            SUM(
+                                w.saleExternalWaste +
+                                w.saleFaultWaste +
+                                w.saleContainerWaste +
+                                w.saleBreakWaste +
+                                w.saleOtherWaste
+                            ) dwindle
                         FROM bs.waste w
                             JOIN account.user u ON u.id = w.buyerFk
                             JOIN vn.itemType it ON it.id = w.itemTypeFk

modules/item/back/methods/item/getWasteByWorker.js

@@ -28,7 +28,13 @@ module.exports = Self => {
                             it.name family,
                             w.itemFk,
                             SUM(w.saleTotal) total,
-                            SUM(w.saleInternalWaste + w.saleExternalWaste) dwindle
+                            SUM(
+                                w.saleExternalWaste +
+                                w.saleFaultWaste +
+                                w.saleContainerWaste +
+                                w.saleBreakWaste +
+                                w.saleOtherWaste
+                            ) dwindle
                         FROM bs.waste w
                             JOIN account.user u ON u.id = w.buyerFk
                             JOIN vn.itemType it ON it.id = w.itemTypeFk
@@ -44,7 +50,13 @@ module.exports = Self => {
                 FROM (
                     SELECT u.name buyer,
                             SUM(w.saleTotal) total,
-                            SUM(w.saleInternalWaste + w.saleExternalWaste) dwindle
+                            SUM(
+                                w.saleExternalWaste +
+                                w.saleFaultWaste +
+                                w.saleContainerWaste +
+                                w.saleBreakWaste +
+                                w.saleOtherWaste
+                            ) dwindle
                         FROM bs.waste w
                             JOIN account.user u ON u.id = w.buyerFk
                         WHERE w.year = YEAR(TIMESTAMPADD(WEEK, -1, ?))

modules/worker/back/models/worker-time-control-mail.json

@@ -32,13 +32,5 @@
         "sendedCounter": {
             "type": "number"
         }
-    },
-    "acls": [
-      {
-        "accessType": "READ",
-        "principalType": "ROLE",
-        "principalId": "employee",
-        "permission": "ALLOW"
     }
-    ]
 }

modules/worker/back/models/worker.json

@@ -130,6 +130,11 @@
             "type": "hasMany",
             "model": "TrainingCourse",
             "foreignKey": "workerFk"
+        },
+        "mail": {
+            "type": "hasMany",
+            "model": "WorkerTimeControlMail",
+            "foreignKey": "workerFk"
         }
     },
     "acls": [
@@ -139,6 +144,13 @@
             "permission": "ALLOW",
             "principalType": "ROLE",
             "principalId": "$owner"
+        },
+        {
+            "property": "__get__mail",
+            "accessType": "READ",
+            "permission": "ALLOW",
+            "principalType": "ROLE",
+            "principalId": "$owner"
         }
     ],
     "scopes": {

print/templates/email/buyer-week-waste/sql/wasteWeekly.sql

@@ -1,8 +1,14 @@
 SELECT *, 100 * dwindle / total `percentage`
 	FROM (
 		SELECT u.name buyer,
-				SUM(saleTotal) total,
-				SUM(w.saleInternalWaste + w.saleExternalWaste) dwindle
+				SUM(w.saleTotal) total,
+				SUM(
+					w.saleExternalWaste +
+					w.saleFaultWaste +
+					w.saleContainerWaste +
+					w.saleBreakWaste +
+					w.saleOtherWaste
+				) dwindle
 			FROM bs.waste w
 				JOIN account.user u ON u.id = w.buyerFk
 				JOIN vn.itemType it ON it.id = w.itemTypeFk