ref #5034 remove e2e #2193
|
|
@ -760,8 +760,8 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
|
||||||
(29, 1, 8, 1, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
(29, 1, 8, 1, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
||||||
(30, 1, 8, 1, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
(30, 1, 8, 1, 1, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
||||||
(31, 1, 8, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
(31, 1, 8, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
||||||
(32, 1, 8, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL);
|
(32, 1, 8, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY), 1103, 'Phone Box', 123, NULL, 0, 1, 5, 1, util.VN_CURDATE(), NULL, NULL),
|
||||||
|
(33, 1, 7, 1, 6, util.VN_CURDATE(), DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY), 1102, 'NY roofs', 122, NULL, 0, 3, 5, 1, util.VN_CURDATE(), NULL, NULL);
|
||||||
INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
|
INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 11, 1, 'ready'),
|
(1, 11, 1, 'ready'),
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ BEGIN
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT Id_Ticket
|
SELECT Id_Ticket
|
||||||
FROM vn2008.Tickets t
|
FROM vn2008.Tickets t
|
||||||
JOIN vn.invoiceOut io ON io.id = t.Factura
|
JOIN vn.invoiceOut io ON io.`ref` = t.Factura
|
||||||
WHERE year(io.issued) = vYear
|
WHERE year(io.issued) = vYear
|
||||||
AND month(io.issued) = vMonth;
|
AND month(io.issued) = vMonth;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ BEGIN
|
||||||
* @vInvoiceInFk Factura recibida
|
* @vInvoiceInFk Factura recibida
|
||||||
* @vXDiarioFk Id tabla XDiario
|
* @vXDiarioFk Id tabla XDiario
|
||||||
*/
|
*/
|
||||||
|
DECLARE vInvoiceInOriginalFk INT;
|
||||||
DECLARE vDone BOOL DEFAULT FALSE;
|
DECLARE vDone BOOL DEFAULT FALSE;
|
||||||
DECLARE vBase DOUBLE;
|
DECLARE vBase DOUBLE;
|
||||||
DECLARE vVat DOUBLE;
|
DECLARE vVat DOUBLE;
|
||||||
|
|
@ -198,5 +199,36 @@ BEGIN
|
||||||
AND e.name = 'Retenciones'
|
AND e.name = 'Retenciones'
|
||||||
AND id.id IS NULL;
|
AND id.id IS NULL;
|
||||||
|
|
||||||
|
SELECT correctedFk INTO vInvoiceInOriginalFk
|
||||||
|
FROM vn.invoiceInCorrection
|
||||||
|
WHERE correctingFk = vInvoiceInFk;
|
||||||
|
|
||||||
|
IF vInvoiceInOriginalFk THEN
|
||||||
|
|
||||||
|
UPDATE movContaIVA mci
|
||||||
|
JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
|
||||||
|
JOIN (SELECT issued,
|
||||||
|
SUM(sub.taxableBase) taxableBase,
|
||||||
|
SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
|
||||||
|
FROM(SELECT issued,
|
||||||
|
SUM(iit.taxableBase) taxableBase,
|
||||||
|
ti.PorcentajeIva
|
||||||
|
FROM vn.invoiceIn i
|
||||||
|
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
|
||||||
|
JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
|
||||||
|
WHERE i.id = vInvoiceInOriginalFk
|
||||||
|
GROUP BY ti.CodigoIva)sub
|
||||||
|
)invoiceInOriginal
|
||||||
|
JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
|
||||||
|
SET mci.TipoRectificativa = iir.refundCategoryFk,
|
||||||
|
mci.ClaseAbonoRectificativas = iir.refundType,
|
||||||
|
mci.FechaFacturaOriginal = invoiceInOriginal.issued,
|
||||||
|
mci.FechaOperacion = invoiceInOriginal.issued,
|
||||||
|
mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
|
||||||
|
mci.CuotaIvaOriginal = invoiceInOriginal.vat,
|
||||||
|
mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
|
||||||
|
WHERE mci.id = vXDiarioFk;
|
||||||
|
|
||||||
|
END IF;
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
@ -0,0 +1,102 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
|
||||||
|
vItemFk INT,
|
||||||
|
vWarehouseFk INT,
|
||||||
|
vDate DATETIME
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula y proporciona un historial de inventario absoluto
|
||||||
|
* para un artículo específico en un almacén dado
|
||||||
|
* hasta una fecha determinada.
|
||||||
|
*
|
||||||
|
* @param vItemFk Id de artículo
|
||||||
|
* @param vWarehouseFk Id de almacén
|
||||||
|
* @param vDate Fecha
|
||||||
|
*/
|
||||||
|
DECLARE vCalculatedInventory INT;
|
||||||
|
DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
|
||||||
|
DECLARE vStartDate DATE DEFAULT '2001-01-01';
|
||||||
|
|
||||||
|
CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
|
||||||
|
ENGINE = MEMORY
|
||||||
|
SELECT *
|
||||||
|
FROM (
|
||||||
|
SELECT tr.landed `date`,
|
||||||
|
b.quantity input,
|
||||||
|
NULL `output`,
|
||||||
|
tr.isReceived ok,
|
||||||
|
s.name alias,
|
||||||
|
e.invoiceNumber reference,
|
||||||
|
e.id id,
|
||||||
|
tr.isDelivered f5
|
||||||
|
FROM buy b
|
||||||
|
JOIN `entry` e ON e.id = b.entryFk
|
||||||
|
JOIN travel tr ON tr.id = e.travelFk
|
||||||
|
JOIN supplier s ON s.id = e.supplierFk
|
||||||
|
WHERE tr.landed >= vStartDate
|
||||||
|
AND s.id <> (SELECT supplierFk FROM inventoryConfig)
|
||||||
|
AND vWarehouseFk IN (tr.warehouseInFk, 0)
|
||||||
|
AND b.itemFk = vItemFk
|
||||||
|
AND NOT e.isExcludedFromAvailable
|
||||||
|
AND NOT e.isRaid
|
||||||
|
UNION ALL
|
||||||
|
SELECT tr.shipped,
|
||||||
|
NULL,
|
||||||
|
b.quantity,
|
||||||
|
tr.isDelivered,
|
||||||
|
s.name,
|
||||||
|
e.invoiceNumber,
|
||||||
|
e.id,
|
||||||
|
tr.isDelivered
|
||||||
|
FROM buy b
|
||||||
|
JOIN `entry` e ON e.id = b.entryFk
|
||||||
|
JOIN travel tr ON tr.id = e.travelFk
|
||||||
|
JOIN supplier s ON s.id = e.supplierFk
|
||||||
|
WHERE tr.shipped >= vStartDate
|
||||||
|
AND vWarehouseFk = tr.warehouseOutFk
|
||||||
|
AND s.id <> (SELECT supplierFk FROM inventoryConfig)
|
||||||
|
AND b.itemFk = vItemFk
|
||||||
|
AND NOT e.isExcludedFromAvailable
|
||||||
|
AND NOT e.isRaid
|
||||||
|
UNION ALL
|
||||||
|
SELECT t.shipped,
|
||||||
|
NULL,
|
||||||
|
m.quantity,
|
||||||
|
(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
|
||||||
|
t.nickname,
|
||||||
|
t.refFk,
|
||||||
|
t.id,
|
||||||
|
t.isPrinted
|
||||||
|
FROM sale m
|
||||||
|
JOIN ticket t ON t.id = m.ticketFk
|
||||||
|
JOIN client c ON c.id = t.clientFk
|
||||||
|
WHERE t.shipped >= vStartDate
|
||||||
|
AND m.itemFk = vItemFk
|
||||||
|
AND vWarehouseFk IN (t.warehouseFk, 0)
|
||||||
|
) t1
|
||||||
|
ORDER BY `date`, input DESC, ok DESC;
|
||||||
|
|
||||||
|
SELECT SUM(input) - SUM(`output`) INTO vCalculatedInventory
|
||||||
|
FROM tHistoricalPast
|
||||||
|
WHERE `date` < vDate;
|
||||||
|
|
||||||
|
SELECT p1.*, NULL v_virtual
|
||||||
|
FROM (
|
||||||
|
SELECT vDate `date`,
|
||||||
|
vCalculatedInventory input,
|
||||||
|
NULL `output`,
|
||||||
|
1 ok,
|
||||||
|
'Inventario calculado' alias,
|
||||||
|
'' reference,
|
||||||
|
0 id,
|
||||||
|
1 f5
|
||||||
|
UNION ALL
|
||||||
|
SELECT *
|
||||||
|
FROM tHistoricalPast
|
||||||
|
WHERE `date` >= vDate
|
||||||
|
) p1;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE tHistoricalPast;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
@ -10,20 +10,15 @@ BEGIN
|
||||||
* @param vInvoiceInFk Id de factura recibida
|
* @param vInvoiceInFk Id de factura recibida
|
||||||
*/
|
*/
|
||||||
DECLARE vRate DOUBLE DEFAULT 1;
|
DECLARE vRate DOUBLE DEFAULT 1;
|
||||||
DECLARE vDated DATE;
|
DECLARE vExpenseFk VARCHAR(10);
|
||||||
DECLARE vExpenseFk INT;
|
|
||||||
|
|
||||||
SELECT MAX(rr.dated) INTO vDated
|
SELECT `value` INTO vRate
|
||||||
FROM referenceRate rr
|
FROM referenceRate rr
|
||||||
JOIN invoiceIn ii ON ii.id = vInvoiceInFk
|
JOIN invoiceIn ii ON ii.id = vInvoiceInFk
|
||||||
WHERE rr.dated <= ii.issued
|
WHERE rr.dated <= ii.issued
|
||||||
AND rr.currencyFk = ii.currencyFk;
|
AND rr.currencyFk = ii.currencyFk
|
||||||
|
ORDER BY dated DESC
|
||||||
IF vDated THEN
|
LIMIT 1;
|
||||||
SELECT `value` INTO vRate
|
|
||||||
FROM referenceRate
|
|
||||||
WHERE dated = vDated;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
|
DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,234 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Traslada la info de contabilidad relacionada con las facturas recibidas
|
|
||||||
*
|
|
||||||
* @vInvoiceInFk Factura recibida
|
|
||||||
* @vXDiarioFk Id tabla XDiario
|
|
||||||
*/
|
|
||||||
DECLARE vInvoiceInOriginalFk INT;
|
|
||||||
DECLARE vDone BOOL DEFAULT FALSE;
|
|
||||||
DECLARE vBase DOUBLE;
|
|
||||||
DECLARE vVat DOUBLE;
|
|
||||||
DECLARE vRate DOUBLE;
|
|
||||||
DECLARE vTransactionCode INT;
|
|
||||||
DECLARE vCounter INT DEFAULT 0;
|
|
||||||
DECLARE vTransactionCodeOld INT;
|
|
||||||
DECLARE vTaxCode INT;
|
|
||||||
DECLARE vTaxCodeOld INT;
|
|
||||||
DECLARE vOperationCode VARCHAR(1);
|
|
||||||
DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
|
|
||||||
DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
|
|
||||||
DECLARE vInvoiceTypeReceived VARCHAR(1);
|
|
||||||
DECLARE vInvoiceTypeInformative VARCHAR(1);
|
|
||||||
DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
|
|
||||||
|
|
||||||
DECLARE vCursor CURSOR FOR
|
|
||||||
SELECT it.taxableBase,
|
|
||||||
CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
|
|
||||||
t.PorcentajeIva,
|
|
||||||
it.transactionTypeSageFk,
|
|
||||||
it.taxTypeSageFk,
|
|
||||||
tty.isIntracommunity,
|
|
||||||
tt.ClaveOperacionDefecto
|
|
||||||
FROM vn.invoiceIn i
|
|
||||||
JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
|
|
||||||
JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
|
|
||||||
JOIN taxType tty ON tty.id = t.CodigoIva
|
|
||||||
JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
|
|
||||||
LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
|
|
||||||
WHERE i.id = vInvoiceInFk
|
|
||||||
AND d.id IS NULL;
|
|
||||||
|
|
||||||
DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
|
|
||||||
|
|
||||||
DELETE FROM movContaIVA
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
|
|
||||||
SELECT codeSage INTO vInvoiceTypeReceived
|
|
||||||
FROM invoiceType WHERE code ='received';
|
|
||||||
|
|
||||||
SELECT codeSage INTO vInvoiceTypeInformative
|
|
||||||
FROM invoiceType WHERE code ='informative';
|
|
||||||
|
|
||||||
INSERT INTO movContaIVA(id, LibreA1)
|
|
||||||
VALUES (vXDiarioFk, vInvoiceInFk);
|
|
||||||
|
|
||||||
OPEN vCursor;
|
|
||||||
|
|
||||||
l: LOOP
|
|
||||||
FETCH vCursor INTO vBase,
|
|
||||||
vVat,
|
|
||||||
vRate,
|
|
||||||
vTransactionCode,
|
|
||||||
vTaxCode,
|
|
||||||
vIsIntracommunity,
|
|
||||||
vOperationCode;
|
|
||||||
|
|
||||||
IF vDone THEN
|
|
||||||
LEAVE l;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SET vTransactionCodeOld = vTransactionCode;
|
|
||||||
SET vTaxCodeOld = vTaxCode;
|
|
||||||
|
|
||||||
IF vOperationCode IS NOT NULL THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET ClaveOperacionFactura = vOperationCode
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SET vCounter = vCounter + 1;
|
|
||||||
CASE vCounter
|
|
||||||
WHEN 1 THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET BaseIva1 = vBase,
|
|
||||||
PorIva1 = vRate,
|
|
||||||
CuotaIva1 = vVat,
|
|
||||||
CodigoTransaccion1 = vTransactionCode,
|
|
||||||
CodigoIva1 = vTaxCode
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
|
|
||||||
WHEN 2 THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET BaseIva2 = vBase,
|
|
||||||
PorIva2 = vRate,
|
|
||||||
CuotaIva2 = vVat,
|
|
||||||
CodigoTransaccion2 = vTransactionCode,
|
|
||||||
CodigoIva2 = vTaxCode
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
WHEN 3 THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET BaseIva3 = vBase,
|
|
||||||
PorIva3 = vRate,
|
|
||||||
CuotaIva3 = vVat,
|
|
||||||
CodigoTransaccion3 = vTransactionCode,
|
|
||||||
CodigoIva3 = vTaxCode
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
WHEN 4 THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET BaseIva4 = vBase,
|
|
||||||
PorIva4 = vRate,
|
|
||||||
CuotaIva4 = vVat,
|
|
||||||
CodigoTransaccion4 = vTransactionCode,
|
|
||||||
CodigoIva4 = vTaxCode
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
ELSE
|
|
||||||
SELECT vXDiarioFk INTO vXDiarioFk;
|
|
||||||
END CASE;
|
|
||||||
|
|
||||||
IF vIsIntracommunity THEN
|
|
||||||
UPDATE movContaIVA
|
|
||||||
SET Intracomunitaria = TRUE
|
|
||||||
WHERE id = vXDiarioFk;
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
SET vTransactionCodeOld = vTransactionCode;
|
|
||||||
SET vTaxCodeOld = vTaxCode;
|
|
||||||
|
|
||||||
END LOOP;
|
|
||||||
|
|
||||||
CLOSE vCursor;
|
|
||||||
|
|
||||||
SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
|
|
||||||
FROM vn.dua d
|
|
||||||
LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
|
|
||||||
AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
|
|
||||||
WHERE d.ASIEN = (
|
|
||||||
SELECT ASIEN
|
|
||||||
FROM vn.XDiario
|
|
||||||
WHERE id = vXDiarioFk)
|
|
||||||
LIMIT 1;
|
|
||||||
|
|
||||||
UPDATE movContaIVA mci
|
|
||||||
JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
|
|
||||||
JOIN vn.XDiario x ON x.id = mci.id
|
|
||||||
LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
|
|
||||||
JOIN vn.supplier s ON s.id = ii.supplierFk
|
|
||||||
JOIN Naciones n ON n.countryFk = s.countryFk
|
|
||||||
SET mci.CodigoDivisa = ii.currencyFk,
|
|
||||||
mci.Año = YEAR(ii.issued),
|
|
||||||
mci.Serie = ii.serial,
|
|
||||||
mci.Factura = ii.id,
|
|
||||||
mci.FechaFactura = ii.issued,
|
|
||||||
mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
|
|
||||||
IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
|
|
||||||
IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
|
|
||||||
IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
|
|
||||||
mci.TipoFactura = IF(id.id,
|
|
||||||
IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
|
|
||||||
IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
|
|
||||||
mci.CodigoCuentaFactura = x.SUBCTA,
|
|
||||||
mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
|
|
||||||
mci.Nombre = s.name,
|
|
||||||
mci.SiglaNacion = n.SiglaNacion,
|
|
||||||
mci.EjercicioFactura = YEAR(ii.issued),
|
|
||||||
mci.FechaOperacion = ii.issued,
|
|
||||||
mci.MantenerAsiento = TRUE,
|
|
||||||
mci.SuFacturaNo = ii.supplierRef,
|
|
||||||
mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
|
||||||
mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
|
||||||
mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
|
||||||
mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
|
|
||||||
mci.FechaFacturaOriginal = x.FECHA_EX
|
|
||||||
WHERE mci.id = vXDiarioFk;
|
|
||||||
|
|
||||||
-- RETENCIONES
|
|
||||||
UPDATE movContaIVA mci
|
|
||||||
JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
|
|
||||||
JOIN vn.XDiario x ON x.id = mci.id
|
|
||||||
JOIN vn.supplier s ON s.id = supplierFk
|
|
||||||
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
|
|
||||||
JOIN vn.expense e ON e.id = iit.expenseFk
|
|
||||||
JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
|
|
||||||
LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
|
|
||||||
JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
|
|
||||||
FROM vn.XDiario x1
|
|
||||||
JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
|
|
||||||
WHERE x2.BASEEURO <> 0
|
|
||||||
AND x1.id = vXDiarioFk
|
|
||||||
)sub
|
|
||||||
JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
|
|
||||||
SET mci.CodigoRetencion = t.CodigoRetencion,
|
|
||||||
mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
|
|
||||||
mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
|
|
||||||
mci.PorRetencion = t.PorcentajeRetencion,
|
|
||||||
mci.ImporteRetencion = iit.taxableBase * - 1
|
|
||||||
WHERE mci.id = vXDiarioFk
|
|
||||||
AND e.name = 'Retenciones'
|
|
||||||
AND id.id IS NULL;
|
|
||||||
|
|
||||||
SELECT correctedFk INTO vInvoiceInOriginalFk
|
|
||||||
FROM vn.invoiceInCorrection
|
|
||||||
WHERE correctingFk = vInvoiceInFk;
|
|
||||||
|
|
||||||
IF vInvoiceInOriginalFk THEN
|
|
||||||
|
|
||||||
UPDATE movContaIVA mci
|
|
||||||
JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
|
|
||||||
JOIN (SELECT issued,
|
|
||||||
SUM(sub.taxableBase) taxableBase,
|
|
||||||
SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
|
|
||||||
FROM(SELECT issued,
|
|
||||||
SUM(iit.taxableBase) taxableBase,
|
|
||||||
ti.PorcentajeIva
|
|
||||||
FROM vn.invoiceIn i
|
|
||||||
JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
|
|
||||||
JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
|
|
||||||
WHERE i.id = vInvoiceInOriginalFk
|
|
||||||
GROUP BY ti.CodigoIva)sub
|
|
||||||
)invoiceInOriginal
|
|
||||||
JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
|
|
||||||
SET mci.TipoRectificativa = iir.refundCategoryFk,
|
|
||||||
mci.ClaseAbonoRectificativas = iir.refundType,
|
|
||||||
mci.FechaFacturaOriginal = invoiceInOriginal.issued,
|
|
||||||
mci.FechaOperacion = invoiceInOriginal.issued,
|
|
||||||
mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
|
|
||||||
mci.CuotaIvaOriginal = invoiceInOriginal.vat,
|
|
||||||
mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
|
|
||||||
WHERE mci.id = vXDiarioFk;
|
|
||||||
|
|
||||||
END IF;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -0,0 +1,158 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
|
||||||
|
vItemFk INT
|
||||||
|
)
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calcula y proporciona un historial de inventario detallado
|
||||||
|
* para un artículo dividiendo la información
|
||||||
|
* por almacén.
|
||||||
|
*
|
||||||
|
* @param vItemFk Artículo
|
||||||
|
*/
|
||||||
|
DECLARE vDateInventory DATETIME;
|
||||||
|
|
||||||
|
SELECT inventoried INTO vDateInventory FROM config;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS tMultipleHistory1;
|
||||||
|
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory1
|
||||||
|
SELECT DATE(`date`) `date`,
|
||||||
|
input,
|
||||||
|
`output`,
|
||||||
|
ok,
|
||||||
|
reference,
|
||||||
|
history.id,
|
||||||
|
warehouse,
|
||||||
|
`name` warehouseName
|
||||||
|
FROM (
|
||||||
|
SELECT tr.landed `date`,
|
||||||
|
c.quantity input,
|
||||||
|
NULL `output`,
|
||||||
|
tr.warehouseInFk warehouse,
|
||||||
|
tr.isReceived ok,
|
||||||
|
e.invoiceNumber reference,
|
||||||
|
e.id
|
||||||
|
FROM buy c
|
||||||
|
JOIN `entry` e ON e.id = c.entryFk
|
||||||
|
JOIN travel tr ON tr.id = e.travelFk
|
||||||
|
WHERE tr.landed >= vDateInventory
|
||||||
|
AND c.itemFk = vItemFk
|
||||||
|
AND NOT e.isRaid
|
||||||
|
AND c.quantity
|
||||||
|
UNION ALL
|
||||||
|
SELECT tr.shipped,
|
||||||
|
NULL,
|
||||||
|
c.quantity,
|
||||||
|
tr.warehouseOutFk,
|
||||||
|
tr.isDelivered,
|
||||||
|
e.invoiceNumber,
|
||||||
|
e.id
|
||||||
|
FROM buy c
|
||||||
|
JOIN `entry` e ON e.id = c.entryFk
|
||||||
|
JOIN travel tr ON tr.id = e.travelFk
|
||||||
|
WHERE tr.shipped >= vDateInventory
|
||||||
|
AND c.itemFk = vItemFk
|
||||||
|
AND NOT e.isRaid
|
||||||
|
AND c.quantity
|
||||||
|
UNION ALL
|
||||||
|
SELECT t.shipped,
|
||||||
|
NULL,
|
||||||
|
m.quantity,
|
||||||
|
t.warehouseFk,
|
||||||
|
(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
|
||||||
|
t.refFk,
|
||||||
|
t.id
|
||||||
|
FROM sale m
|
||||||
|
JOIN ticket t ON t.id = m.ticketFk
|
||||||
|
WHERE t.shipped >= vDateInventory
|
||||||
|
AND m.itemFk = vItemFk
|
||||||
|
) history
|
||||||
|
JOIN warehouse ON warehouse.id = history.warehouse
|
||||||
|
ORDER BY `date`, input DESC, ok DESC;
|
||||||
|
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2, tMultipleHistory3,
|
||||||
|
tMultipleHistory4, tMultipleHistory5, tMultipleHistory6, tMultipleHistory7, tMultipleHistory8;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory2 SELECT * FROM tMultipleHistory1 WHERE warehouse = 19;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory3 SELECT * FROM tMultipleHistory1 WHERE warehouse = 7;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory4 SELECT * FROM tMultipleHistory1 WHERE warehouse = 60;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory5 SELECT * FROM tMultipleHistory1 WHERE warehouse = 5;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory6 SELECT * FROM tMultipleHistory1 WHERE warehouse = 17;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory7 SELECT * FROM tMultipleHistory1 WHERE warehouse = 37;
|
||||||
|
CREATE TEMPORARY TABLE tMultipleHistory8 SELECT * FROM tMultipleHistory1 WHERE warehouse = 55;
|
||||||
|
|
||||||
|
SELECT *
|
||||||
|
FROM (
|
||||||
|
SELECT `date`, input BOGinput, `output` BOGoutput, ok BOGok, reference BOGreference, id BOGid,
|
||||||
|
NULL VNHinput, NULL VNHoutput, NULL VNHok, NULL VNHreference, NULL VNHid,
|
||||||
|
NULL ALGinput, NULL ALGoutput, NULL ALGok, NULL ALGreference, NULL ALGid,
|
||||||
|
NULL MADinput, NULL MADoutput, NULL MADok, NULL MADreference, NULL MADid,
|
||||||
|
NULL MCFinput, NULL MCFoutput, NULL MCFok, NULL MCFreference, NULL MCFid,
|
||||||
|
NULL VILinput, NULL VILoutput, NULL VILok, NULL VILreference, NULL VILid,
|
||||||
|
NULL BARinput, NULL BARoutput, NULL BARok, NULL BARreference, NULL BARid
|
||||||
|
FROM tMultipleHistory2
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL
|
||||||
|
FROM tMultipleHistory3
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL
|
||||||
|
FROM tMultipleHistory4
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL
|
||||||
|
FROM tMultipleHistory5
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL
|
||||||
|
FROM tMultipleHistory6
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id,
|
||||||
|
NULL, NULL, NULL, NULL, NULL
|
||||||
|
FROM tMultipleHistory7
|
||||||
|
UNION ALL
|
||||||
|
SELECT `date`,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
NULL, NULL, NULL, NULL, NULL,
|
||||||
|
input, `output`, ok, reference, id
|
||||||
|
FROM tMultipleHistory8
|
||||||
|
) sub
|
||||||
|
ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL,
|
||||||
|
MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
@ -1,61 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`add_awb_component`(IN vAwbFk SMALLINT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vShipped DATE;
|
|
||||||
DECLARE vHasStems BOOLEAN;
|
|
||||||
|
|
||||||
SELECT t.shipped, IF(a.stems, TRUE, FALSE)
|
|
||||||
INTO vShipped, vHasStems
|
|
||||||
FROM vn.travel t
|
|
||||||
JOIN vn.awb a ON a.id = t.awbFk
|
|
||||||
WHERE awbFk = vAwbFk
|
|
||||||
LIMIT 1;
|
|
||||||
|
|
||||||
INSERT IGNORE INTO awb_component (awb_id,Id_Proveedor,awb_component_type_id,awb_role_id,awb_unit_id,value,Id_Moneda)
|
|
||||||
SELECT id, Id_Proveedor, awb_component_type_id, awb_role_id,awb_unit_id, LEAST(GREATEST(value1, IFNULL(min_value, value1)), IFNULL(max_value, value1)), Id_Moneda
|
|
||||||
FROM (
|
|
||||||
SELECT a.id,
|
|
||||||
IFNULL(act.carguera_id,
|
|
||||||
CASE awb_role_id
|
|
||||||
WHEN 1 THEN a.carguera_id
|
|
||||||
WHEN 2 THEN a.transitario_id
|
|
||||||
WHEN 3 THEN f.airline_id
|
|
||||||
END
|
|
||||||
) Id_Proveedor,
|
|
||||||
act.awb_component_type_id,
|
|
||||||
act.awb_role_id,
|
|
||||||
act.awb_unit_id,
|
|
||||||
value *
|
|
||||||
CASE awb_unit_id
|
|
||||||
WHEN '1000Tj-20' THEN ((CAST(stems AS SIGNED) - 20000)/1000) + (min_value / value)
|
|
||||||
WHEN '1000Tj-10' THEN ((CAST(stems AS SIGNED) - 10000)/1000) + (min_value / value)
|
|
||||||
WHEN '100GW' THEN peso/100
|
|
||||||
WHEN 'AWB' THEN 1 -- No action
|
|
||||||
WHEN 'FB' THEN hb/2
|
|
||||||
WHEN 'GW' THEN peso
|
|
||||||
WHEN 'TW' THEN GREATEST(peso,volume_weight)
|
|
||||||
WHEN 'PN' THEN LEAST(90, value + a.propertyNumber * 10)
|
|
||||||
END value1,
|
|
||||||
value,
|
|
||||||
act.Id_Moneda,
|
|
||||||
act.min_value,
|
|
||||||
act.max_value
|
|
||||||
FROM awb a
|
|
||||||
JOIN flight f ON f.flight_id = a.flight_id
|
|
||||||
LEFT JOIN awb_component_template act ON
|
|
||||||
((IFNULL(act.carguera_id, a.carguera_id) = a.carguera_id AND awb_role_id = 1)
|
|
||||||
OR (IFNULL(act.carguera_id, a.transitario_id) = a.transitario_id AND awb_role_id = 2)
|
|
||||||
OR (IFNULL(act.airline_id, f.airline_id) = f.airline_id AND awb_role_id = 3)
|
|
||||||
OR (awb_role_id = 4))
|
|
||||||
AND IFNULL(act.airport_out, f.airport_out) = f.airport_out
|
|
||||||
AND IFNULL(act.airport_in, f.airport_in) = f.airport_in
|
|
||||||
AND IFNULL(act.airline_id, f.airline_id) = f.airline_id
|
|
||||||
AND INSTR(IFNULL(act.days, WEEKDAY(vShipped) + 1),WEEKDAY(vShipped) + 1)
|
|
||||||
JOIN awb_component_type acty ON acty.awb_component_type_id = act.awb_component_type_id
|
|
||||||
WHERE a.id = vAwbFk AND Fecha <= vShipped
|
|
||||||
AND (vHasStems = TRUE OR acty.hasStems)
|
|
||||||
ORDER BY Fecha DESC, act.days DESC LIMIT 10000000000000000000
|
|
||||||
) t;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencyModeImbalance`(vStarted DATE, vEnded DATE)
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Devuelve el valor de los precios teorico, practico de las agencias
|
|
||||||
* y si ademas es de mrw lo compara con su fichero previamente procesado
|
|
||||||
*
|
|
||||||
* @param vEktFk Identificador de edi.ekt
|
|
||||||
*/
|
|
||||||
DECLARE vEndedDayEnd DATETIME;
|
|
||||||
|
|
||||||
SET vEndedDayEnd = util.dayEnd(vEnded);
|
|
||||||
|
|
||||||
SELECT t.id ticketFk,t.addressFk,
|
|
||||||
CAST(v.amount AS DECIMAL (10,2)) AS VN,
|
|
||||||
CAST(v.amount - e.shipping_charge AS DECIMAL (10,2)) AS Difer,
|
|
||||||
CAST(mrwPrice AS DECIMAL (10,2)) mrwPrice,
|
|
||||||
CAST(e.shipping_charge - mrwPrice AS DECIMAL (10,2)) mrwDifference,
|
|
||||||
CAST(e.shipping_charge AS DECIMAL (10,2)) AS teorico,
|
|
||||||
CAST(e.extraCharge AS DECIMAL (10,2)) AS extraCharge,
|
|
||||||
t.packages, t.clientFk,
|
|
||||||
t.zoneFk, a.provinceFk, mrwCount
|
|
||||||
FROM vn.ticket t
|
|
||||||
LEFT JOIN
|
|
||||||
(SELECT ticketFk, SUM(amount) amount, fc.shipped
|
|
||||||
FROM vn.sale_freightComponent fc
|
|
||||||
JOIN vn.ticket t ON t.id = fc.ticketFk
|
|
||||||
JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
|
|
||||||
WHERE fc.shipped BETWEEN vStarted AND vEndedDayEnd
|
|
||||||
GROUP BY ticketFk) v ON t.id = v.ticketFk
|
|
||||||
LEFT JOIN (SELECT t.id,
|
|
||||||
SUM(t.zonePrice) shipping_charge,
|
|
||||||
SUM(IFNULL(aex.price,0)) extraCharge
|
|
||||||
FROM vn.ticket t
|
|
||||||
LEFT JOIN vn.expedition e ON e.ticketFk = t.id
|
|
||||||
LEFT JOIN vn.packaging p ON p.id = e.packagingFk
|
|
||||||
JOIN tmp.agencyMode amc ON amc.agencyModeFk = t.agencyModeFk
|
|
||||||
JOIN vn.agencyMode am ON am.id = amc.agencyModeFk
|
|
||||||
LEFT JOIN vn.agencyExtraCharge aex ON p.width+p.depth+p.height BETWEEN aex.sizeMin AND aex.sizeMax AND aex.agencyFk = am.agencyFk
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd
|
|
||||||
GROUP BY t.id
|
|
||||||
) e ON t.id = e.id
|
|
||||||
LEFT JOIN (SELECT ticketFk, SUM(price) mrwPrice, COUNT(*) mrwCount
|
|
||||||
FROM vn.mrw
|
|
||||||
GROUP BY ticketFk) mrw ON mrw.ticketFk = t.id
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_absoluto`(IN idART INT, IN wh INT, IN datfecha DATETIME)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE inv_calculado INT;
|
|
||||||
DECLARE inv INT;
|
|
||||||
DECLARE today DATETIME;
|
|
||||||
DECLARE fecha_inv DATETIME;
|
|
||||||
|
|
||||||
SET today = util.VN_CURDATE();
|
|
||||||
|
|
||||||
CREATE OR REPLACE TEMPORARY TABLE historico_pasado
|
|
||||||
SELECT *
|
|
||||||
FROM (
|
|
||||||
SELECT TR.landing Fecha,
|
|
||||||
C.Cantidad Entrada,
|
|
||||||
NULL Salida,
|
|
||||||
(TR.received != FALSE) OK,
|
|
||||||
P.Proveedor Alias,
|
|
||||||
E.Referencia Referencia,
|
|
||||||
E.Id_Entrada id,
|
|
||||||
TR.delivered F5
|
|
||||||
FROM Compres C -- mirar perque no entra en received
|
|
||||||
INNER JOIN Entradas E USING (Id_Entrada)
|
|
||||||
INNER JOIN travel TR ON TR.id = E.travel_id
|
|
||||||
INNER JOIN Proveedores P USING (Id_Proveedor)
|
|
||||||
WHERE TR.landing >= '2001-01-01'
|
|
||||||
AND Id_proveedor <> 4
|
|
||||||
AND wh IN (TR.warehouse_id , 0)
|
|
||||||
AND C.Id_Article = idART
|
|
||||||
AND E.Inventario = 0
|
|
||||||
AND E.Redada = 0
|
|
||||||
UNION ALL
|
|
||||||
SELECT TR.shipment Fecha,
|
|
||||||
NULL Entrada,
|
|
||||||
C.Cantidad Salida,
|
|
||||||
TR.delivered OK,
|
|
||||||
P.Proveedor Alias,
|
|
||||||
E.Referencia Referencia,
|
|
||||||
E.Id_Entrada id,
|
|
||||||
TR.delivered F5
|
|
||||||
FROM Compres C
|
|
||||||
INNER JOIN Entradas E USING (Id_Entrada)
|
|
||||||
INNER JOIN travel TR ON TR.id = E.travel_id
|
|
||||||
INNER JOIN Proveedores P USING (Id_Proveedor)
|
|
||||||
WHERE TR.shipment >= '2001-01-01'
|
|
||||||
AND wh = TR.warehouse_id_out
|
|
||||||
AND Id_Proveedor <> 4
|
|
||||||
AND C.Id_Article = idART
|
|
||||||
AND E.Inventario = 0
|
|
||||||
AND E.Redada = 0
|
|
||||||
UNION ALL
|
|
||||||
SELECT T.Fecha Fecha,
|
|
||||||
NULL Entrada,
|
|
||||||
M.Cantidad Salida,
|
|
||||||
(M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL) OK,
|
|
||||||
T.Alias Alias,
|
|
||||||
T.Factura Referencia,
|
|
||||||
T.Id_Ticket,
|
|
||||||
T.PedidoImpreso
|
|
||||||
FROM Movimientos M
|
|
||||||
INNER JOIN Tickets T USING (Id_Ticket)
|
|
||||||
JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente
|
|
||||||
WHERE T.Fecha >= '2001-01-01'
|
|
||||||
AND M.Id_Article = idART
|
|
||||||
AND wh IN (T.warehouse_id , 0)
|
|
||||||
) t1
|
|
||||||
ORDER BY Fecha, Entrada DESC, OK DESC;
|
|
||||||
|
|
||||||
SELECT sum(Entrada) - sum(Salida) INTO inv_calculado
|
|
||||||
FROM historico_pasado
|
|
||||||
WHERE Fecha < datfecha;
|
|
||||||
|
|
||||||
SELECT p1.*, NULL v_virtual
|
|
||||||
FROM(
|
|
||||||
SELECT datfecha Fecha,
|
|
||||||
inv_calculado Entrada,
|
|
||||||
NULL Salida,
|
|
||||||
1 OK,
|
|
||||||
'Inventario calculado' Alias,
|
|
||||||
'' Referencia, 0 id,
|
|
||||||
1 F5
|
|
||||||
UNION ALL
|
|
||||||
SELECT *
|
|
||||||
FROM historico_pasado
|
|
||||||
WHERE Fecha >= datfecha
|
|
||||||
) p1;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE historico_pasado;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -1,206 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_multiple`(IN vItemFk INT)
|
|
||||||
BEGIN
|
|
||||||
|
|
||||||
DECLARE vDateInventory DATETIME;
|
|
||||||
|
|
||||||
SELECT Fechainventario INTO vDateInventory FROM tblContadores;
|
|
||||||
|
|
||||||
SET @a = 0;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm1;
|
|
||||||
|
|
||||||
CREATE TEMPORARY TABLE hm1
|
|
||||||
SELECT DATE(Fecha) as Fecha,
|
|
||||||
Entrada,
|
|
||||||
Salida,
|
|
||||||
OK,
|
|
||||||
Referencia,
|
|
||||||
Historia.id,
|
|
||||||
|
|
||||||
wh,
|
|
||||||
|
|
||||||
`name` as wh_name
|
|
||||||
|
|
||||||
FROM
|
|
||||||
|
|
||||||
( SELECT TR.landing as Fecha,
|
|
||||||
C.Cantidad as Entrada,
|
|
||||||
NULL as Salida,
|
|
||||||
|
|
||||||
IF(warehouse_id = 44, 1, warehouse_id) as wh,
|
|
||||||
(TR.received != FALSE) as OK,
|
|
||||||
E.Referencia as Referencia,
|
|
||||||
E.Id_Entrada as id
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FROM Compres C
|
|
||||||
INNER JOIN Entradas E USING (Id_Entrada)
|
|
||||||
INNER JOIN travel TR ON TR.id = E.travel_id
|
|
||||||
WHERE TR.landing >= vDateInventory
|
|
||||||
AND C.Id_Article = vItemFk
|
|
||||||
AND E.Redada = 0
|
|
||||||
|
|
||||||
AND C.Cantidad <> 0
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT TR.shipment as Fecha,
|
|
||||||
NULL as Entrada,
|
|
||||||
C.Cantidad as Salida,
|
|
||||||
warehouse_id_out as wh,
|
|
||||||
TR.delivered as OK,
|
|
||||||
E.Referencia as Referencia,
|
|
||||||
E.Id_Entrada as id
|
|
||||||
|
|
||||||
FROM Compres C
|
|
||||||
INNER JOIN Entradas E USING (Id_Entrada)
|
|
||||||
INNER JOIN travel TR ON TR.id = E.travel_id
|
|
||||||
WHERE TR.shipment >= vDateInventory
|
|
||||||
AND C.Id_Article = vItemFk
|
|
||||||
|
|
||||||
AND E.Redada = 0
|
|
||||||
|
|
||||||
AND C.Cantidad <> 0
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT T.Fecha as Fecha,
|
|
||||||
NULL as Entrada,
|
|
||||||
M.Cantidad as Salida,
|
|
||||||
warehouse_id as wh,
|
|
||||||
(M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL) as OK,
|
|
||||||
T.Factura as Referencia,
|
|
||||||
T.Id_Ticket as id
|
|
||||||
|
|
||||||
FROM Movimientos M
|
|
||||||
INNER JOIN Tickets T USING (Id_Ticket)
|
|
||||||
WHERE T.Fecha >= vDateInventory
|
|
||||||
AND M.Id_Article = vItemFk
|
|
||||||
|
|
||||||
) AS Historia
|
|
||||||
|
|
||||||
INNER JOIN warehouse ON warehouse.id = Historia.wh
|
|
||||||
ORDER BY Fecha, Entrada DESC, OK DESC;
|
|
||||||
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm2;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm3;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm4;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm5;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm6;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm7;
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS hm8;
|
|
||||||
CREATE TEMPORARY TABLE hm2 SELECT * FROM hm1 WHERE wh = 19;
|
|
||||||
CREATE TEMPORARY TABLE hm3 SELECT * FROM hm1 WHERE wh = 7;
|
|
||||||
CREATE TEMPORARY TABLE hm4 SELECT * FROM hm1 WHERE wh = 60;
|
|
||||||
CREATE TEMPORARY TABLE hm5 SELECT * FROM hm1 WHERE wh = 5;
|
|
||||||
CREATE TEMPORARY TABLE hm6 SELECT * FROM hm1 WHERE wh = 17;
|
|
||||||
CREATE TEMPORARY TABLE hm7 SELECT * FROM hm1 WHERE wh = 37;
|
|
||||||
CREATE TEMPORARY TABLE hm8 SELECT * FROM hm1 WHERE wh = 55;
|
|
||||||
|
|
||||||
SELECT * FROM
|
|
||||||
|
|
||||||
(
|
|
||||||
|
|
||||||
SELECT Fecha, Entrada as BOGEntrada, Salida as BOGSalida, OK as BOGOK, Referencia as BOGReferencia, id as BOGid,
|
|
||||||
|
|
||||||
NULL AS VNHEntrada, NULL AS VNHSalida, NULL AS VNHOK, NULL AS VNHReferencia, NULL AS VNHid,
|
|
||||||
|
|
||||||
NULL AS ALGEntrada, NULL AS ALGSalida, NULL AS ALGOK, NULL AS ALGReferencia, NULL AS ALGid,
|
|
||||||
|
|
||||||
NULL AS MADEntrada, NULL AS MADSalida, NULL AS MADOK, NULL AS MADReferencia, NULL AS MADid,
|
|
||||||
|
|
||||||
NULL AS MCFEntrada, NULL AS MCFSalida, NULL AS MCFOK, NULL AS MCFReferencia, NULL AS MCFid,
|
|
||||||
|
|
||||||
NULL AS VILEntrada, NULL AS VILSalida, NULL AS VILOK, NULL AS VILReferencia, NULL AS VILid,
|
|
||||||
|
|
||||||
NULL AS BAREntrada, NULL AS BARSalida, NULL AS BAROK, NULL AS BARReferencia, NULL AS BARid
|
|
||||||
|
|
||||||
FROM hm2
|
|
||||||
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
,Entrada, Salida, OK, Referencia, id
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
FROM hm3
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, Entrada, Salida, OK, Referencia, id
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
FROM hm4
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, Entrada, Salida, OK, Referencia, id
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
FROM hm5
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, Entrada, Salida, OK, Referencia, id
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
FROM hm6
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, Entrada, Salida, OK, Referencia, id
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
|
|
||||||
|
|
||||||
FROM hm7
|
|
||||||
|
|
||||||
UNION ALL
|
|
||||||
|
|
||||||
SELECT Fecha
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, NULL, NULL, NULL, NULL, NULL
|
|
||||||
, Entrada, Salida, OK, Referencia, id
|
|
||||||
|
|
||||||
FROM hm8
|
|
||||||
|
|
||||||
) sub
|
|
||||||
|
|
||||||
ORDER BY Fecha, BOGEntrada IS NULL, VNHEntrada IS NULL, ALGEntrada IS NULL, MADEntrada IS NULL, MCFEntrada IS NULL, VILEntrada IS NULL, BAREntrada IS NULL;
|
|
||||||
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
||||||
|
|
@ -5,7 +5,6 @@ AS SELECT `c`.`id` AS `id`,
|
||||||
`c`.`code` AS `abbreviation`,
|
`c`.`code` AS `abbreviation`,
|
||||||
`c`.`supplierAccountFk` AS `Id_Proveedores_account`,
|
`c`.`supplierAccountFk` AS `Id_Proveedores_account`,
|
||||||
`c`.`workerManagerFk` AS `gerente_id`,
|
`c`.`workerManagerFk` AS `gerente_id`,
|
||||||
`c`.`sage200Company` AS `digito_factura`,
|
|
||||||
`c`.`phytosanitary` AS `phytosanitary`,
|
`c`.`phytosanitary` AS `phytosanitary`,
|
||||||
`c`.`companyCode` AS `CodigoEmpresa`,
|
`c`.`companyCode` AS `CodigoEmpresa`,
|
||||||
`c`.`companyGroupFk` AS `empresa_grupo`,
|
`c`.`companyGroupFk` AS `empresa_grupo`,
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
|
||||||
|
vItemFk INT)
|
||||||
|
BEGIN
|
||||||
|
DECLARE vDateInventory DATETIME;
|
||||||
|
SELECT inventoried INTO vDateInventory FROM config;
|
||||||
|
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
|
||||||
|
vItemFk INT, vWarehouse INT, vDate DATETIME)
|
||||||
|
BEGIN
|
||||||
|
DECLARE vCalculatedInventory INT;
|
||||||
|
SET vCalculatedInventory = 0;
|
||||||
|
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
||||||
|
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.absoluteInventoryHistory TO buyer;
|
||||||
|
GRANT EXECUTE ON PROCEDURE vn.multipleInventoryHistory TO buyer;
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE util.debug MODIFY COLUMN value text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;
|
||||||
|
|
@ -24,7 +24,7 @@ describe('Ticket descriptor path', () => {
|
||||||
|
|
||||||
it('should go back to the ticket index then search and access a ticket summary', async() => {
|
it('should go back to the ticket index then search and access a ticket summary', async() => {
|
||||||
await page.accessToSection('ticket.index');
|
await page.accessToSection('ticket.index');
|
||||||
await page.accessToSearchResult('11');
|
await page.accessToSearchResult('33');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should add the ticket to thursday turn using the descriptor more menu', async() => {
|
it('should add the ticket to thursday turn using the descriptor more menu', async() => {
|
||||||
|
|
@ -33,7 +33,7 @@ describe('Ticket descriptor path', () => {
|
||||||
await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
|
await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
|
||||||
const message = await page.waitForSnackbar();
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
expect(message.text).toContain('Data saved!');
|
expect(message.text).toContain('Current ticket deleted and added to shift');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should again click on the Tickets button of the top bar menu', async() => {
|
it('should again click on the Tickets button of the top bar menu', async() => {
|
||||||
|
|
@ -43,7 +43,7 @@ describe('Ticket descriptor path', () => {
|
||||||
await page.waitForState('ticket.index');
|
await page.waitForState('ticket.index');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should confirm the ticket 11 was added to thursday', async() => {
|
it('should confirm the ticket 33 was added to thursday', async() => {
|
||||||
await page.accessToSection('ticket.weekly.index');
|
await page.accessToSection('ticket.weekly.index');
|
||||||
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
|
const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
|
||||||
|
|
||||||
|
|
@ -57,8 +57,8 @@ describe('Ticket descriptor path', () => {
|
||||||
await page.waitForState('ticket.index');
|
await page.waitForState('ticket.index');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should now search for the ticket 11', async() => {
|
it('should now search for the ticket 33', async() => {
|
||||||
await page.accessToSearchResult('11');
|
await page.accessToSearchResult('33');
|
||||||
await page.waitForState('ticket.card.summary');
|
await page.waitForState('ticket.card.summary');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -68,7 +68,7 @@ describe('Ticket descriptor path', () => {
|
||||||
await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
|
await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
|
||||||
const message = await page.waitForSnackbar();
|
const message = await page.waitForSnackbar();
|
||||||
|
|
||||||
expect(message.text).toContain('Data saved!');
|
expect(message.text).toContain('Current ticket deleted and added to shift');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should click on the Tickets button of the top bar menu once again', async() => {
|
it('should click on the Tickets button of the top bar menu once again', async() => {
|
||||||
|
|
@ -78,7 +78,7 @@ describe('Ticket descriptor path', () => {
|
||||||
await page.waitForState('ticket.index');
|
await page.waitForState('ticket.index');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should confirm the ticket 11 was added on saturday', async() => {
|
it('should confirm the ticket 33 was added on saturday', async() => {
|
||||||
await page.accessToSection('ticket.weekly.index');
|
await page.accessToSection('ticket.weekly.index');
|
||||||
await page.waitForTimeout(5000);
|
await page.waitForTimeout(5000);
|
||||||
|
|
||||||
|
|
@ -87,14 +87,14 @@ describe('Ticket descriptor path', () => {
|
||||||
expect(result).toEqual('Saturday');
|
expect(result).toEqual('Saturday');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should now search for the weekly ticket 11', async() => {
|
it('should now search for the weekly ticket 33', async() => {
|
||||||
await page.doSearch('11');
|
await page.doSearch('33');
|
||||||
const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
|
const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
|
||||||
|
|
||||||
expect(nResults).toEqual(2);
|
expect(nResults).toEqual(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should delete the weekly ticket 11', async() => {
|
it('should delete the weekly ticket 33', async() => {
|
||||||
await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
|
await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
|
||||||
await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
|
await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
|
||||||
const message = await page.waitForSnackbar();
|
const message = await page.waitForSnackbar();
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,11 @@ module.exports = Self => {
|
||||||
AND t.refFk IS NULL
|
AND t.refFk IS NULL
|
||||||
GROUP BY t.id
|
GROUP BY t.id
|
||||||
`, [toDate, toDate]);
|
`, [toDate, toDate]);
|
||||||
|
const ticketIds = tickets.map(ticket => ticket.id);
|
||||||
|
await Self.rawSql(`
|
||||||
|
INSERT INTO util.debug (variable, value)
|
||||||
|
VALUES ('nightInvoicing', ?)
|
||||||
|
`, [ticketIds.join(',')]);
|
||||||
|
|
||||||
await closure(ctx, Self, tickets);
|
await closure(ctx, Self, tickets);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
|
||||||
const failedtickets = [];
|
const failedtickets = [];
|
||||||
for (const ticket of tickets) {
|
for (const ticket of tickets) {
|
||||||
try {
|
try {
|
||||||
|
await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
|
||||||
|
|
||||||
await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
|
await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
|
||||||
await Self.rawSql(
|
await Self.rawSql(
|
||||||
`CALL vn.ticket_closeByTicket(?)`,
|
`CALL vn.ticket_closeByTicket(?)`,
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ describe('ticket filter()', () => {
|
||||||
const filter = {};
|
const filter = {};
|
||||||
const result = await models.Ticket.filter(ctx, filter, options);
|
const result = await models.Ticket.filter(ctx, filter, options);
|
||||||
|
|
||||||
expect(result.length).toEqual(6);
|
expect(result.length).toEqual(7);
|
||||||
|
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
const UserError = require('vn-loopback/util/user-error');
|
const UserError = require('vn-loopback/util/user-error');
|
||||||
|
const LoopBackContext = require('loopback-context');
|
||||||
|
|
||||||
module.exports = Self => {
|
module.exports = Self => {
|
||||||
require('../methods/ticket-weekly/filter')(Self);
|
require('../methods/ticket-weekly/filter')(Self);
|
||||||
|
|
@ -8,4 +9,11 @@ module.exports = Self => {
|
||||||
return new UserError(`This ticket is already on weekly tickets`);
|
return new UserError(`This ticket is already on weekly tickets`);
|
||||||
return err;
|
return err;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Self.observe('after save', async ctx => {
|
||||||
|
const loopBackContext = LoopBackContext.getCurrentContext();
|
||||||
|
const httpCtx = {req: loopBackContext.active};
|
||||||
|
const httpRequest = httpCtx.req.http;
|
||||||
|
await Self.app.models.Ticket.setDeleted(httpRequest, ctx.instance.ticketFk, ctx.options);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,8 @@ class Controller extends Section {
|
||||||
return this.$http.patch(`TicketWeeklies`, params)
|
return this.$http.patch(`TicketWeeklies`, params)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.$.addTurn.hide();
|
this.$.addTurn.hide();
|
||||||
this.vnApp.showSuccess(this.$t('Data saved!'));
|
this.vnApp.showSuccess(this.$t('Current ticket deleted and added to shift'));
|
||||||
|
this.reload();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('addTurn()', () => {
|
describe('addTurn()', () => {
|
||||||
|
pending('refs #6302');
|
||||||
it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
|
it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
|
||||||
controller.$.addTurn = {hide: () => {}};
|
controller.$.addTurn = {hide: () => {}};
|
||||||
jest.spyOn(controller.$.addTurn, 'hide');
|
jest.spyOn(controller.$.addTurn, 'hide');
|
||||||
|
|
|
||||||
|
|
@ -28,3 +28,4 @@ Create a single ticket with all the content of the current ticket: Crea un ticke
|
||||||
Set ticket weight: Establecer peso al ticket
|
Set ticket weight: Establecer peso al ticket
|
||||||
Ticket weight: Peso del ticket
|
Ticket weight: Peso del ticket
|
||||||
This address has incoterms, you should set the weight before invoice it: Este consigatario tiene incoterms, deberías establecer el peso antes de facturar
|
This address has incoterms, you should set the weight before invoice it: Este consigatario tiene incoterms, deberías establecer el peso antes de facturar
|
||||||
|
Current ticket deleted and added to shift: Ticket actual borrado y añadido a turno
|
||||||
|
|
@ -56,7 +56,7 @@
|
||||||
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
|
"@babel/plugin-syntax-dynamic-import": "^7.7.4",
|
||||||
"@babel/preset-env": "^7.11.0",
|
"@babel/preset-env": "^7.11.0",
|
||||||
"@babel/register": "^7.7.7",
|
"@babel/register": "^7.7.7",
|
||||||
"@verdnatura/myt": "^1.6.8",
|
"@verdnatura/myt": "^1.6.9",
|
||||||
"angular-mocks": "^1.7.9",
|
"angular-mocks": "^1.7.9",
|
||||||
"babel-jest": "^26.0.1",
|
"babel-jest": "^26.0.1",
|
||||||
"babel-loader": "^8.2.4",
|
"babel-loader": "^8.2.4",
|
||||||
|
|
|
||||||
|
|
@ -131,8 +131,8 @@ devDependencies:
|
||||||
specifier: ^7.7.7
|
specifier: ^7.7.7
|
||||||
version: 7.23.7(@babel/core@7.23.9)
|
version: 7.23.7(@babel/core@7.23.9)
|
||||||
'@verdnatura/myt':
|
'@verdnatura/myt':
|
||||||
specifier: ^1.6.8
|
specifier: ^1.6.9
|
||||||
version: 1.6.8
|
version: 1.6.9
|
||||||
angular-mocks:
|
angular-mocks:
|
||||||
specifier: ^1.7.9
|
specifier: ^1.7.9
|
||||||
version: 1.8.3
|
version: 1.8.3
|
||||||
|
|
@ -2633,8 +2633,8 @@ packages:
|
||||||
dev: false
|
dev: false
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
/@verdnatura/myt@1.6.8:
|
/@verdnatura/myt@1.6.9:
|
||||||
resolution: {integrity: sha512-jpadr6yAR9TQXPv+has5yOYAolR/YEzsxbLgMR7BoDrpLyVFLHJEy4Dfe+Hy11r3AmxCB/8lWM+La1YGvXMWOA==}
|
resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
dependencies:
|
dependencies:
|
||||||
'@sqltools/formatter': 1.2.5
|
'@sqltools/formatter': 1.2.5
|
||||||
|
|
@ -4886,6 +4886,7 @@ packages:
|
||||||
/deep-extend@0.6.0:
|
/deep-extend@0.6.0:
|
||||||
resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
|
resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
|
||||||
engines: {node: '>=4.0.0'}
|
engines: {node: '>=4.0.0'}
|
||||||
|
requiresBuild: true
|
||||||
|
|
||||||
/deep-is@0.1.4:
|
/deep-is@0.1.4:
|
||||||
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
|
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
|
||||||
|
|
@ -12714,6 +12715,7 @@ packages:
|
||||||
/strip-json-comments@2.0.1:
|
/strip-json-comments@2.0.1:
|
||||||
resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
|
resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
requiresBuild: true
|
||||||
|
|
||||||
/strip-json-comments@3.1.1:
|
/strip-json-comments@3.1.1:
|
||||||
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
|
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue