diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index b27bc8ef6..83367761a 100644
--- 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';
diff --git a/db/routines/bi/procedures/rutasAnalyze.sql b/db/routines/bi/procedures/rutasAnalyze.sql
index 5f0d55c7a..e277968bf 100644
--- 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
diff --git a/db/routines/bi/views/tarifa_componentes_series.sql b/db/routines/bi/views/tarifa_componentes_series.sql
index f231ae420..ed2f8e29a 100644
--- 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`
diff --git a/db/routines/edi/procedures/ekt_refresh.sql b/db/routines/edi/procedures/ekt_refresh.sql
index 0e9ed7d3c..8ba438c0a 100644
--- 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 ;
diff --git a/db/routines/edi/views/ektRecent.sql b/db/routines/edi/views/ektRecent.sql
index 3e41490ab..66ff7875e 100644
--- 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`,
diff --git a/db/routines/vn/procedures/sale_PriceFix.sql b/db/routines/vn/procedures/sale_PriceFix.sql
index 8ffa77070..5f956cba8 100644
--- 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 (
diff --git a/db/routines/vn/procedures/ticket_checkNoComponents.sql b/db/routines/vn/procedures/ticket_checkNoComponents.sql
index 28fe333f0..b03427192 100644
--- 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;
diff --git a/db/routines/vn/procedures/ticket_getFromFloramondo.sql b/db/routines/vn/procedures/ticket_getFromFloramondo.sql
index 4d83d6dda..5f2bedbb1 100644
--- 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
diff --git a/db/routines/vn/views/saleCost.sql b/db/routines/vn/views/saleCost.sql
index 27265aa93..304b9e3a3 100644
--- 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'
diff --git a/db/routines/vn/views/sale_freightComponent.sql b/db/routines/vn/views/sale_freightComponent.sql
index 7a329e0ee..269a8cca1 100644
--- 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'
)
)
diff --git a/db/routines/vn2008/views/Tipos.sql b/db/routines/vn2008/views/Tipos.sql
index 4cde954f1..5b96c1766 100644
--- 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`
diff --git a/db/routines/vn2008/views/buy_edi.sql b/db/routines/vn2008/views/buy_edi.sql
index 0d194c89e..d00196e95 100644
--- 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`,
diff --git a/db/versions/11119-tealGerbera/00-firstScript.sql b/db/versions/11119-tealGerbera/00-firstScript.sql
new file mode 100644
index 000000000..40b3b0424
--- /dev/null
+++ 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;
\ No newline at end of file
diff --git a/db/versions/11120-brownTulip/00-firstScript.sql b/db/versions/11120-brownTulip/00-firstScript.sql
new file mode 100644
index 000000000..c4ded80bb
--- /dev/null
+++ 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';
\ No newline at end of file
diff --git a/modules/ticket/back/models/component-type.json b/modules/ticket/back/models/component-type.json
index 26daf5216..735227a35 100644
--- 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":{
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index 39b54b461..2a3a80f3e 100644
--- 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">
|
- {{::saleComponent.component.componentType.type}}
+ {{::saleComponent.component.componentType.name}}
|
{{::saleComponent.component.name}}
diff --git a/modules/ticket/front/component/index.js b/modules/ticket/front/component/index.js
index 3f262f457..aa755e808 100644
--- 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']
}
}
}
diff --git a/print/templates/reports/delivery-note/sql/sales.sql b/print/templates/reports/delivery-note/sql/sales.sql
index c449030cf..636bbc228 100644
--- 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
\ No newline at end of file
+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
\ No newline at end of file
|