From 2a6848c09a06e411a24979401f7856d7cfe1e184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Tue, 14 Mar 2023 09:17:39 +0100 Subject: [PATCH] refs #5000 invoiceOutGlobal --- db/changes/230402/00-invoiceOut_getWeight.sql | 6 +++--- loopback/locale/es.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db/changes/230402/00-invoiceOut_getWeight.sql b/db/changes/230402/00-invoiceOut_getWeight.sql index 4ca284857..d69d1b793 100644 --- a/db/changes/230402/00-invoiceOut_getWeight.sql +++ b/db/changes/230402/00-invoiceOut_getWeight.sql @@ -2,13 +2,13 @@ DROP FUNCTION IF EXISTS `vn`.`invoiceOut_getWeight`; DELIMITER $$ $$ -CREATE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getWeight`(vInvoice VARCHAR(15)) RETURNS decimal(10,2) +CREATE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceOut_getWeight`(vInvoiceRef VARCHAR(15)) RETURNS decimal(10,2) READS SQL DATA BEGIN /** * Calcula el peso de una factura emitida * - * @param vInvoice Id de la factura + * @param vInvoiceRef referencia de la factura * @return vTotalWeight peso de la factura */ DECLARE vTotalWeight DECIMAL(10,2); @@ -22,7 +22,7 @@ BEGIN JOIN item i ON i.id = s.itemFk JOIN itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk - WHERE t.refFk = vInvoice + WHERE t.refFk = vInvoiceRef AND i.intrastatFk; RETURN vTotalWeight; diff --git a/loopback/locale/es.json b/loopback/locale/es.json index 9d975b75c..788c2fa96 100644 --- a/loopback/locale/es.json +++ b/loopback/locale/es.json @@ -267,7 +267,7 @@ "There is no assigned email for this client": "No hay correo asignado para este cliente", "Exists an invoice with a previous date": "Existe una factura con fecha anterior", "Invoice date can't be less than max date": "La fecha de factura no puede ser inferior a la fecha límite", - "Warehouse inventory not seted": "Warehouse inventory not seted", + "Warehouse inventory not set": "El almacén inventario no está establecido", "This locker has already been assigned": "Esta taquilla ya ha sido asignada", "Tickets with associated refunds": "No se pueden borrar tickets con abonos asociados. Este ticket está asociado al abono Nº {{id}}", "Not exist this branch": "La rama no existe"