From fb84fe4b973be62faf9cb6079c17e825d9ca1bb1 Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 13 Feb 2024 07:16:32 +0100 Subject: [PATCH] refactor: refs #6501 Requested changes --- .../{XDiario_reconciliation.sql => XDiario_verify.sql} | 4 ++-- db/routines/vn/procedures/entry_getTransfer.sql | 6 +++--- .../{travel_detail.sql => travel_detailAmerica.sql} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename db/routines/vn/procedures/{XDiario_reconciliation.sql => XDiario_verify.sql} (93%) rename db/routines/vn/procedures/{travel_detail.sql => travel_detailAmerica.sql} (98%) diff --git a/db/routines/vn/procedures/XDiario_reconciliation.sql b/db/routines/vn/procedures/XDiario_verify.sql similarity index 93% rename from db/routines/vn/procedures/XDiario_reconciliation.sql rename to db/routines/vn/procedures/XDiario_verify.sql index c4724849d..0f898638a 100644 --- a/db/routines/vn/procedures/XDiario_reconciliation.sql +++ b/db/routines/vn/procedures/XDiario_verify.sql @@ -1,8 +1,8 @@ DELIMITER $$ -CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`XDiario_reconciliation`() +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`XDiario_verify`() BEGIN /** - * Realiza la conciliación diaria de los asientos contables, + * Realiza la verificación diaria de los asientos contables, * identificando y notificando los asientos descuadrados * y ajustando los saldos en caso necesario. */ diff --git a/db/routines/vn/procedures/entry_getTransfer.sql b/db/routines/vn/procedures/entry_getTransfer.sql index f2cec654e..151bebd4d 100644 --- a/db/routines/vn/procedures/entry_getTransfer.sql +++ b/db/routines/vn/procedures/entry_getTransfer.sql @@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_getTransfer`( ) BEGIN /** - * Gestiona el traslado de productos a partir de una entrada específica. + * Retorna los artículos trasladables a partir de una entrada. * * @param vSelf Id de entrada */ @@ -167,7 +167,7 @@ BEGIN LEFT JOIN vn.buy b3 ON b3.id = bufi.buyFk WHERE ic.display AND NOT e.isRaid - AND (ti.visible != 0 OR ti.available != 0) + AND (ti.visible OR ti.available) ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name; CREATE INDEX tIndex USING HASH ON tTransfer (itemFk); @@ -189,7 +189,7 @@ BEGIN m3 / 1000000 / Packing, 3) carriage, @comission := ROUND((buyingValue + comissionValue + freightValue) * commission / 100, 3) commission, - ROUND(@packaging := (returnCost + IF(isPackageReturnable != 0, 0, value)) + ROUND(@packaging := (returnCost + IF(isPackageReturnable, 0, value)) / packing, 3) packaging, @cost := IFNULL((buyingValue + comissionValue + freightValue), 0) + IFNULL(@packaging, 0) + diff --git a/db/routines/vn/procedures/travel_detail.sql b/db/routines/vn/procedures/travel_detailAmerica.sql similarity index 98% rename from db/routines/vn/procedures/travel_detail.sql rename to db/routines/vn/procedures/travel_detailAmerica.sql index d805f0ca9..ecd24cd5c 100644 --- a/db/routines/vn/procedures/travel_detail.sql +++ b/db/routines/vn/procedures/travel_detailAmerica.sql @@ -1,5 +1,5 @@ DELIMITER $$ -CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_detail`() +CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_detailAmerica`() BEGIN /** * Devuelve los detalles de los vuelos que tienen