From 8616b33c339163a5d997464aeaf5af2b602b4e78 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 31 Jan 2024 11:12:16 +0100 Subject: [PATCH 1/2] feat: refs #6691 delete view vn2008 part8 --- db/routines/vn2008/views/tr2.sql | 19 --------- .../vn2008/views/travel_thermograph.sql | 11 ----- db/routines/vn2008/views/v_account.sql | 5 --- .../vn2008/views/v_analisis_ventas.sql | 15 ------- db/routines/vn2008/views/v_barcodes.sql | 21 ---------- .../vn2008/views/v_departure_limit.sql | 8 ---- .../vn2008/views/v_descuadre_bionic.sql | 41 ------------------- db/routines/vn2008/views/v_inter.sql | 11 ----- db/routines/vn2008/views/v_miriam.sql | 23 ----------- db/routines/vn2008/views/v_price_fixed.sql | 35 ---------------- 10 files changed, 189 deletions(-) delete mode 100644 db/routines/vn2008/views/tr2.sql delete mode 100644 db/routines/vn2008/views/travel_thermograph.sql delete mode 100644 db/routines/vn2008/views/v_account.sql delete mode 100644 db/routines/vn2008/views/v_analisis_ventas.sql delete mode 100644 db/routines/vn2008/views/v_barcodes.sql delete mode 100644 db/routines/vn2008/views/v_departure_limit.sql delete mode 100644 db/routines/vn2008/views/v_descuadre_bionic.sql delete mode 100644 db/routines/vn2008/views/v_inter.sql delete mode 100644 db/routines/vn2008/views/v_miriam.sql delete mode 100644 db/routines/vn2008/views/v_price_fixed.sql diff --git a/db/routines/vn2008/views/tr2.sql b/db/routines/vn2008/views/tr2.sql deleted file mode 100644 index e3b42c59a..000000000 --- a/db/routines/vn2008/views/tr2.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`tr2` -AS SELECT `vn`.`travel`.`id` AS `id`, - `vn`.`travel`.`shipped` AS `shipped`, - `vn`.`travel`.`shipmentHour` AS `shipmentHour`, - `vn`.`travel`.`landed` AS `landed`, - `vn`.`travel`.`landingHour` AS `landingHour`, - `vn`.`travel`.`warehouseInFk` AS `warehouseInFk`, - `vn`.`travel`.`warehouseOutFk` AS `warehouseOutFk`, - `vn`.`travel`.`agencyModeFk` AS `agencyFk`, - `vn`.`travel`.`ref` AS `ref`, - `vn`.`travel`.`isDelivered` AS `isDelivered`, - `vn`.`travel`.`isReceived` AS `isReceived`, - `vn`.`travel`.`m3` AS `m3`, - `vn`.`travel`.`kg` AS `kg`, - `vn`.`travel`.`cargoSupplierFk` AS `cargoSupplierFk`, - `vn`.`travel`.`totalEntries` AS `totalEntries` -FROM `vn`.`travel` diff --git a/db/routines/vn2008/views/travel_thermograph.sql b/db/routines/vn2008/views/travel_thermograph.sql deleted file mode 100644 index e6f5ce954..000000000 --- a/db/routines/vn2008/views/travel_thermograph.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`travel_thermograph` -AS SELECT `tt`.`thermographFk` AS `thermograph_id`, - `tt`.`created` AS `odbc_date`, - `tt`.`warehouseFk` AS `warehouse_id`, - `tt`.`travelFk` AS `travel_id`, - `tt`.`temperatureFk` AS `temperature`, - `tt`.`result` AS `result`, - `tt`.`dmsFk` AS `gestdoc_id` -FROM `vn`.`travelThermograph` `tt` diff --git a/db/routines/vn2008/views/v_account.sql b/db/routines/vn2008/views/v_account.sql deleted file mode 100644 index 51333f639..000000000 --- a/db/routines/vn2008/views/v_account.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_account` -AS SELECT `a`.`id` AS `user_id` -FROM `account`.`account` `a` diff --git a/db/routines/vn2008/views/v_analisis_ventas.sql b/db/routines/vn2008/views/v_analisis_ventas.sql deleted file mode 100644 index d95e5d274..000000000 --- a/db/routines/vn2008/views/v_analisis_ventas.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_analisis_ventas` -AS SELECT `bi`.`analisis_ventas`.`Familia` AS `Familia`, - `bi`.`analisis_ventas`.`Reino` AS `Reino`, - `bi`.`analisis_ventas`.`Comercial` AS `Comercial`, - `bi`.`analisis_ventas`.`Comprador` AS `Comprador`, - `bi`.`analisis_ventas`.`Provincia` AS `Provincia`, - `bi`.`analisis_ventas`.`almacen` AS `almacen`, - `bi`.`analisis_ventas`.`Año` AS `Año`, - `bi`.`analisis_ventas`.`Mes` AS `Mes`, - `bi`.`analisis_ventas`.`Semana` AS `Semana`, - `bi`.`analisis_ventas`.`Vista` AS `Vista`, - `bi`.`analisis_ventas`.`Importe` AS `Importe` -FROM `bi`.`analisis_ventas` diff --git a/db/routines/vn2008/views/v_barcodes.sql b/db/routines/vn2008/views/v_barcodes.sql deleted file mode 100644 index b86af8c6b..000000000 --- a/db/routines/vn2008/views/v_barcodes.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_barcodes` -AS SELECT `Articles`.`Id_Article` AS `code`, - `Articles`.`Id_Article` AS `Id_Article` -FROM `vn2008`.`Articles` -UNION ALL -SELECT `barcodes`.`code` AS `code`, - `barcodes`.`Id_Article` AS `Id_Article` -FROM `vn2008`.`barcodes` -UNION ALL -SELECT `c`.`Id_Compra` AS `Id_Compra`, - `c`.`Id_Article` AS `Id_Article` -FROM ( - ( - `vn2008`.`Compres` `c` - JOIN `vn2008`.`Entradas` `e` ON(`c`.`Id_Entrada` = `e`.`Id_Entrada`) - ) - JOIN `vn2008`.`travel` `tr` ON(`tr`.`id` = `e`.`travel_id`) - ) -WHERE `tr`.`landing` >= `util`.`VN_CURDATE`() + INTERVAL -15 DAY diff --git a/db/routines/vn2008/views/v_departure_limit.sql b/db/routines/vn2008/views/v_departure_limit.sql deleted file mode 100644 index 39478a54a..000000000 --- a/db/routines/vn2008/views/v_departure_limit.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_departure_limit` -AS SELECT `cache`.`departure_limit`.`warehouse_id` AS `warehouse_id`, - `cache`.`departure_limit`.`fecha` AS `fecha`, - `cache`.`departure_limit`.`hora` AS `hora`, - `cache`.`departure_limit`.`minSpeed` AS `minSpeed` -FROM `cache`.`departure_limit` diff --git a/db/routines/vn2008/views/v_descuadre_bionic.sql b/db/routines/vn2008/views/v_descuadre_bionic.sql deleted file mode 100644 index 446c10694..000000000 --- a/db/routines/vn2008/views/v_descuadre_bionic.sql +++ /dev/null @@ -1,41 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_descuadre_bionic` -AS SELECT `t`.`Id_Ticket` AS `Id_Ticket`, - `t`.`Alias` AS `Alias`, - `m`.`Concepte` AS `Concepte`, - sum(`mc`.`Valor`) AS `suma_componente`, - `m`.`Preu` AS `Preu`, - `m`.`Descuento` AS `Descuento`, - `m`.`Preu` * (100 - `m`.`Descuento`) / 100 - sum(`mc`.`Valor`) AS `diferencia`, - `t`.`Fecha` AS `Fecha`, - `m`.`Preu` > 0 - AND `tp`.`reino_id` <> 6 - AND `a`.`tipo_id` NOT IN (7, 115) AS `benvenut` -FROM ( - ( - ( - ( - ( - ( - `vn2008`.`Movimientos` `m` - JOIN `vn2008`.`Tickets` `t` ON(`m`.`Id_Ticket` = `t`.`Id_Ticket`) - ) - JOIN `vn2008`.`Clientes` `c` ON(`t`.`Id_Cliente` = `c`.`id_cliente`) - ) - JOIN `vn2008`.`warehouse` `w` ON(`w`.`id` = `t`.`warehouse_id`) - ) - JOIN `vn2008`.`Articles` `a` ON(`m`.`Id_Article` = `a`.`Id_Article`) - ) - JOIN `vn2008`.`Tipos` `tp` ON(`a`.`tipo_id` = `tp`.`tipo_id`) - ) - LEFT JOIN `vn2008`.`Movimientos_componentes` `mc` ON(`m`.`Id_Movimiento` = `mc`.`Id_Movimiento`) - ) -WHERE `t`.`Fecha` >= '2015-09-01' - AND `t`.`empresa_id` IN (442, 791, 567) - AND `w`.`reserve` <> 0 - AND `c`.`real` <> 0 - AND `tp`.`reino_id` <> 6 -GROUP BY `m`.`Id_Movimiento` -HAVING abs(`diferencia`) > 0.01 - OR `diferencia` IS NULL diff --git a/db/routines/vn2008/views/v_inter.sql b/db/routines/vn2008/views/v_inter.sql deleted file mode 100644 index 7701c8471..000000000 --- a/db/routines/vn2008/views/v_inter.sql +++ /dev/null @@ -1,11 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_inter` -AS SELECT `tt`.`id` AS `inter_id`, - `tt`.`stateFk` AS `state_id`, - `tt`.`notes` AS `nota`, - `tt`.`created` AS `odbc_date`, - `tt`.`ticketFk` AS `Id_Ticket`, - `tt`.`userFk` AS `Id_Trabajador`, - `tt`.`supervisorFk` AS `Id_supervisor` -FROM `vn`.`ticketTracking` `tt` diff --git a/db/routines/vn2008/views/v_miriam.sql b/db/routines/vn2008/views/v_miriam.sql deleted file mode 100644 index 70af88943..000000000 --- a/db/routines/vn2008/views/v_miriam.sql +++ /dev/null @@ -1,23 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_miriam` -AS SELECT `M`.`Id_Article` AS `Id_Article`, - `M`.`Concepte` AS `Concepte`, - `M`.`Cantidad` AS `Cantidad`, - `M`.`Preu` AS `Preu`, - `M`.`Descuento` AS `Descuento`, - `T`.`Fecha` AS `Fecha`, - `T`.`Id_Cliente` AS `Id_Cliente`, - `M`.`Cantidad` * `M`.`Preu` * (100 - `M`.`Descuento`) / 100 AS `Importe` -FROM ( - ( - ( - `vn2008`.`Tickets` `T` - JOIN `vn2008`.`Movimientos` `M` ON(`T`.`Id_Ticket` = `M`.`Id_Ticket`) - ) - JOIN `vn2008`.`Articles` `A` ON(`M`.`Id_Article` = `A`.`Id_Article`) - ) - JOIN `vn2008`.`Tipos` `TP` ON(`A`.`tipo_id` = `TP`.`tipo_id`) - ) -WHERE `T`.`Fecha` >= '2011-01-01' - AND `A`.`tipo_id` = 7 diff --git a/db/routines/vn2008/views/v_price_fixed.sql b/db/routines/vn2008/views/v_price_fixed.sql deleted file mode 100644 index db48e5a46..000000000 --- a/db/routines/vn2008/views/v_price_fixed.sql +++ /dev/null @@ -1,35 +0,0 @@ -CREATE OR REPLACE DEFINER=`root`@`localhost` - SQL SECURITY DEFINER - VIEW `vn2008`.`v_price_fixed` -AS SELECT `pf`.`warehouse_id` AS `warehouse_id`, - `pf`.`item_id` AS `item_id`, - `pf`.`rate_0` AS `rate_0`, - `pf`.`rate_1` AS `rate_1`, - `pf`.`rate_2` AS `rate_2`, - `pf`.`rate_3` AS `rate_3`, - `pf`.`date_start` AS `date_start`, - `pf`.`date_end` AS `date_end`, - `pf`.`bonus` AS `bonus`, - `pf`.`grouping` AS `grouping`, - `pf`.`Packing` AS `Packing`, - `pf`.`caja` AS `caja` -FROM `vn2008`.`price_fixed` `pf` -WHERE `pf`.`warehouse_id` < 1000 -UNION ALL -SELECT `wg`.`warehouse_id` AS `warehouse_id`, - `pf`.`item_id` AS `item_id`, - `pf`.`rate_0` AS `rate_0`, - `pf`.`rate_1` AS `rate_1`, - `pf`.`rate_2` AS `rate_2`, - `pf`.`rate_3` AS `rate_3`, - `pf`.`date_start` AS `date_start`, - `pf`.`date_end` AS `date_end`, - `pf`.`bonus` AS `bonus`, - `pf`.`grouping` AS `grouping`, - `pf`.`Packing` AS `Packing`, - `pf`.`caja` AS `caja` -FROM ( - `vn2008`.`price_fixed` `pf` - JOIN `vn2008`.`warehouse_group` `wg` - ) -WHERE `wg`.`warehouse_alias_id` + 1000 = `pf`.`warehouse_id` From 183097de03a669b56da336839bb7fcfafef1d0a8 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 1 Feb 2024 07:29:43 +0100 Subject: [PATCH 2/2] refs #6688 fix: puppeteer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 041bd39df..e68b40e4c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "node-ssh": "^11.0.0", "object-diff": "0.0.4", "object.pick": "^1.3.0", - "puppeteer": "^20.3.0", + "puppeteer": "^21.10.0", "read-chunk": "^3.2.0", "require-yaml": "0.0.1", "smbhash": "0.0.1",