Merge branch 'dev' into 7195_roadmap2

2024-07-03 06:46:10 +00:00 · 2024-07-03 06:46:10 +00:00 · 7677ada925
parent 61265a45e3 d1a38ec589
commit 7677ada925
19 changed files with 73 additions and 92 deletions
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@ -3232,7 +3232,6 @@ INSERT IGNORE INTO vn.itemType
 		workerFk = 103,
 		isInventory = TRUE,
 		life = 10,
-		density = 250,
 		itemPackingTypeFk = NULL,
 		temperatureFk = 'warm';

--- a/db/routines/bi/procedures/rutasAnalyze.sql
+++ b/db/routines/bi/procedures/rutasAnalyze.sql
@ -59,7 +59,7 @@ BEGIN
 						JOIN vn.saleComponent sc ON sc.saleFk = s.id
 						JOIN vn.component c ON c.id = sc.componentFk
 						JOIN vn.componentType ct ON ct.id = c.typeFk
-					WHERE ct.code = 'FREIGHT'
+					WHERE ct.code = 'freight'
 						AND r.created BETWEEN vDatedFrom AND vDatedTo
 					GROUP BY r.id
 			 ) sub ON sub.routeFk = r.Id_Ruta
--- a/db/routines/bi/views/tarifa_componentes_series.sql
+++ b/db/routines/bi/views/tarifa_componentes_series.sql
@ -2,7 +2,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `bi`.`tarifa_componentes_series`
 AS SELECT `ct`.`id` AS `tarifa_componentes_series_id`,
-	`ct`.`type` AS `Serie`,
+	`ct`.`name` AS `Serie`,
 	`ct`.`isBase` AS `base`,
 	`ct`.`isMargin` AS `margen`
 FROM `vn`.`componentType` `ct`
--- a/db/routines/edi/procedures/ekt_refresh.sql
+++ b/db/routines/edi/procedures/ekt_refresh.sql
@ -7,7 +7,6 @@ BEGIN
 */
 	DECLARE vRewriteKop INT DEFAULT NULL;
 	DECLARE vTruncatePutOrder INT DEFAULT NULL;
-	DECLARE vBarcode CHAR(15) DEFAULT NULL;
 	DECLARE vKop INT;
 	DECLARE vPutOrderFk BIGINT;

@ -16,17 +15,6 @@ BEGIN
 		FROM ekt
 		WHERE id = vSelf;

-	-- Generates the barcode
-
-	SELECT CONCAT(
-				LPAD(IFNULL(auction,0), 3, 0),
-				LPAD(IFNULL(klo, 99), 2, 0),
-				LPAD(DAYOFYEAR(fec), 3, 0),
-				COALESCE(agj, RIGHT(batchNumber,7), id))
-			INTO vBarcode
-		FROM ekt
-		WHERE id = vSelf;
-
 	-- Rewrites the kop parameter

 	IF vKop IS NULL THEN
@ -46,10 +34,9 @@ BEGIN

 	-- Refresh EKT

-	UPDATE ekt SET
-		 barcode = vBarcode
-		,kop = vKop
-		,putOrderFk = vTruncatePutOrder
+	UPDATE ekt
+		SET kop = vKop,
+			putOrderFk = vTruncatePutOrder
 	WHERE id = vSelf;
 END$$
 DELIMITER ;
--- a/db/routines/edi/views/ektRecent.sql
+++ b/db/routines/edi/views/ektRecent.sql
@ -2,7 +2,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `edi`.`ektRecent`
 AS SELECT `e`.`id` AS `id`,
-	`e`.`barcode` AS `barcode`,
 	`e`.`entryYear` AS `entryYear`,
 	`e`.`batchNumber` AS `batchNumber`,
 	`e`.`deliveryNumber` AS `deliveryNumber`,
--- a/db/routines/vn/procedures/XDiario_check.sql
+++ b/db/routines/vn/procedures/XDiario_check.sql
@ -6,19 +6,6 @@ BEGIN
 * identificando y notificando los asientos descuadrados
 * y ajustando los saldos en caso necesario.
 */
-	INSERT INTO mail (receiver, subject, body)
-		SELECT 'cau@verdnatura.es', 
-				'Asientos descuadrados',
-				GROUP_CONCAT(CONCAT(' Asiento: ', ASIEN, ' - Importe:', recon) SEPARATOR ' | \n') 
-			FROM (
-				SELECT ASIEN,
-						SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
-					FROM XDiario
-					WHERE NOT enlazado
-					GROUP BY ASIEN
-					HAVING ABS(SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0))) > 0.01 
-			) sub
-			HAVING COUNT(*);

 	UPDATE XDiario xd
 			JOIN (
--- a/db/routines/vn/procedures/sale_PriceFix.sql
+++ b/db/routines/vn/procedures/sale_PriceFix.sql
@ -8,7 +8,7 @@ BEGIN
 			JOIN vn.component c ON c.id = sc.componentFk
 			JOIN vn.componentType ct ON ct.id = c.typeFk
 		WHERE s.ticketFk = vTicketFk
-			AND ct.`type` = 'otros';
+			AND ct.code = 'other';

 	UPDATE vn.sale s
 		JOIN (
--- a/db/routines/vn/procedures/ticket_checkNoComponents.sql
+++ b/db/routines/vn/procedures/ticket_checkNoComponents.sql
@ -20,7 +20,8 @@ BEGIN
 			JOIN itemCategory ic ON ic.id = tp.categoryFk
 			JOIN saleComponent sc ON sc.saleFk = s.id
 			JOIN component c ON c.id = sc.componentFk
-			JOIN componentType ct ON ct.id = c.typeFk AND ct.id = 1
+			JOIN componentType ct ON ct.id = c.typeFk
+				AND ct.code = 'cost'
 		WHERE t.shipped BETWEEN vShippedFrom AND vShippedTo
 			AND ic.merchandise;

--- a/db/routines/vn/procedures/ticket_getFromFloramondo.sql
+++ b/db/routines/vn/procedures/ticket_getFromFloramondo.sql
@ -66,7 +66,7 @@ BEGIN
 					JOIN vn.componentType ct ON ct.id = c.typeFk
 					JOIN vn.sale s ON s.id = sc.saleFk
 					JOIN tmp.ticket t ON t.ticketFk = s.ticketFk
-				WHERE ct.code = 'FREIGHT'
+				WHERE ct.code = 'freight'
 				GROUP BY t.ticketFk) sb ON sb.ticketFk = tf.ticketFk
 		SET tf.freight = sb.freight;

@ -88,7 +88,7 @@ BEGIN

 	-- Margin
 	UPDATE tmp.ticketFloramondo tf
-		JOIN (SELECT SUM(IF(ct.code = 'COST',sc.value, 0)) cost,
+		JOIN (SELECT SUM(IF(ct.code = 'cost',sc.value, 0)) cost,
 					SUM(IF(ct.isMargin, sc.value, 0)) margin,
 					t.ticketFk
 				FROM vn.saleComponent sc
--- a/db/routines/vn/views/saleCost.sql
+++ b/db/routines/vn/views/saleCost.sql
@ -19,4 +19,4 @@ FROM (
 		)
 		JOIN `vn`.`componentType` `ct` ON(`ct`.`id` = `c`.`typeFk`)
 	)
-WHERE `ct`.`type` = 'coste'
+WHERE `ct`.`code` = 'cost'
--- a/db/routines/vn/views/sale_freightComponent.sql
+++ b/db/routines/vn/views/sale_freightComponent.sql
@ -16,6 +16,6 @@ FROM (
 		)
 		JOIN `vn`.`componentType` `ct` ON(
 			`ct`.`id` = `c`.`typeFk`
-			AND `ct`.`type` = 'agencia'
+			AND `ct`.`code` = 'freight'
 		)
 	)
--- a/db/routines/vn2008/views/Tipos.sql
+++ b/db/routines/vn2008/views/Tipos.sql
@ -9,14 +9,9 @@ AS SELECT `it`.`id` AS `tipo_id`,
 	`it`.`workerFk` AS `Id_Trabajador`,
 	`it`.`life` AS `life`,
 	`it`.`isPackaging` AS `isPackaging`,
-	`it`.`density` AS `density`,
 	`it`.`isInventory` AS `inventory`,
 	`it`.`created` AS `odbc_date`,
 	`it`.`making` AS `confeccion`,
 	`it`.`temperatureFk` AS `Temperatura`,
-	`it`.`promo` AS `promo`,
-	`it`.`maneuver` AS `maneuver`,
-	`it`.`target` AS `target`,
-	`it`.`topMargin` AS `top_margin`,
-	`it`.`profit` AS `profit`
+	`it`.`promo` AS `promo`
 FROM `vn`.`itemType` `it`
--- a/db/routines/vn2008/views/buy_edi.sql
+++ b/db/routines/vn2008/views/buy_edi.sql
@ -2,7 +2,6 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	SQL SECURITY DEFINER
 	VIEW `vn2008`.`buy_edi`
 AS SELECT `t`.`id` AS `id`,
-	`t`.`barcode` AS `barcode`,
 	`t`.`entryYear` AS `entry_year`,
 	`t`.`deliveryNumber` AS `delivery_number`,
 	`t`.`fec` AS `fec`,
--- a/db/versions/11119-tealGerbera/00-firstScript.sql
+++ b/db/versions/11119-tealGerbera/00-firstScript.sql
@ -0,0 +1,9 @@
+ALTER TABLE vn.componentType
+    CHANGE code code varchar(20) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL AFTER id;
+ALTER TABLE vn.componentType
+    CHANGE `type` name varchar(45) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL;
+UPDATE IGNORE vn.componentType
+	SET code = LOWER(code);
+UPDATE IGNORE vn.componentType
+	SET code = 'other'
+	WHERE id = 12;
--- a/db/versions/11120-brownTulip/00-firstScript.sql
+++ b/db/versions/11120-brownTulip/00-firstScript.sql
@ -0,0 +1,6 @@
+ALTER TABLE vn.itemType
+    CHANGE maneuver maneuver__ double DEFAULT 0.21 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE target target__ double DEFAULT 0.15 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE topMargin topMargin__ double DEFAULT 0.3 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE profit profit__ double DEFAULT 0.02 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418',
+    CHANGE density density__ double DEFAULT 167 NOT NULL COMMENT '@deprecated 2024-07-01 refs #7418 Almacena el valor por defecto de la densidad en kg/m3 para el calculo de los portes aereos, en articulos se guarda la correcta';
--- a/modules/ticket/back/models/component-type.json
+++ b/modules/ticket/back/models/component-type.json
@ -12,7 +12,7 @@
            "type": "number",
            "description": "Identifier"
        },
-        "type": {
+        "name": {
            "type": "string"
        },
        "isBase":{
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@ -51,7 +51,7 @@
                        ng-repeat="saleComponent in sale.components track by saleComponent.componentFk"
                        class="components">
                        <td>
-                            {{::saleComponent.component.componentType.type}}
+                            {{::saleComponent.component.componentType.name}}
                        </td>
                        <td>
                            {{::saleComponent.component.name}}
--- a/modules/ticket/front/component/index.js
+++ b/modules/ticket/front/component/index.js
@ -20,7 +20,7 @@ class Controller extends Section {
                            include: {
                                relation: 'componentType',
                                scope: {
-                                    fields: ['type', 'isBase']
+                                    fields: ['name', 'isBase']
                                }
                            }
                        }
--- a/print/templates/reports/delivery-note/sql/sales.sql
+++ b/print/templates/reports/delivery-note/sql/sales.sql
@ -1,43 +1,42 @@
-SELECT 
-    s.id,
-    s.itemFk,
-    s.concept,
-    s.quantity,
-    s.price,
-    s.price - SUM(IF(ctr.id = 6, sc.value, 0)) netPrice,
-    s.discount,
-    i.size,
-    i.stems,
-    i.category,
-    it.id itemTypeId,
-    o.code AS origin,
-    i.inkFk,
-    s.ticketFk,
-    tcl.code vatType,
-    ib.ediBotanic botanical,
-    i.tag5, 
-    i.value5,
-    i.tag6, 
-    i.value6, 
-    i.tag7, 
-    i.value7
-FROM vn.sale s
-    LEFT JOIN saleComponent sc ON sc.saleFk = s.id
-    LEFT JOIN component cr ON cr.id = sc.componentFk
-    LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
-    LEFT JOIN item i ON i.id = s.itemFk
-    LEFT JOIN ticket t ON t.id = s.ticketFk
-    LEFT JOIN origin o ON o.id = i.originFk
-    LEFT JOIN country c ON c.id = o.countryFk
-    LEFT JOIN supplier sp ON sp.id = t.companyFk
-    LEFT JOIN itemType it ON it.id = i.typeFk
-    LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
-    LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id 
-        AND itc.countryFk = sp.countryFk 
-    LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
-    LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id
-        AND ic.code = 'plant'
-        AND ib.ediBotanic IS NOT NULL
-WHERE s.ticketFk = ?
-GROUP BY s.id
-ORDER BY (it.isPackaging), s.concept, s.itemFk
+SELECT s.id,
+		s.itemFk,
+		s.concept,
+		s.quantity,
+		s.price,
+		s.price - SUM(IF(ctr.code = 'freight', sc.value, 0)) netPrice,
+		s.discount,
+		i.size,
+		i.stems,
+		i.category,
+		it.id itemTypeId,
+		o.code origin,
+		i.inkFk,
+		s.ticketFk,
+		tcl.code vatType,
+		ib.ediBotanic botanical,
+		i.tag5, 
+		i.value5,
+		i.tag6, 
+		i.value6, 
+		i.tag7, 
+		i.value7
+	FROM vn.sale s
+		LEFT JOIN saleComponent sc ON sc.saleFk = s.id
+		LEFT JOIN component cr ON cr.id = sc.componentFk
+		LEFT JOIN componentType ctr ON ctr.id = cr.typeFk
+		LEFT JOIN item i ON i.id = s.itemFk
+		LEFT JOIN ticket t ON t.id = s.ticketFk
+		LEFT JOIN origin o ON o.id = i.originFk
+		LEFT JOIN country c ON c.id = o.countryFk
+		LEFT JOIN supplier sp ON sp.id = t.companyFk
+		LEFT JOIN itemType it ON it.id = i.typeFk
+		LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
+		LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id 
+			AND itc.countryFk = sp.countryFk 
+		LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
+		LEFT JOIN itemBotanicalWithGenus ib ON ib.itemFk = i.id
+			AND ic.code = 'plant'
+			AND ib.ediBotanic IS NOT NULL
+	WHERE s.ticketFk = ?
+	GROUP BY s.id
+	ORDER BY (it.isPackaging), s.concept, s.itemFk