From bf84863237e64040ebaec4b4fa933bd7bff88b72 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 2 Nov 2023 08:42:53 +0100
Subject: [PATCH] refs #6376 fix: changelog

---
 CHANGELOG.md                              |  7 +--
 db/changes/234201/00-packagingFkviews.sql | 74 ++++++++++++-----------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d677b80e34..69f9f63b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,20 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2342.01] - 2023-10-19
+## [2342.01] - 2023-11-02
 
 ### Added
+- (Usuarios -> Foto) Se muestra la foto del trabajador
 ### Changed
 ### Fixed
+- (Usuarios -> Historial) Abre el descriptor del usuario correctamente
 
 ## [2340.01] - 2023-10-05
 
 ### Added
-- (Usuarios -> Foto) Se muestra la foto del trabajador
-
 ### Changed
 ### Fixed
-- (Usuarios -> Historial) Abre el descriptor del usuario correctamente
 
 ## [2338.01] - 2023-09-21
 
diff --git a/db/changes/234201/00-packagingFkviews.sql b/db/changes/234201/00-packagingFkviews.sql
index f355325f3e..abc7dc004f 100644
--- a/db/changes/234201/00-packagingFkviews.sql
+++ b/db/changes/234201/00-packagingFkviews.sql
@@ -1,3 +1,41 @@
+CREATE OR REPLACE DEFINER=`root`@`localhost`
+	SQL SECURITY DEFINER
+	VIEW `vn`.`awbVolume`
+AS SELECT `d`.`awbFk` AS `awbFk`,
+	`b`.`stickers` * `i`.`density` * IF(
+		`p`.`volume` > 0,
+		`p`.`volume`,
+		`p`.`width` * `p`.`depth` * IF(`p`.`height` = 0, `i`.`size` + 10, `p`.`height`)
+	) / (`vc`.`aerealVolumetricDensity` * 1000) AS `volume`,
+	`b`.`id` AS `buyFk`
+FROM (
+		(
+			(
+				(
+					(
+						(
+							(
+								(
+									`vn`.`buy` `b`
+									JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`)
+								)
+								JOIN `vn`.`itemType` `it` ON(`i`.`typeFk` = `it`.`id`)
+							)
+							JOIN `vn`.`packaging` `p` ON(`p`.`id` = `b`.`packagingFk`)
+						)
+						JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`)
+					)
+					JOIN `vn`.`travel` `t` ON(`t`.`id` = `e`.`travelFk`)
+				)
+				JOIN `vn`.`duaEntry` `de` ON(`de`.`entryFk` = `e`.`id`)
+			)
+			JOIN `vn`.`dua` `d` ON(`d`.`id` = `de`.`duaFk`)
+		)
+		JOIN `vn`.`volumeConfig` `vc`
+	)
+WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1);
+
+
 CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn2008`.`Compres`
@@ -108,39 +146,3 @@ FROM (
 		LEFT JOIN `edi`.`supplier` `s` ON(`e`.`pro` = `s`.`supplier_id`)
 	);
 
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn`.`awbVolume`
-AS SELECT `d`.`awbFk` AS `awbFk`,
-	`b`.`stickers` * `i`.`density` * IF(
-		`p`.`volume` > 0,
-		`p`.`volume`,
-		`p`.`width` * `p`.`depth` * IF(`p`.`height` = 0, `i`.`size` + 10, `p`.`height`)
-	) / (`vc`.`aerealVolumetricDensity` * 1000) AS `volume`,
-	`b`.`id` AS `buyFk`
-FROM (
-		(
-			(
-				(
-					(
-						(
-							(
-								(
-									`vn`.`buy` `b`
-									JOIN `vn`.`item` `i` ON(`b`.`itemFk` = `i`.`id`)
-								)
-								JOIN `vn`.`itemType` `it` ON(`i`.`typeFk` = `it`.`id`)
-							)
-							JOIN `vn`.`packaging` `p` ON(`p`.`id` = `b`.`packagingFk`)
-						)
-						JOIN `vn`.`entry` `e` ON(`b`.`entryFk` = `e`.`id`)
-					)
-					JOIN `vn`.`travel` `t` ON(`t`.`id` = `e`.`travelFk`)
-				)
-				JOIN `vn`.`duaEntry` `de` ON(`de`.`entryFk` = `e`.`id`)
-			)
-			JOIN `vn`.`dua` `d` ON(`d`.`id` = `de`.`duaFk`)
-		)
-		JOIN `vn`.`volumeConfig` `vc`
-	)
-WHERE `t`.`shipped` > makedate(year(`util`.`VN_CURDATE`()) - 1, 1);
\ No newline at end of file