Merge pull request '6392-balance-produccion-propia' (!2009) from 6392-balance-produccion-propia into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2009 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
This commit is contained in:
commit
175f141fbe
|
|
@ -1750,8 +1750,6 @@ USE `vn`;
|
|||
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
||||
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
||||
|
||||
INSERT INTO `agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
|
||||
|
||||
INSERT INTO `alertLevel` VALUES ('FREE',0,1);
|
||||
INSERT INTO `alertLevel` VALUES ('ON_PREPARATION',1,1);
|
||||
INSERT INTO `alertLevel` VALUES ('PACKED',2,0);
|
||||
|
|
|
|||
|
|
@ -653,6 +653,7 @@ INSERT INTO `vn`.`expense`(`id`, `name`, `isWithheld`)
|
|||
(7001000000, 'Mercaderia', 0),
|
||||
(7050000000, 'Prestacion de servicios', 1);
|
||||
|
||||
INSERT INTO `vn`.`agencyTermConfig` VALUES ('6240000000','4721000015',21.0000000000,'Adquisiciones intracomunitarias de servicios');
|
||||
|
||||
INSERT INTO `vn`.`invoiceOutExpense`(`id`, `invoiceOutFk`, `amount`, `expenseFk`, `created`)
|
||||
VALUES
|
||||
|
|
@ -728,7 +729,7 @@ INSERT INTO `vn`.`route`(`id`, `time`, `workerFk`, `created`, `vehicleFk`, `agen
|
|||
INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeFk`, `shipped`, `landed`, `clientFk`,`nickname`, `addressFk`, `refFk`, `isDeleted`, `zoneFk`, `zonePrice`, `zoneBonus`, `created`, `weight`, `cmrFk`)
|
||||
VALUES
|
||||
(1 , 3, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 121, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 1, 1),
|
||||
(2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 1, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2),
|
||||
(2 , 1, 1, 1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -1 MONTH), INTERVAL +1 DAY), 1101, 'Bat cave', 1, NULL, 0, 1, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), 2, 2),
|
||||
(3 , 1, 7, 1, 6, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -2 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 3, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -2 MONTH), NULL, 3),
|
||||
(4 , 3, 2, 1, 2, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -3 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 9, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -3 MONTH), NULL, NULL),
|
||||
(5 , 3, 3, 3, 3, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), DATE_ADD(DATE_ADD(util.VN_CURDATE(),INTERVAL -4 MONTH), INTERVAL +1 DAY), 1104, 'Stark tower', 124, NULL, 0, 10, 5, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL -4 MONTH), NULL, NULL),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bs`.`ventas_contables_add`(IN vYear INT, IN vMonth INT)
|
||||
BEGIN
|
||||
|
||||
|
||||
/**
|
||||
* Reemplaza las ventas contables del último año.
|
||||
* Es el origen de datos para el balance de Entradas
|
||||
|
|
@ -13,8 +13,8 @@ BEGIN
|
|||
|
||||
DECLARE TIPO_PATRIMONIAL INT DEFAULT 188;
|
||||
|
||||
DELETE FROM bs.ventas_contables
|
||||
WHERE year = vYear
|
||||
DELETE FROM bs.ventas_contables
|
||||
WHERE year = vYear
|
||||
AND month = vMonth;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
|
||||
|
|
@ -25,7 +25,7 @@ BEGIN
|
|||
FROM vn2008.Tickets t
|
||||
JOIN vn.invoiceOut io ON io.id = t.Factura
|
||||
WHERE year(io.issued) = vYear
|
||||
AND month(io.issued) = vMonth;
|
||||
AND month(io.issued) = vMonth;
|
||||
|
||||
INSERT INTO bs.ventas_contables(year
|
||||
, month
|
||||
|
|
@ -35,7 +35,7 @@ BEGIN
|
|||
, tipo_id
|
||||
, empresa_id
|
||||
, gasto)
|
||||
|
||||
|
||||
SELECT vYear
|
||||
, vMonth
|
||||
, round(sum(Cantidad * Preu * (100 - m.Descuento)/100))
|
||||
|
|
@ -47,13 +47,13 @@ BEGIN
|
|||
, tp.reino_id
|
||||
, a.tipo_id
|
||||
, t.empresa_id
|
||||
, 7000000000
|
||||
, a.expenseFk
|
||||
+ IF(e.empresa_grupo = e2.empresa_grupo
|
||||
,1
|
||||
,IF(e2.empresa_grupo,2,0)
|
||||
) * 1000000
|
||||
+ tp.reino_id * 10000 as Gasto
|
||||
FROM vn2008.Movimientos m
|
||||
) * 100000
|
||||
+ tp.reino_id * 1000 as Gasto
|
||||
FROM vn2008.Movimientos m
|
||||
JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
|
||||
JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
|
||||
JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
|
||||
|
|
@ -67,7 +67,7 @@ BEGIN
|
|||
AND m.Descuento <> 100
|
||||
AND a.tipo_id != TIPO_PATRIMONIAL
|
||||
GROUP BY grupo, reino_id, tipo_id, empresa_id, Gasto;
|
||||
|
||||
|
||||
INSERT INTO bs.ventas_contables(year
|
||||
, month
|
||||
, venta
|
||||
|
|
@ -86,17 +86,17 @@ BEGIN
|
|||
) as grupo
|
||||
, NULL
|
||||
, NULL
|
||||
, t.companyFk
|
||||
, t.companyFk
|
||||
, 7050000000
|
||||
FROM vn.ticketService ts
|
||||
FROM vn.ticketService ts
|
||||
JOIN vn.ticket t ON ts.ticketFk = t.id
|
||||
JOIN vn.address a on a.id = t.addressFk
|
||||
JOIN vn.client cl on cl.id = a.clientFk
|
||||
JOIN vn.address a on a.id = t.addressFk
|
||||
JOIN vn.client cl on cl.id = a.clientFk
|
||||
JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
|
||||
JOIN vn.company c on c.id = t.companyFk
|
||||
JOIN vn.company c on c.id = t.companyFk
|
||||
LEFT JOIN vn.company c2 on c2.clientFk = cl.id
|
||||
GROUP BY grupo, t.companyFk ;
|
||||
|
||||
GROUP BY grupo, t.companyFk ;
|
||||
|
||||
DROP TEMPORARY TABLE tmp.ticket_list;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
USE vn;
|
||||
ALTER TABLE vn.agencyTermConfig
|
||||
ADD CONSTRAINT agencyTermConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
USE vn;
|
||||
|
||||
ALTER TABLE vn2008.gastos_resumen MODIFY COLUMN Id_Gasto varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
|
||||
|
||||
DELETE gr.*
|
||||
FROM vn2008.gastos_resumen gr LEFT JOIN vn.expense e ON gr.Id_Gasto = e.id
|
||||
WHERE e.id IS NULL;
|
||||
|
||||
ALTER TABLE vn2008.gastos_resumen
|
||||
ADD CONSTRAINT gastos_resumen_expense_FK
|
||||
FOREIGN KEY (Id_Gasto) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
USE vn;
|
||||
ALTER TABLE vn.invoiceOutTaxConfig MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL NULL;
|
||||
|
||||
ALTER TABLE vn.invoiceOutTaxConfig
|
||||
ADD CONSTRAINT invoiceOutTaxConfig_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
USE edi;
|
||||
ALTER TABLE edi.item_groupToOffer MODIFY COLUMN expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT '7001000000' NULL;
|
||||
|
||||
ALTER TABLE edi.item_groupToOffer
|
||||
ADD CONSTRAINT item_groupToOffer_expense_FK FOREIGN KEY (expenseFk) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
USE vn;
|
||||
-- Eliminar la clave primaria actual
|
||||
ALTER TABLE bs.ventas_contables DROP PRIMARY KEY;
|
||||
|
||||
-- Agregar la nueva clave primaria incluyendo el campo `gasto`
|
||||
ALTER TABLE bs.ventas_contables ADD PRIMARY KEY (`year`, `month`, `grupo`, `reino_id`, `tipo_id`, `empresa_id`, `gasto`);
|
||||
|
||||
DELETE vc.* FROM bs.ventas_contables vc LEFT JOIN vn.expense e ON e.id = vc.gasto WHERE e.id IS NULL;
|
||||
|
||||
ALTER TABLE bs.ventas_contables
|
||||
MODIFY COLUMN gasto VARCHAR(10)
|
||||
CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
|
||||
|
||||
ALTER TABLE bs.ventas_contables ADD CONSTRAINT ventas_contables_expense_FK FOREIGN KEY (gasto) REFERENCES vn.expense(id) ON DELETE RESTRICT ON UPDATE CASCADE;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
DELETE FROM vn.expense
|
||||
WHERE id ='' AND id IS NULL AND isWithheld = FALSE;
|
||||
UPDATE vn.expense
|
||||
SET id='7002090000'
|
||||
WHERE id='7002009000';
|
||||
UPDATE vn.expense
|
||||
SET id='7001090000'
|
||||
WHERE id='7001009000';
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
UPDATE vn.expense
|
||||
SET id = CASE id
|
||||
WHEN 7000010000 THEN 7001001000
|
||||
WHEN 7000020000 THEN 7001002000
|
||||
WHEN 7000030000 THEN 7001003000
|
||||
WHEN 7000040000 THEN 7001004000
|
||||
WHEN 7000050000 THEN 7001005000
|
||||
WHEN 7000060000 THEN 7001006000
|
||||
WHEN 7000070000 THEN 7001007000
|
||||
WHEN 7002060000 THEN 7001206000
|
||||
WHEN 7002070000 THEN 7001207000
|
||||
WHEN 7002030000 THEN 7001203000
|
||||
WHEN 7002040000 THEN 7001204000
|
||||
WHEN 7002050000 THEN 7001205000
|
||||
WHEN 7002020000 THEN 7001202000
|
||||
WHEN 7002010000 THEN 7001201000
|
||||
WHEN 7001060000 THEN 7001106000
|
||||
WHEN 7001070000 THEN 7001107000
|
||||
WHEN 7001030000 THEN 7001103000
|
||||
WHEN 7001040000 THEN 7001104000
|
||||
WHEN 7001050000 THEN 7001105000
|
||||
WHEN 7001020000 THEN 7001102000
|
||||
WHEN 7001010000 THEN 7001101000
|
||||
WHEN 7000080000 THEN 7040008000
|
||||
WHEN 7001080000 THEN 7000108000
|
||||
WHEN 7002080000 THEN 7001208000
|
||||
WHEN 7000090000 THEN 7001009000
|
||||
WHEN 7002090000 THEN 7001209000
|
||||
WHEN 7002100000 THEN 7001210000
|
||||
WHEN 7001090000 THEN 7001109000
|
||||
WHEN 7001100000 THEN 7001110000
|
||||
WHEN 7000120000 THEN 7001012000
|
||||
WHEN 7002120000 THEN 7001212000
|
||||
WHEN 7000130000 THEN 7001013000
|
||||
WHEN 7000140000 THEN 7001014000
|
||||
ELSE id
|
||||
END
|
||||
WHERE id IN (7000010000, 7000020000, 7000030000, 7000040000, 7000050000,
|
||||
7000060000, 7000070000, 7002060000, 7002070000, 7002030000,
|
||||
7002040000, 7002050000, 7002020000, 7002010000, 7001060000,
|
||||
7001070000, 7001030000, 7001040000, 7001050000, 7001020000,
|
||||
7001010000, 7000080000, 7001080000, 7002080000, 7000090000,
|
||||
7002090000, 7002100000, 7001090000, 7001100000,
|
||||
7000120000, 7002120000, 7000130000, 7000140000);
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
UPDATE vn.expense
|
||||
SET id = CASE id
|
||||
WHEN 7000100000 THEN 7001010000
|
||||
ELSE id
|
||||
END
|
||||
WHERE id IN (7000100000);
|
||||
|
|
@ -44,7 +44,6 @@ fixtures:
|
|||
- module
|
||||
- defaultViewConfig
|
||||
vn:
|
||||
- agencyTermConfig
|
||||
- alertLevel
|
||||
- bookingPlanner
|
||||
- businessType
|
||||
|
|
|
|||
Loading…
Reference in New Issue