refs #6915 test_master24_8 #2067
|
|
@ -0,0 +1,41 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`XDiario_reconciliation`()
|
||||
BEGIN
|
||||
/**
|
||||
* Realiza la conciliación diaria de los asientos contables,
|
||||
* identificando y notificando los asientos descuadrados
|
||||
* y ajustando los saldos en caso necesario.
|
||||
*/
|
||||
INSERT INTO mail (receiver, subject, body)
|
||||
SELECT 'cau@verdnatura.es',
|
||||
'Asientos descuadrados',
|
||||
GROUP_CONCAT(CONCAT(' Asiento: ', ASIEN, ' - Importe:', recon) SEPARATOR ' | \n')
|
||||
FROM (
|
||||
SELECT ASIEN,
|
||||
SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
|
||||
FROM XDiario
|
||||
WHERE NOT enlazado
|
||||
GROUP BY ASIEN
|
||||
HAVING ABS(SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0))) > 0.01
|
||||
) sub
|
||||
HAVING COUNT(*);
|
||||
|
||||
UPDATE XDiario xd
|
||||
JOIN (
|
||||
SELECT xd.id, SUBCTA, recon
|
||||
FROM XDiario xd
|
||||
JOIN (
|
||||
SELECT ASIEN,
|
||||
SUM(IFNULL(ROUND(Eurodebe, 2), 0)) - SUM(IFNULL(ROUND(EUROHABER, 2), 0)) recon
|
||||
FROM XDiario
|
||||
WHERE NOT enlazado
|
||||
GROUP BY ASIEN
|
||||
HAVING recon
|
||||
) sub ON sub.ASIEN = xd.ASIEN
|
||||
WHERE xd.SUBCTA > '5999999999'
|
||||
GROUP BY xd.ASIEN
|
||||
) sub ON sub.id = xd.id
|
||||
SET xd.Eurohaber = IF(IFNULL(xd.Eurohaber, 0) = 0, xd.Eurohaber, xd.Eurohaber + sub.recon),
|
||||
xd.Eurodebe = IF(IFNULL(xd.Eurodebe, 0) = 0, xd.Eurodebe, xd.Eurodebe - sub.recon);
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,203 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_getTransfer`(
|
||||
vSelf INT
|
||||
)
|
||||
BEGIN
|
||||
/**
|
||||
* Gestiona el traslado de productos a partir de una entrada específica.
|
||||
*
|
||||
* @param vSelf Id de entrada
|
||||
*/
|
||||
DECLARE vDateShipped DATE;
|
||||
DECLARE vDateLanded DATE;
|
||||
DECLARE vWarehouseIn INT;
|
||||
DECLARE vWarehouseOut INT;
|
||||
DECLARE vCalcVisible INT;
|
||||
DECLARE vInventoryDate DATE DEFAULT vn.getInventoryDate();
|
||||
|
||||
SELECT shipped, landed, warehouseInFk, warehouseOutFk
|
||||
INTO vDateShipped, vDateLanded, vWarehouseIn, vWarehouseOut
|
||||
FROM vn.travel t
|
||||
JOIN vn.entry e ON e.travelFk = t.id
|
||||
WHERE e.id = vSelf;
|
||||
|
||||
CALL vn.rate_getPrices(vDateShipped, vWarehouseIn);
|
||||
|
||||
-- Traslado en almacen origen
|
||||
CREATE OR REPLACE TEMPORARY TABLE tBuy
|
||||
(PRIMARY KEY (itemFk), INDEX(buyFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT *
|
||||
FROM (
|
||||
SELECT b.itemFk, b.id buyFk
|
||||
FROM buy b
|
||||
JOIN entry e ON e.id = b.entryFk
|
||||
JOIN travel t ON t.id = e.travelFk
|
||||
WHERE t.landed BETWEEN vInventoryDate AND vDateShipped
|
||||
AND NOT b.isIgnored
|
||||
AND b.price2 >= 0
|
||||
ORDER BY (vWarehouseOut = t.warehouseInFk) DESC, t.landed DESC
|
||||
LIMIT 10000000000000000000
|
||||
) sub
|
||||
GROUP BY itemFk;
|
||||
|
||||
IF vDateShipped >= util.VN_CURDATE() THEN
|
||||
CALL `cache`.visible_refresh(vCalcVisible, TRUE, vWarehouseOut);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tItem (
|
||||
`itemFk` int(10) unsigned NOT NULL,
|
||||
`visible` int(11) NOT NULL DEFAULT 0,
|
||||
`available` int(11) NOT NULL DEFAULT 0,
|
||||
`visibleLanding` int(11) NOT NULL DEFAULT 0,
|
||||
`availableLanding` int(11) NOT NULL DEFAULT 0,
|
||||
UNIQUE INDEX i USING HASH (itemFk)
|
||||
) ENGINE = MEMORY;
|
||||
|
||||
INSERT INTO tItem(itemFk, visible)
|
||||
SELECT item_id itemFk, visible
|
||||
FROM `cache`.visible
|
||||
WHERE calc_id = vCalcVisible
|
||||
AND visible;
|
||||
|
||||
CALL `cache`.visible_refresh(vCalcVisible, TRUE, vWarehouseIn);
|
||||
|
||||
INSERT INTO tItem(itemFk, visibleLanding)
|
||||
SELECT item_id, `visible`
|
||||
FROM `cache`.`visible` v
|
||||
WHERE v.calc_id = vCalcVisible
|
||||
AND v.`visible`
|
||||
ON DUPLICATE KEY UPDATE visibleLanding = v.`visible`;
|
||||
|
||||
CALL vn2008.availableTraslate(vWarehouseOut, vDateShipped, NULL);
|
||||
|
||||
INSERT INTO tItem(itemFk, available)
|
||||
SELECT a.item_id, a.available
|
||||
FROM vn2008.availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE available = a.available;
|
||||
|
||||
CALL vn2008.availableTraslate(vWarehouseIn, vDateLanded, vWarehouseOut);
|
||||
|
||||
INSERT INTO tItem(itemFk, availableLanding)
|
||||
SELECT a.item_id, a.available
|
||||
FROM vn2008.availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE availableLanding = a.available;
|
||||
ELSE
|
||||
CALL vn.item_getStock(vWarehouseOut, vDateShipped, NULL);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tItem
|
||||
(UNIQUE INDEX i USING HASH (itemFk))
|
||||
ENGINE = MEMORY
|
||||
SELECT itemFk,
|
||||
`visible`,
|
||||
available,
|
||||
0 visibleLanding,
|
||||
0 availableLanding
|
||||
FROM tmp.itemList;
|
||||
END IF;
|
||||
|
||||
CALL vn.buyUltimateFromInterval(vWarehouseIn,vInventoryDate, vDateLanded);
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tTransfer
|
||||
ENGINE = MEMORY
|
||||
SELECT it.categoryFk,
|
||||
i.typeFk,
|
||||
i.id itemFk,
|
||||
i.name item,
|
||||
i.`size`,
|
||||
i.category,
|
||||
i.inkFk,
|
||||
o.code originCode,
|
||||
b2.quantity,
|
||||
i.stems,
|
||||
CAST(ti.visible AS DECIMAL(10,0)) vis1,
|
||||
CAST(ti.available AS DECIMAL(10,0)) ava1,
|
||||
CAST(ti.visibleLanding AS DECIMAL(10,0)) vis2,
|
||||
CAST(ti.availableLanding AS DECIMAL(10,0)) ava,
|
||||
COALESCE(b2.`grouping`, b.`grouping`) `grouping`,
|
||||
COALESCE(b2.packing, b.packing) packing,
|
||||
COALESCE(b3.groupingMode, b2.groupingMode, b.groupingMode) package,
|
||||
IFNULL(p.name, s.nickname) productor,
|
||||
b.packagingFk,
|
||||
b2.id buyFk,
|
||||
b2.stickers,
|
||||
b.ektFk,
|
||||
it.workerFk,
|
||||
pa.volume,
|
||||
IFNULL(pa.width, 0) width,
|
||||
IFNULL(pa.`depth`, 0) `depth`,
|
||||
IFNULL(pa.height, 0) height,
|
||||
IFNULL(b.buyingValue, 0) buyingValue,
|
||||
IFNULL(b.comissionValue, 0) comissionValue,
|
||||
IFNULL(b.freightValue, 0) freightValue,
|
||||
am.m3,
|
||||
e.commission,
|
||||
pa.isPackageReturnable,
|
||||
IFNULL(pa2.value, pa.value) `value`,
|
||||
r.rate3,
|
||||
r.rate2,
|
||||
it.promo,
|
||||
b.`grouping` groupingOrigin,
|
||||
b.packing packingOrigin,
|
||||
b.id buyFkOrigin,
|
||||
pa.returnCost,
|
||||
b.weight
|
||||
FROM vn.item i
|
||||
JOIN tItem ti ON ti.itemFk = i.id
|
||||
LEFT JOIN vn.producer p ON p.id = i.producerFk
|
||||
LEFT JOIN vn.itemType it ON it.id = i.typeFk
|
||||
JOIN vn.itemCategory ic ON ic.id = it.categoryFk
|
||||
LEFT JOIN vn.origin o ON o.id = i.originFk
|
||||
LEFT JOIN tBuy lb ON lb.itemFk = i.id
|
||||
LEFT JOIN vn.buy b ON b.id = lb.buyFk
|
||||
LEFT JOIN vn.packaging pa ON pa.id = b.packagingFk
|
||||
LEFT JOIN vn.entry e2 ON e2.id = b.entryFk
|
||||
LEFT JOIN vn.supplier s ON s.id = e2.supplierFk
|
||||
LEFT JOIN vn.entry e ON e.id = vSelf
|
||||
LEFT JOIN vn.travel tr ON tr.id = e.travelFk
|
||||
LEFT JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
|
||||
LEFT JOIN vn.buy b2 ON b2.itemFk = i.id
|
||||
AND b2.entryFk = vSelf
|
||||
LEFT JOIN vn.packaging pa2 ON pa2.id = b.packagingFk
|
||||
LEFT JOIN tmp.rate r ON TRUE
|
||||
LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = i.id
|
||||
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)
|
||||
ORDER BY i.typeFk, i.name, i.id, i.size, i.category, o.name;
|
||||
|
||||
CREATE INDEX tIndex USING HASH ON tTransfer (itemFk);
|
||||
|
||||
SET @carriage := 0;
|
||||
SET @comission := 0;
|
||||
SET @packaging := 0;
|
||||
SET @rate3 := 0;
|
||||
SET @cost := 0;
|
||||
SELECT *,
|
||||
quantity - MOD(quantity , `grouping`) subQuantity,
|
||||
MOD(quantity, `grouping`) soll,
|
||||
ROUND((IF(volume > 0,volume, width * `depth` * IF(height = 0, `size` + 10, height))) / packing, 0) cm3,
|
||||
buyingValue + comissionValue + freightValue Cost,
|
||||
@carriage := ROUND((IF(volume > 0, volume, width * `depth` * IF(height = 0, `size` + 10, height))) * m3 / 1000000 / Packing, 3) carriage,
|
||||
@comission := ROUND((buyingValue + comissionValue + freightValue) * commission / 100, 3) commission,
|
||||
ROUND(@packaging := (returnCost + IF(isPackageReturnable != 0, 0, value)) / packing, 3) packaging,
|
||||
@cost := IFNULL((buyingValue + comissionValue + freightValue), 0) +
|
||||
IFNULL(@packaging, 0) +
|
||||
IFNULL(@carriage, 0) +
|
||||
IFNULL(@comission, 0) cost,
|
||||
@rate3 := ROUND(@cost / ( (100 - rate3 - promo) / 100), 2) rate3,
|
||||
ROUND(@rate3 * (1 + ((rate2 - rate3)/100)), 2) rate2,
|
||||
FALSE selected
|
||||
FROM tTransfer;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS
|
||||
tTransfer,
|
||||
tItem,
|
||||
tBuy,
|
||||
tmp.buyUltimateFromInterval,
|
||||
tmp.rate,
|
||||
tmp.itemList;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`supplier_statement`(
|
||||
vSupplierFk INT,
|
||||
vCurrencyFk INT,
|
||||
vCompanyFk INT,
|
||||
vOrderBy VARCHAR(15),
|
||||
vIsConciliated BOOL
|
||||
)
|
||||
BEGIN
|
||||
/**
|
||||
* Crea un estado de cuenta de proveedores calculando
|
||||
* los saldos en euros y en la moneda especificada.
|
||||
*
|
||||
* @param vSupplierFk Id del proveedor
|
||||
* @param vCurrencyFk Id de la moneda
|
||||
* @param vCompanyFk Id de la empresa
|
||||
* @param vOrderBy Criterio de ordenación
|
||||
* @param vIsConciliated Indica si está conciliado o no
|
||||
* @return tmp.supplierStatement
|
||||
*/
|
||||
SET @euroBalance:= 0;
|
||||
SET @currencyBalance:= 0;
|
||||
|
||||
CREATE OR REPLACE TEMPORARY TABLE tmp.supplierStatement
|
||||
ENGINE = MEMORY
|
||||
SELECT *,
|
||||
@euroBalance:= ROUND(
|
||||
@euroBalance + IFNULL(paymentEuros, 0) -
|
||||
IFNULL(invoiceEuros, 0), 2
|
||||
) euroBalance,
|
||||
@currencyBalance:= ROUND(
|
||||
@currencyBalance + IFNULL(paymentCurrency, 0) -
|
||||
IFNULL(invoiceCurrency, 0), 2
|
||||
) currencyBalance
|
||||
FROM (
|
||||
SELECT * FROM
|
||||
(
|
||||
SELECT NULL bankFk,
|
||||
ii.companyFk,
|
||||
ii.serial,
|
||||
ii.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN ii.issued
|
||||
WHEN vOrderBy = 'bookEntried' THEN ii.bookEntried
|
||||
WHEN vOrderBy = 'booked' THEN ii.booked
|
||||
WHEN vOrderBy = 'dueDate' THEN iid.dueDated
|
||||
END dated,
|
||||
CONCAT('S/Fra ', ii.supplierRef) sref,
|
||||
IF(ii.currencyFk > 1,
|
||||
ROUND(SUM(iid.foreignValue) / SUM(iid.amount), 3),
|
||||
NULL
|
||||
) changeValue,
|
||||
CAST(SUM(iid.amount) AS DECIMAL(10,2)) invoiceEuros,
|
||||
CAST(SUM(iid.foreignValue) AS DECIMAL(10,2)) invoiceCurrency,
|
||||
NULL paymentEuros,
|
||||
NULL paymentCurrency,
|
||||
ii.currencyFk,
|
||||
ii.isBooked,
|
||||
c.code,
|
||||
'invoiceIn' statementType
|
||||
FROM invoiceIn ii
|
||||
JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
|
||||
JOIN currency c ON c.id = ii.currencyFk
|
||||
WHERE ii.issued > '2014-12-31'
|
||||
AND ii.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (ii.currencyFk, 0)
|
||||
AND vCompanyFk IN (ii.companyFk, 0)
|
||||
AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
|
||||
GROUP BY iid.id
|
||||
UNION ALL
|
||||
SELECT p.bankFk,
|
||||
p.companyFk,
|
||||
NULL,
|
||||
p.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN p.received
|
||||
WHEN vOrderBy = 'bookEntried' THEN p.received
|
||||
WHEN vOrderBy = 'booked' THEN p.received
|
||||
WHEN vOrderBy = 'dueDate' THEN p.dueDated
|
||||
END,
|
||||
CONCAT(IFNULL(pm.name, ''),
|
||||
IF(pn.concept <> '',
|
||||
CONCAT(' : ', pn.concept),
|
||||
'')
|
||||
),
|
||||
IF(p.currencyFk > 1, p.divisa / p.amount, NULL),
|
||||
NULL,
|
||||
NULL,
|
||||
p.amount,
|
||||
p.divisa,
|
||||
p.currencyFk,
|
||||
p.isConciliated,
|
||||
c.code,
|
||||
'payment'
|
||||
FROM payment p
|
||||
LEFT JOIN currency c ON c.id = p.currencyFk
|
||||
LEFT JOIN bank b ON b.id = p.bankFk
|
||||
LEFT JOIN payMethod pm ON pm.id = p.payMethodFk
|
||||
LEFT JOIN promissoryNote pn ON pn.paymentFk = p.id
|
||||
WHERE p.received > '2014-12-31'
|
||||
AND p.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (p.currencyFk, 0)
|
||||
AND vCompanyFk IN (p.companyFk, 0)
|
||||
AND (vIsConciliated = p.isConciliated OR NOT vIsConciliated)
|
||||
UNION ALL
|
||||
SELECT NULL,
|
||||
companyFk,
|
||||
NULL,
|
||||
se.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN se.dated
|
||||
WHEN vOrderBy = 'bookEntried' THEN se.dated
|
||||
WHEN vOrderBy = 'booked' THEN se.dated
|
||||
WHEN vOrderBy = 'dueDate' THEN se.dueDated
|
||||
END,
|
||||
se.description,
|
||||
1,
|
||||
amount,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
currencyFk,
|
||||
isConciliated,
|
||||
c.`code`,
|
||||
'expense'
|
||||
FROM supplierExpense se
|
||||
JOIN currency c ON c.id = se.currencyFk
|
||||
WHERE se.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (se.currencyFk,0)
|
||||
AND vCompanyFk IN (se.companyFk,0)
|
||||
AND (vIsConciliated = se.isConciliated OR NOT vIsConciliated)
|
||||
) sub
|
||||
ORDER BY (dated IS NULL AND NOT isBooked),
|
||||
dated,
|
||||
IF(vOrderBy = 'dueDate', id, NULL)
|
||||
LIMIT 10000000000000000000
|
||||
) t;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,103 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`travel_detail`()
|
||||
BEGIN
|
||||
/**
|
||||
* Devuelve los detalles de los vuelos que tienen
|
||||
* un almacén de salida en Ecuador o Colombia.
|
||||
*/
|
||||
DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL 12 WEEK;
|
||||
SELECT IFNULL(CONCAT(" ", entryFk), travelFk) travelAndEntry,
|
||||
sub.*
|
||||
FROM (
|
||||
SELECT tr.id travelFk,
|
||||
NULL entryFk,
|
||||
TRUE isTravel,
|
||||
am.name agency,
|
||||
tr.ref,
|
||||
tr.shipped,
|
||||
wOut.name originBoxes,
|
||||
tr.landed,
|
||||
wIn.name destination,
|
||||
SUM(b.stickers) stickers,
|
||||
NULL evaNotes,
|
||||
tr.kg,
|
||||
CAST(SUM(b.weight * b.stickers) AS INT) loadedkg,
|
||||
CAST(
|
||||
SUM(vc.aerealVolumetricDensity *
|
||||
b.stickers *
|
||||
IF(p.volume,
|
||||
p.volume,
|
||||
p.width * p.depth * p.height
|
||||
) / 1000000
|
||||
) AS INT
|
||||
) volumeKg,
|
||||
NULL loadPriority,
|
||||
NULL invoiceAmount,
|
||||
s.nickname freighter,
|
||||
NULL reference
|
||||
FROM travel tr
|
||||
LEFT JOIN supplier s ON s.id = tr.cargoSupplierFk
|
||||
LEFT JOIN entry e ON e.travelFk = tr.id
|
||||
LEFT JOIN buy b ON b.entryFk = e.id
|
||||
LEFT JOIN packaging p ON p.id = b.packagingFk
|
||||
LEFT JOIN item i ON i.id = b.itemFk
|
||||
LEFT JOIN itemType it ON it.id = i.typeFk
|
||||
JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
|
||||
JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
|
||||
JOIN agencyMode am ON am.id = tr.agencyModeFk
|
||||
JOIN volumeConfig vc
|
||||
WHERE tr.landed >= vDateFrom
|
||||
AND (wOut.code = "col" OR wOut.code = "ecu")
|
||||
GROUP BY tr.id
|
||||
UNION ALL
|
||||
SELECT e.travelFk,
|
||||
e.id,
|
||||
FALSE,
|
||||
s.name,
|
||||
e.invoiceNumber,
|
||||
tr.shipped,
|
||||
wOut.name,
|
||||
tr.landed,
|
||||
wIn.name,
|
||||
SUM(b.stickers),
|
||||
e.evaNotes,
|
||||
NULL,
|
||||
CAST(SUM(b.weight * b.stickers) AS INT),
|
||||
CAST(
|
||||
SUM(vc.aerealVolumetricDensity *
|
||||
b.stickers *
|
||||
IF(p.volume,
|
||||
p.volume,
|
||||
p.width * p.depth * p.height
|
||||
) / 1000000
|
||||
) AS INT
|
||||
),
|
||||
loadPriority,
|
||||
e.invoiceAmount,
|
||||
s2.nickname,
|
||||
e.reference
|
||||
FROM entry e
|
||||
JOIN buy b ON b.entryFk = e.id
|
||||
JOIN packaging p ON p.id = b.packagingFk
|
||||
JOIN item i ON i.id = b.itemFk
|
||||
JOIN itemType it ON it.id = i.typeFk
|
||||
JOIN supplier s ON s.id = e.supplierFk
|
||||
JOIN travel tr ON tr.id = e.travelFk
|
||||
LEFT JOIN supplier s2 ON s2.id = tr.cargoSupplierFk
|
||||
JOIN warehouse wIn ON wIn.id = tr.warehouseInFk
|
||||
JOIN warehouse wOut ON wOut.id = tr.warehouseOutFk
|
||||
JOIN volumeConfig vc
|
||||
WHERE tr.landed >= vDateFrom
|
||||
AND (wOut.code = "col" OR wOut.code = "ecu")
|
||||
GROUP BY e.id
|
||||
) sub
|
||||
ORDER BY landed ASC,
|
||||
shipped ASC,
|
||||
travelFk,
|
||||
isTravel DESC,
|
||||
(loadPriority > 0) DESC,
|
||||
loadPriority,
|
||||
agency,
|
||||
evaNotes;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`XDiario_Quadrator`()
|
||||
BEGIN
|
||||
INSERT INTO vn.mail (receiver, subject, body)
|
||||
SELECT 'cau@verdnatura.es',
|
||||
'asientos descuadrados',
|
||||
group_concat(CONCAT(' Asiento: ', ASIEN, '- importe:', quadre) SEPARATOR ' \r\n ')
|
||||
FROM (
|
||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) quadre
|
||||
FROM vn.XDiario
|
||||
WHERE enlazado = FALSE
|
||||
GROUP BY ASIEN
|
||||
HAVING ABS(SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0))) > 0.01
|
||||
) t
|
||||
HAVING count(*) > 0;
|
||||
|
||||
UPDATE vn.XDiario XD
|
||||
INNER JOIN(
|
||||
SELECT XD.id, SUBCTA, Quadre FROM vn.XDiario XD
|
||||
INNER JOIN (
|
||||
SELECT ASIEN, SUM(IFNULL(ROUND(Eurodebe,2),0))- SUM(IFNULL(ROUND(EUROHABER,2),0)) as Quadre
|
||||
FROM vn.XDiario
|
||||
WHERE enlazado = FALSE
|
||||
GROUP BY ASIEN
|
||||
HAVING Quadre != 0
|
||||
) sub USING(ASIEN)
|
||||
WHERE SUBCTA > '5999999999'
|
||||
GROUP BY ASIEN
|
||||
) sub2 USING(id)
|
||||
SET Eurohaber = IF(IFNULL(Eurohaber,0) = 0, Eurohaber, Eurohaber + Quadre),
|
||||
Eurodebe = IF(IFNULL(Eurodebe,0) = 0, Eurodebe, Eurodebe - Quadre);
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,117 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`supplierStatement`(vSupplierFk INT, vCurrencyFk INT, vCompanyFk INT, vOrderBy VARCHAR(15), vOnlyConciliated BIT)
|
||||
BEGIN
|
||||
SET @saldo_eur:= 0;
|
||||
SET @saldo_div:= 0;
|
||||
select vOnlyConciliated;
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.supplierStatement;
|
||||
|
||||
CREATE TEMPORARY TABLE tmp.supplierStatement ENGINE = MEMORY
|
||||
SELECT
|
||||
*,
|
||||
@saldo_eur:= round(@saldo_eur + IFNULL(Pago_Euros, 0) - IFNULL(Fac_Euros, 0) ,2 ) AS saldo_eur,
|
||||
@saldo_div:= round(@saldo_div + IFNULL(Pago_Divisas, 0) - IFNULL(Fac_Divisas, 0) ,2 ) AS saldo_div
|
||||
FROM
|
||||
(SELECT * FROM
|
||||
(SELECT
|
||||
NULL as banco_id,
|
||||
r.empresa_id,
|
||||
r.serie,
|
||||
r.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN r.fecha
|
||||
WHEN vOrderBy = 'bookEntried' THEN r.bookEntried
|
||||
WHEN vOrderBy = 'booked' THEN r.dateBooking
|
||||
WHEN vOrderBy = 'dueDate' THEN rv.fecha
|
||||
END AS fecha,
|
||||
CONCAT('S/Fra ', r.sref) sref,
|
||||
if(r.moneda_id > 1,round(sum(divisa) / sum(cantidad),3),NULL) val_cambio,
|
||||
CAST(sum(cantidad) as DECIMAL(10,2)) as Fac_Euros,
|
||||
CAST(sum(divisa) as DECIMAL(10,2)) as Fac_Divisas,
|
||||
NULL AS Pago_Euros,
|
||||
NULL AS Pago_Divisas,
|
||||
r.moneda_id,
|
||||
r.contabilizada,
|
||||
Moneda,
|
||||
NULL as pago_sdc_id,
|
||||
'invoiceIn' statementType
|
||||
FROM
|
||||
recibida r
|
||||
JOIN recibida_vencimiento rv on rv.recibida_id = r.id
|
||||
JOIN Monedas m on m.Id_Moneda = r.moneda_id
|
||||
WHERE
|
||||
r.fecha > '2014-12-31'
|
||||
AND r.proveedor_id = vSupplierFk
|
||||
AND vCurrencyFk IN (r.moneda_id, 0)
|
||||
AND vCompanyFk IN (r.empresa_id,0)
|
||||
AND (vOnlyConciliated = r.contabilizada OR NOT vOnlyConciliated)
|
||||
GROUP BY rv.id
|
||||
|
||||
UNION ALL
|
||||
SELECT
|
||||
p.id_banco,
|
||||
p.empresa_id,
|
||||
NULL,
|
||||
p.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN p.Fecha
|
||||
WHEN vOrderBy = 'bookEntried' THEN p.Fecha
|
||||
WHEN vOrderBy = 'booked' THEN p.Fecha
|
||||
WHEN vOrderBy = 'dueDate' THEN p.dueDated
|
||||
END AS fecha,
|
||||
CONCAT(IFNULL(name, ''), IF(pre.concepto <> '', CONCAT(' : ', pre.concepto), '')),
|
||||
if(p.id_moneda > 1, p.divisa / importe, NULL) tip_cambio,
|
||||
NULL,
|
||||
NULL,
|
||||
p.importe,
|
||||
p.divisa,
|
||||
p.id_moneda,
|
||||
p.conciliado,
|
||||
Moneda,
|
||||
NULL as pago_sdc_id,
|
||||
'payment' statementType
|
||||
FROM
|
||||
pago p
|
||||
LEFT JOIN Monedas ON Monedas.Id_Moneda = p.id_moneda
|
||||
LEFT JOIN Bancos ON p.id_banco = Bancos.Id_banco
|
||||
LEFT JOIN pay_met pm ON p.pay_met_id = pm.id
|
||||
LEFT JOIN Pagares pre ON pre.pago_id = p.id
|
||||
WHERE
|
||||
Fecha > '2014-12-31'
|
||||
AND p.Id_Proveedor = vSupplierFk
|
||||
AND vCurrencyFk IN (p.id_moneda,0)
|
||||
AND vCompanyFk IN (p.empresa_id,0)
|
||||
AND (vOnlyConciliated = p.conciliado OR NOT vOnlyConciliated)
|
||||
UNION ALL
|
||||
SELECT
|
||||
NULL,
|
||||
companyFk,
|
||||
NULL,
|
||||
se.id,
|
||||
CASE
|
||||
WHEN vOrderBy = 'issued' THEN se.dated
|
||||
WHEN vOrderBy = 'bookEntried' THEN se.dated
|
||||
WHEN vOrderBy = 'booked' THEN se.dated
|
||||
WHEN vOrderBy = 'dueDate' THEN se.dueDated
|
||||
END AS fecha,
|
||||
se.description,
|
||||
1 tip_cambio,
|
||||
amount,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
currencyFk,
|
||||
isConciliated,
|
||||
c.`code`,
|
||||
NULL,
|
||||
'expense' statementType
|
||||
FROM vn.supplierExpense se
|
||||
JOIN vn.currency c on c.id= se.currencyFk
|
||||
WHERE se.supplierFk = vSupplierFk
|
||||
AND vCurrencyFk IN (se.currencyFk,0)
|
||||
AND vCompanyFk IN (se.companyFk,0)
|
||||
AND (vOnlyConciliated = se.isConciliated OR NOT vOnlyConciliated)
|
||||
) AS SUB
|
||||
ORDER BY (fecha is null and NOT contabilizada),fecha, IF(vOrderBy = 'dueDate', id, NULL) LIMIT 10000000000000000000) t;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`traslado`(IN i_entrada INTEGER)
|
||||
BEGIN
|
||||
DECLARE dateShipment DATE;
|
||||
DECLARE dateLanding DATE;
|
||||
DECLARE warehouseShipment INTEGER;
|
||||
DECLARE warehouseLanding INTEGER;
|
||||
DECLARE v_calc_visible INTEGER;
|
||||
DECLARE vInventoryDate DATE;
|
||||
|
||||
SET vInventoryDate := vn.getInventoryDate();
|
||||
SELECT shipment, landing, warehouse_id_out, warehouse_id
|
||||
INTO dateShipment, dateLanding, warehouseShipment, warehouseLanding
|
||||
FROM travel t JOIN Entradas e ON t.id = e.travel_id
|
||||
WHERE Id_Entrada = i_entrada;
|
||||
|
||||
CALL vn.rate_getPrices(dateShipment, warehouseLanding);
|
||||
|
||||
-- Traslado en almacen origen
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS buy_edi_temp;
|
||||
CREATE TEMPORARY TABLE buy_edi_temp
|
||||
(KEY (Id_Article), INDEX(Id_Compra)) ENGINE = MEMORY
|
||||
SELECT *
|
||||
FROM (SELECT c.Id_Article, c.Id_Compra
|
||||
FROM Compres c INNER JOIN Entradas e USING(Id_Entrada)
|
||||
INNER JOIN travel t ON t.id = e.travel_id
|
||||
WHERE t.landing BETWEEN vInventoryDate AND dateShipment
|
||||
AND c.Novincular = FALSE
|
||||
AND c.Tarifa2 >= 0
|
||||
ORDER BY (warehouseShipment = t.warehouse_id) DESC, t.landing DESC
|
||||
LIMIT 10000000000000000000) t
|
||||
GROUP BY Id_Article;
|
||||
|
||||
IF dateShipment >= util.VN_CURDATE() THEN
|
||||
CALL `cache`.visible_refresh(v_calc_visible, TRUE, warehouseShipment);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.item;
|
||||
|
||||
CREATE TEMPORARY TABLE tmp.item (
|
||||
`itemFk` int(10) unsigned NOT NULL,
|
||||
`visible` int(11) NOT NULL DEFAULT 0,
|
||||
`available` int(11) NOT NULL DEFAULT 0,
|
||||
`visibleLanding` int(11) NOT NULL DEFAULT 0,
|
||||
`availableLanding` int(11) NOT NULL DEFAULT 0,
|
||||
UNIQUE INDEX i USING HASH (itemFk)
|
||||
) ENGINE = MEMORY;
|
||||
|
||||
INSERT INTO tmp.item(itemFk, visible)
|
||||
SELECT item_id itemFk, visible
|
||||
FROM `cache`.visible
|
||||
WHERE calc_id = v_calc_visible
|
||||
AND visible;
|
||||
|
||||
CALL `cache`.visible_refresh(v_calc_visible, TRUE, warehouseLanding);
|
||||
|
||||
INSERT INTO tmp.item(itemFk, visibleLanding)
|
||||
SELECT item_id, `visible`
|
||||
FROM `cache`.`visible` v
|
||||
WHERE v.calc_id = v_calc_visible
|
||||
AND v.`visible`
|
||||
ON DUPLICATE KEY UPDATE visibleLanding = v.`visible`;
|
||||
|
||||
CALL availableTraslate(warehouseShipment, dateShipment, NULL);
|
||||
|
||||
INSERT INTO tmp.item(itemFk, available)
|
||||
SELECT a.item_id, a.available
|
||||
FROM availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE available = a.available;
|
||||
|
||||
CALL availableTraslate(warehouseLanding, dateLanding, warehouseShipment);
|
||||
|
||||
INSERT INTO tmp.item(itemFk, availableLanding)
|
||||
SELECT a.item_id, a.available
|
||||
FROM availableTraslate a
|
||||
WHERE a.available
|
||||
ON DUPLICATE KEY UPDATE availableLanding = a.available;
|
||||
ELSE
|
||||
CALL vn.item_getStock(warehouseShipment, dateShipment, NULL);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.item;
|
||||
CREATE TEMPORARY TABLE tmp.item (UNIQUE INDEX i USING HASH (itemFk)) ENGINE = MEMORY
|
||||
SELECT itemFk, `visible`, available , 0 visibleLanding, 0 availableLanding
|
||||
FROM tmp.itemList;
|
||||
|
||||
DROP TEMPORARY TABLE tmp.itemList;
|
||||
END IF;
|
||||
|
||||
CALL vn.buyUltimateFromInterval(warehouseLanding,vInventoryDate, dateLanding);
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS Traslados;
|
||||
CREATE TEMPORARY TABLE Traslados ENGINE = MEMORY
|
||||
SELECT tp.Id_Tipo AS Tipo,
|
||||
tp.reino_id,
|
||||
ar.tipo_id,
|
||||
ar.Id_Article AS article_id,
|
||||
ar.Article,
|
||||
ar.Medida,
|
||||
ar.Categoria,
|
||||
ar.Color,
|
||||
Origen.abreviatura as Origen,
|
||||
CE.Cantidad,
|
||||
ar.Tallos,
|
||||
CAST(AIM.visible AS DECIMAL(10,0)) as vis1,
|
||||
CAST(AIM.available AS DECIMAL(10,0)) as dis1,
|
||||
CAST(AIM.visibleLanding AS DECIMAL(10,0)) as vis2,
|
||||
CAST(AIM.availableLanding AS DECIMAL(10,0)) as dis2,
|
||||
COALESCE(CE.`grouping`, C.`grouping`) as `grouping`,
|
||||
COALESCE(CE.Packing, C.Packing) as Packing,
|
||||
COALESCE(cl.caja, CE.caja, C.caja) as caja,
|
||||
IFNULL(p.name, P2.Alias) AS Productor,
|
||||
C.Id_Cubo,
|
||||
1 Tinta,
|
||||
CE.Id_Compra,
|
||||
CE.Etiquetas,
|
||||
C.buy_edi_id,
|
||||
tp.Id_Trabajador,
|
||||
CB.Volumen,
|
||||
IFNULL(CB.x,0) x,
|
||||
IFNULL(CB.y,0) y,
|
||||
IFNULL(CB.z,0) z,
|
||||
IFNULL(C.Costefijo,0) Costefijo,
|
||||
IFNULL(C.Comisionfija,0) Comisionfija,
|
||||
IFNULL(C.Portefijo,0) Portefijo,
|
||||
A.m3,
|
||||
E.comision,
|
||||
CB.Retornable,
|
||||
IFNULL(CEB.Valor,CB.Valor) Valor,
|
||||
r.rate3 t3, r.rate2 t2, tp.promo,
|
||||
C.`grouping` groupingOrigin,
|
||||
C.Packing PackingOrigin,
|
||||
C.Id_Compra CompraOrigin,
|
||||
CB.costeRetorno,
|
||||
C.weight
|
||||
FROM Articles ar
|
||||
JOIN tmp.item AIM ON AIM.itemFk = ar.Id_Article
|
||||
LEFT JOIN producer p ON p.producer_id = ar.producer_id
|
||||
LEFT JOIN Tipos tp ON tp.tipo_id = ar.tipo_id
|
||||
JOIN vn.itemCategory ic ON ic.id = tp.reino_id
|
||||
LEFT JOIN Origen ON Origen.id = ar.id_origen
|
||||
LEFT JOIN buy_edi_temp lb ON lb.Id_Article = ar.Id_Article
|
||||
LEFT JOIN Compres C ON C.Id_Compra = lb.Id_Compra
|
||||
LEFT JOIN Cubos CB ON CB.Id_Cubo = C.Id_Cubo
|
||||
LEFT JOIN Entradas E2 ON E2.Id_Entrada = C.Id_Entrada
|
||||
LEFT JOIN Proveedores P2 ON P2.Id_Proveedor = E2.Id_Proveedor
|
||||
LEFT JOIN Entradas E ON E.Id_Entrada = i_entrada
|
||||
LEFT JOIN travel TR ON TR.id = E.travel_id
|
||||
LEFT JOIN Agencias A ON A.Id_Agencia = TR.agency_id
|
||||
LEFT JOIN Compres CE ON CE.Id_Article = ar.Id_Article AND CE.Id_Entrada = i_entrada
|
||||
LEFT JOIN Cubos CEB ON CEB.Id_Cubo = CE.Id_Cubo
|
||||
LEFT JOIN tmp.rate r ON TRUE
|
||||
LEFT JOIN tmp.buyUltimateFromInterval bufi ON bufi.itemFk = ar.Id_Article
|
||||
LEFT JOIN Compres cl ON cl.Id_Compra = bufi.buyFk
|
||||
WHERE ic.display
|
||||
AND E.Redada = FALSE
|
||||
AND (AIM.visible != 0 OR AIM.available != 0)
|
||||
ORDER BY tipo_id, Article, article_id, Medida, Categoria, Origen;
|
||||
|
||||
CREATE INDEX tindex USING HASH ON Traslados (article_id);
|
||||
|
||||
SELECT t.*,
|
||||
Cantidad - MOD(Cantidad , `grouping`) as Subcantidad,
|
||||
MOD(Cantidad , `grouping`) as Soll,
|
||||
ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) / Packing,0) as cm3,
|
||||
Costefijo + Comisionfija + Portefijo AS Cost,
|
||||
@porte := ROUND((IF(Volumen > 0,Volumen,x * y * IF(z = 0, Medida + 10, z))) * m3 / 1000000 / Packing ,3) AS Porte,
|
||||
@comision := ROUND((Costefijo + Comisionfija + Portefijo) * comision / 100 ,3) AS Comision,
|
||||
ROUND(@embalaje := (costeRetorno + IF(Retornable != 0, 0, Valor)) / packing ,3) AS Embalaje,
|
||||
@coste := IFNULL((Costefijo + Comisionfija + Portefijo),0) + IFNULL(@embalaje,0) + IFNULL(@porte,0) + IFNULL(@comision,0) AS Coste,
|
||||
@t3 := ROUND(@coste / ( (100 - t3 - t.promo)/100),2) AS Tarifa3,
|
||||
ROUND(@t3 * (1 + ((t2 - t3)/100)),2) AS Tarifa2,
|
||||
0 selected
|
||||
FROM Traslados t;
|
||||
|
||||
DROP TEMPORARY TABLE Traslados;
|
||||
DROP TEMPORARY TABLE tmp.item;
|
||||
DROP TEMPORARY TABLE buy_edi_temp;
|
||||
DROP TEMPORARY TABLE tmp.buyUltimateFromInterval;
|
||||
DROP TEMPORARY TABLE tmp.rate;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,119 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`travelDetail`()
|
||||
BEGIN
|
||||
/**
|
||||
* Returns the details of the travels that have a departure warehouse in Ecuador or Colombia.
|
||||
*/
|
||||
DECLARE vDateFrom DATE DEFAULT util.VN_CURDATE() - INTERVAL 12 WEEK;
|
||||
SELECT IFNULL(CONCAT(" ",Entrada),travel) travelAndEntry,
|
||||
travel,
|
||||
Entrada,
|
||||
IsTravel,
|
||||
Agencia,
|
||||
ref,
|
||||
shipment,
|
||||
OrigenCajas,
|
||||
landing,
|
||||
Destino,
|
||||
Etiquetas,
|
||||
Notas_Eva,
|
||||
kg,
|
||||
loadedKg,
|
||||
volumeKg,
|
||||
loadPriority,
|
||||
invoiceAmount,
|
||||
Carguera,
|
||||
reference
|
||||
FROM
|
||||
(SELECT TRUE IsTravel,
|
||||
tr.id travel,
|
||||
NULL Entrada,
|
||||
ag.Agencia,
|
||||
tr.ref,
|
||||
tr.shipment,
|
||||
wo.name OrigenCajas,
|
||||
tr.landing,
|
||||
w.name Destino,
|
||||
SUM(c.Etiquetas) Etiquetas,
|
||||
NULL Notas_Eva,
|
||||
tr.kg,
|
||||
CAST(SUM(c.weight * c.Etiquetas) AS INT) loadedkg,
|
||||
CAST(
|
||||
SUM(vc.aerealVolumetricDensity *
|
||||
c.Etiquetas *
|
||||
IF(cb.Volumen,
|
||||
cb.Volumen,
|
||||
cb.X * cb.Y * cb.Z
|
||||
) / 1000000
|
||||
) AS INT
|
||||
) volumeKg,
|
||||
NULL loadPriority,
|
||||
NULL invoiceAmount,
|
||||
pc.Alias Carguera,
|
||||
NULL reference
|
||||
FROM travel tr
|
||||
LEFT JOIN Proveedores pc ON pc.Id_Proveedor = tr.cargoSupplierFk
|
||||
LEFT JOIN Entradas e ON e.travel_id = tr.id
|
||||
LEFT JOIN Compres c ON c.Id_Entrada = e.Id_Entrada
|
||||
LEFT JOIN Cubos cb ON cb.Id_Cubo = c.Id_Cubo
|
||||
LEFT JOIN Articles a ON a.Id_Article = c.Id_Article
|
||||
LEFT JOIN Tipos tp ON tp.tipo_id = a.tipo_id
|
||||
JOIN warehouse w ON w.id = tr.warehouse_id
|
||||
JOIN warehouse wo ON wo.id = tr.warehouse_id_out
|
||||
JOIN Agencias ag ON ag.Id_Agencia = tr.agency_id
|
||||
JOIN vn.volumeConfig vc
|
||||
WHERE tr.landing >= vDateFrom
|
||||
AND (wo.name="Colombia" OR wo.name="Ecuador")
|
||||
GROUP BY tr.id
|
||||
UNION ALL
|
||||
SELECT 0 IsTravel,
|
||||
e.travel_id travel,
|
||||
e.Id_Entrada,
|
||||
p.Proveedor,
|
||||
e.Referencia,
|
||||
tr.shipment,
|
||||
wo.name OrigenCajas,
|
||||
tr.landing,
|
||||
w.name Destino,
|
||||
SUM(Etiquetas) Etiquetas,
|
||||
e.Notas_Eva,
|
||||
NULL kg,
|
||||
CAST(SUM(c.weight * c.Etiquetas) AS INT) loadedkg,
|
||||
CAST(
|
||||
SUM(vc.aerealVolumetricDensity *
|
||||
c.Etiquetas *
|
||||
IF(cb.Volumen,
|
||||
cb.Volumen,
|
||||
cb.X * cb.Y * cb.Z
|
||||
) / 1000000
|
||||
) AS INT
|
||||
) volumeKg,
|
||||
loadPriority,
|
||||
e.invoiceAmount,
|
||||
pc.Alias carguera,
|
||||
e.reference
|
||||
FROM Entradas e
|
||||
JOIN Compres c ON c.Id_Entrada = e.Id_Entrada
|
||||
JOIN Cubos cb ON cb.Id_Cubo = c.Id_Cubo
|
||||
JOIN Articles a ON a.Id_Article = c.Id_Article
|
||||
JOIN Tipos tp ON tp.tipo_id = a.tipo_id
|
||||
JOIN Proveedores p ON p.Id_Proveedor = e.Id_Proveedor
|
||||
JOIN travel tr ON tr.id = e.travel_id
|
||||
LEFT JOIN Proveedores pc ON pc.Id_Proveedor = tr.cargoSupplierFk
|
||||
JOIN warehouse w ON w.id = tr.warehouse_id
|
||||
JOIN warehouse wo ON wo.id = tr.warehouse_id_out
|
||||
JOIN vn.volumeConfig vc
|
||||
WHERE tr.landing >= vDateFrom
|
||||
AND (wo.name="Colombia" OR wo.name="Ecuador")
|
||||
GROUP BY e.Id_Entrada
|
||||
) sub
|
||||
ORDER BY landing ASC,
|
||||
shipment ASC,
|
||||
travel,
|
||||
IsTravel DESC,
|
||||
(loadPriority > 0) DESC,
|
||||
loadPriority,
|
||||
Agencia,
|
||||
Notas_Eva;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
GRANT EXECUTE ON PROCEDURE vn.supplier_statement TO administrative, buyer, hrBoss;
|
||||
GRANT EXECUTE ON PROCEDURE vn.XDiario_reconciliation TO adminBoss;
|
||||
GRANT EXECUTE ON PROCEDURE vn.travel_detail TO buyer;
|
||||
GRANT EXECUTE ON PROCEDURE vn.entry_transfer TO claimManager, buyer;
|
||||
Loading…
Reference in New Issue