7199-devToTest_2316 #2287
|
@ -3736,3 +3736,18 @@ INSERT INTO vn.ticketLog (originFk,userFk,`action`,creationDate,changedModel,new
|
||||||
INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
|
INSERT INTO `vn`.`supplierDms`(`supplierFk`, `dmsFk`, `editorFk`)
|
||||||
VALUES
|
VALUES
|
||||||
(1, 10, 9);
|
(1, 10, 9);
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`accountReconciliation` (supplierAccountFk,operationDated,valueDated,amount,concept,debitCredit,calculatedCode,created)
|
||||||
|
VALUES
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',19.36,'BEL 1','debit','2','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-07 00:00:00.000',30226.43,'BEL 2','debit','1','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',118.81,'RCBO','debit','10','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',150.03,'TJ','debit','12','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',2149.71,'RCBO.AMAZON','debit','122','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',3210.5,'RCBO.VOLVO','debit','121','2023-12-14 08:39:53.000'),
|
||||||
|
(241,'2023-12-13 00:00:00.000','2023-12-13 00:00:00.000',6513.7,'RCBO.ENERPLUS','debit','120','2023-12-14 08:39:53.000');
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
|
||||||
|
VALUES
|
||||||
|
(1, 1);
|
||||||
|
|
|
@ -1,8 +1,19 @@
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `bi`.`greuge_dif_porte_add`()
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE datSTART DATETIME DEFAULT TIMESTAMPADD(DAY,-60,util.VN_CURDATE()); -- '2019-07-01'
|
|
||||||
DECLARE datEND DATETIME DEFAULT TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
|
/**
|
||||||
|
* Calculates the greuge based on a specific date in the 'grievanceConfig' table
|
||||||
|
*/
|
||||||
|
|
||||||
|
DECLARE vDateStarted DATETIME;
|
||||||
|
DECLARE vDateEnded DATETIME DEFAULT (util.VN_CURDATE() - INTERVAL 1 DAY);
|
||||||
|
DECLARE vDaysAgoOffset INT;
|
||||||
|
|
||||||
|
SELECT daysAgoOffset INTO vDaysAgoOffset
|
||||||
|
FROM vn.greugeConfig;
|
||||||
|
|
||||||
|
SET vDateStarted = util.VN_CURDATE() - INTERVAL vDaysAgoOffset DAY;
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.dp;
|
DROP TEMPORARY TABLE IF EXISTS tmp.dp;
|
||||||
|
|
||||||
|
@ -11,35 +22,34 @@ BEGIN
|
||||||
(PRIMARY KEY (ticketFk))
|
(PRIMARY KEY (ticketFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT t.id ticketFk,
|
SELECT t.id ticketFk,
|
||||||
SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) AS teorico,
|
SUM((t.zonePrice - t.zoneBonus) * ebv.ratio) teorico,
|
||||||
00000.00 as practico,
|
00000.00 practico,
|
||||||
00000.00 as greuge,
|
00000.00 greuge,
|
||||||
t.clientFk,
|
t.clientFk,
|
||||||
t.shipped
|
t.shipped
|
||||||
FROM
|
FROM vn.ticket t
|
||||||
vn.ticket t
|
JOIN vn.client c ON c.id = t.clientFk
|
||||||
JOIN vn2008.Clientes cli ON cli.Id_cliente = t.clientFk
|
|
||||||
LEFT JOIN vn.expedition e ON e.ticketFk = t.id
|
LEFT JOIN vn.expedition e ON e.ticketFk = t.id
|
||||||
JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
|
JOIN vn.expeditionBoxVol ebv ON ebv.boxFk = e.freightItemFk
|
||||||
JOIN vn.zone z ON t.zoneFk = z.id
|
JOIN vn.zone z ON t.zoneFk = z.id
|
||||||
WHERE
|
JOIN vn.company cp ON cp.id = t.companyFk
|
||||||
t.shipped between datSTART AND datEND
|
WHERE t.shipped BETWEEN vDateStarted AND vDateEnded
|
||||||
AND cli.`real`
|
AND c.isRelevant
|
||||||
AND t.companyFk IN (442 , 567)
|
AND cp.code IN ('VNL', 'VNH')
|
||||||
AND z.isVolumetric = FALSE
|
AND NOT z.isVolumetric
|
||||||
GROUP BY t.id;
|
GROUP BY t.id;
|
||||||
|
|
||||||
-- Agencias que cobran por volumen
|
-- Agencias que cobran por volumen
|
||||||
INSERT INTO tmp.dp
|
INSERT INTO tmp.dp
|
||||||
SELECT sv.ticketFk,
|
SELECT sv.ticketFk,
|
||||||
SUM(IFNULL(sv.freight,0)) AS teorico,
|
SUM(IFNULL(sv.freight,0)) teorico,
|
||||||
00000.00 as practico,
|
00000.00 practico,
|
||||||
00000.00 as greuge,
|
00000.00 greuge,
|
||||||
sv.clientFk,
|
sv.clientFk,
|
||||||
sv.shipped
|
sv.shipped
|
||||||
FROM vn.saleVolume sv
|
FROM vn.saleVolume sv
|
||||||
JOIN vn.zone z ON z.id = sv.zoneFk
|
JOIN vn.zone z ON z.id = sv.zoneFk
|
||||||
AND sv.shipped BETWEEN datSTART AND datEND
|
AND sv.shipped BETWEEN vDateStarted AND vDateEnded
|
||||||
AND z.isVolumetric != FALSE
|
AND z.isVolumetric != FALSE
|
||||||
GROUP BY sv.ticketFk;
|
GROUP BY sv.ticketFk;
|
||||||
|
|
||||||
|
@ -48,11 +58,12 @@ BEGIN
|
||||||
CREATE TEMPORARY TABLE tmp.dp_aux
|
CREATE TEMPORARY TABLE tmp.dp_aux
|
||||||
(PRIMARY KEY (ticketFk))
|
(PRIMARY KEY (ticketFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT dp.ticketFk, sum(Cantidad * Valor) as valor
|
SELECT dp.ticketFk, SUM(s.quantity * sc.value) valor
|
||||||
FROM tmp.dp
|
FROM tmp.dp
|
||||||
JOIN vn2008.Movimientos m ON m.Id_Ticket = dp.ticketFk
|
JOIN vn.sale s ON s.ticketFk = dp.ticketFk
|
||||||
JOIN vn2008.Movimientos_componentes mc using(Id_Movimiento)
|
JOIN vn.saleComponent sc ON sc.saleFk = s.id
|
||||||
WHERE mc.Id_Componente = 15
|
JOIN vn.component c ON c.id = sc.componentFk
|
||||||
|
WHERE c.code = 'delivery'
|
||||||
GROUP BY dp.ticketFk;
|
GROUP BY dp.ticketFk;
|
||||||
|
|
||||||
UPDATE tmp.dp
|
UPDATE tmp.dp
|
||||||
|
@ -64,10 +75,11 @@ BEGIN
|
||||||
CREATE TEMPORARY TABLE tmp.dp_aux
|
CREATE TEMPORARY TABLE tmp.dp_aux
|
||||||
(PRIMARY KEY (ticketFk))
|
(PRIMARY KEY (ticketFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
SELECT dp.ticketFk, sum(g.amount) Importe
|
SELECT dp.ticketFk, SUM(g.amount) Importe
|
||||||
FROM tmp.dp
|
FROM tmp.dp
|
||||||
JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
|
JOIN vn.greuge g ON g.ticketFk = dp.ticketFk
|
||||||
WHERE g.greugeTypeFk = 1 -- dif_porte
|
JOIN vn.greugeType gt ON gt.id = g.greugeTypeFk
|
||||||
|
WHERE gt.code = 'freightDifference' -- dif_porte
|
||||||
GROUP BY dp.ticketFk;
|
GROUP BY dp.ticketFk;
|
||||||
|
|
||||||
UPDATE tmp.dp
|
UPDATE tmp.dp
|
||||||
|
@ -75,12 +87,12 @@ BEGIN
|
||||||
SET greuge = IFNULL(Importe,0);
|
SET greuge = IFNULL(Importe,0);
|
||||||
|
|
||||||
INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk)
|
INSERT INTO vn.greuge (clientFk,description,amount,shipped,greugeTypeFk,ticketFk)
|
||||||
SELECT dp.clientFk
|
SELECT dp.clientFk,
|
||||||
, concat('dif_porte ', dp.ticketFk)
|
CONCAT('dif_porte ', dp.ticketFk),
|
||||||
, round(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) as Importe
|
ROUND(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0),2) Importe,
|
||||||
, date(dp.shipped)
|
date(dp.shipped),
|
||||||
, 1
|
1,
|
||||||
,dp.ticketFk
|
dp.ticketFk
|
||||||
FROM tmp.dp
|
FROM tmp.dp
|
||||||
JOIN vn.client c ON c.id = dp.clientFk
|
JOIN vn.client c ON c.id = dp.clientFk
|
||||||
WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1
|
WHERE ABS(IFNULL(dp.teorico,0) - IFNULL(dp.practico,0) - IFNULL(dp.greuge,0)) > 1
|
||||||
|
|
|
@ -0,0 +1,66 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Updates duplicate records in the accountReconciliation table,
|
||||||
|
* by assigning them a new identifier and then inserts a new entry in the till table.
|
||||||
|
*/
|
||||||
|
UPDATE accountReconciliation ar
|
||||||
|
JOIN (
|
||||||
|
SELECT id,
|
||||||
|
calculatedCode,
|
||||||
|
CONCAT(
|
||||||
|
calculatedCode,
|
||||||
|
'(',
|
||||||
|
ROW_NUMBER() OVER (PARTITION BY calculatedCode ORDER BY id),
|
||||||
|
')'
|
||||||
|
) newId
|
||||||
|
FROM accountReconciliation ar
|
||||||
|
WHERE calculatedCode IN (
|
||||||
|
SELECT calculatedCode
|
||||||
|
FROM accountReconciliation
|
||||||
|
GROUP BY calculatedCode
|
||||||
|
HAVING COUNT(*) > 1
|
||||||
|
)
|
||||||
|
ORDER BY calculatedCode, id
|
||||||
|
) sub2 ON ar.id = sub2.id
|
||||||
|
SET ar.calculatedCode = sub2.newId;
|
||||||
|
|
||||||
|
INSERT INTO till(
|
||||||
|
dated,
|
||||||
|
isAccountable,
|
||||||
|
serie,
|
||||||
|
concept,
|
||||||
|
`in`,
|
||||||
|
`out`,
|
||||||
|
bankFk,
|
||||||
|
companyFk,
|
||||||
|
warehouseFk,
|
||||||
|
supplierAccountFk,
|
||||||
|
calculatedCode,
|
||||||
|
InForeignValue,
|
||||||
|
OutForeignValue,
|
||||||
|
workerFk
|
||||||
|
)
|
||||||
|
SELECT ar.operationDated,
|
||||||
|
TRUE,
|
||||||
|
'MB',
|
||||||
|
ar.concept,
|
||||||
|
IF(ar.debitCredit = 'credit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
|
||||||
|
IF(ar.debitCredit = 'debit' AND a.currencyFk = arc.currencyFk, ar.amount, NULL),
|
||||||
|
a.id,
|
||||||
|
sa.supplierFk,
|
||||||
|
arc.warehouseFk,
|
||||||
|
ar.supplierAccountFk,
|
||||||
|
ar.calculatedCode,
|
||||||
|
IF(ar.debitCredit = 'credit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
|
||||||
|
IF(ar.debitCredit = 'debit' AND NOT a.currencyFk = arc.currencyFk, ar.amount, NULL),
|
||||||
|
account.myUser_getId()
|
||||||
|
FROM accountReconciliation ar
|
||||||
|
JOIN supplierAccount sa ON sa.id = ar.supplierAccountFk
|
||||||
|
JOIN accounting a ON a.id = sa.accountingFk
|
||||||
|
LEFT JOIN till t ON t.calculatedCode = ar.calculatedCode
|
||||||
|
JOIN accountReconciliationConfig arc
|
||||||
|
WHERE t.id IS NULL;
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -0,0 +1,38 @@
|
||||||
|
DELIMITER $$
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
|
||||||
|
BEGIN
|
||||||
|
/**
|
||||||
|
* Calculates and presents information on shipment and packaging volumes
|
||||||
|
* for agencies that are not owned for a specific period.
|
||||||
|
*/
|
||||||
|
DECLARE vStarted DATETIME DEFAULT util.VN_CURDATE();
|
||||||
|
DECLARE vEnded DATETIME DEFAULT util.dayEnd(util.VN_CURDATE());
|
||||||
|
|
||||||
|
SELECT ag.id agency_id,
|
||||||
|
CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
|
||||||
|
COUNT(*) expediciones,
|
||||||
|
SUM(t.packages) Bultos,
|
||||||
|
SUM(tpe.boxes) Faltan
|
||||||
|
FROM ticket t
|
||||||
|
JOIN warehouse w ON w.id = t.warehouseFk
|
||||||
|
JOIN country c ON w.countryFk = c.id
|
||||||
|
JOIN address a ON a.id = t.addressFk
|
||||||
|
JOIN agencyMode am ON am.id = t.agencyModeFk
|
||||||
|
JOIN agency ag ON ag.id = am.agencyFk
|
||||||
|
JOIN (
|
||||||
|
SELECT sv.ticketFk,
|
||||||
|
CEIL(1000 * SUM(sv.volume) / vc.standardFlowerBox) boxes
|
||||||
|
FROM ticket t
|
||||||
|
JOIN saleVolume sv ON sv.ticketFk = t.id
|
||||||
|
JOIN volumeConfig vc
|
||||||
|
WHERE t.shipped BETWEEN vStarted AND vEnded
|
||||||
|
AND (t.packages IS NULL OR NOT t.packages)
|
||||||
|
GROUP BY t.id
|
||||||
|
) tpe ON tpe.ticketFk = t.id
|
||||||
|
WHERE t.shipped BETWEEN vStarted AND vEnded
|
||||||
|
AND NOT ag.isOwn
|
||||||
|
GROUP BY ag.id
|
||||||
|
ORDER BY Agencia;
|
||||||
|
|
||||||
|
END$$
|
||||||
|
DELIMITER ;
|
|
@ -1,33 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`account_conciliacion_add`()
|
|
||||||
BEGIN
|
|
||||||
UPDATE account_conciliacion ac
|
|
||||||
JOIN
|
|
||||||
(
|
|
||||||
SELECT idaccount_conciliacion, @c:= if(@id = id_calculated, @c + 1, 1) contador,
|
|
||||||
@id:= id_calculated as id_calculated, concat(id_calculated,'(',@c,')') as new_id
|
|
||||||
FROM account_conciliacion
|
|
||||||
JOIN
|
|
||||||
(
|
|
||||||
select id_calculated, count(*) rep, @c:= 0, @id:= concat('-',id_calculated)
|
|
||||||
from account_conciliacion
|
|
||||||
group by id_calculated
|
|
||||||
having rep > 1
|
|
||||||
) sub using(id_calculated)
|
|
||||||
) sub2 using(idaccount_conciliacion)
|
|
||||||
SET ac.id_calculated = sub2.new_id;
|
|
||||||
|
|
||||||
INSERT INTO Cajas(Cajafecha, Partida, Serie, Concepto, Entrada,
|
|
||||||
Salida, Id_Banco,empresa_id, warehouse_id,
|
|
||||||
Proveedores_account_id, id_calculated, InForeignValue, OutForeignValue, Id_Trabajador)
|
|
||||||
SELECT Fechaoperacion, TRUE, 'MB', ac.Concepto, IF(DebeHaber = 2 AND currencyFk = 1, importe,null),
|
|
||||||
IF(DebeHaber = 1 AND currencyFk = 1, importe, null), a.id, sa.supplierFk, 1,
|
|
||||||
ac.Id_Proveedores_account, ac.id_calculated, IF(DebeHaber = 2 AND NOT currencyFk = 1, importe, null),
|
|
||||||
IF(DebeHaber = 1 AND NOT currencyFk = 1, importe, null), account.myUser_getId()
|
|
||||||
FROM account_conciliacion ac
|
|
||||||
JOIN vn.supplierAccount sa on sa.id = ac.Id_Proveedores_account
|
|
||||||
JOIN vn.accounting a ON a.id = sa.accountingFk
|
|
||||||
LEFT JOIN Cajas c on c.id_calculated = ac.id_calculated
|
|
||||||
WHERE c.Id_Caja IS NULL;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,44 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencia_volume`()
|
|
||||||
BEGIN
|
|
||||||
DECLARE vStarted DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE());
|
|
||||||
DECLARE vEnded DATETIME DEFAULT TIMESTAMP(util.VN_CURDATE(), '23:59:59');
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS tmp.ticket_PackagingEstimated;
|
|
||||||
CREATE TEMPORARY TABLE tmp.ticket_PackagingEstimated
|
|
||||||
(
|
|
||||||
ticketFk INT PRIMARY KEY
|
|
||||||
,boxes INT DEFAULT 0
|
|
||||||
);
|
|
||||||
|
|
||||||
INSERT INTO tmp.ticket_PackagingEstimated(ticketFk, boxes)
|
|
||||||
SELECT sv.ticketFk, CEIL(1000 * sum(sv.volume) / vc.standardFlowerBox)
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.saleVolume sv ON sv.ticketFk = t.id
|
|
||||||
JOIN vn.volumeConfig vc
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEnded
|
|
||||||
AND IFNULL(t.packages,0) = 0
|
|
||||||
GROUP BY t.id;
|
|
||||||
SELECT * FROM
|
|
||||||
(
|
|
||||||
SELECT ag.id agency_id,
|
|
||||||
CONCAT(RPAD(c.country, 16,' _') ,' ',ag.name) Agencia,
|
|
||||||
count(*) expediciones,
|
|
||||||
sum(t.packages) Bultos,
|
|
||||||
sum(tpe.boxes) Faltan
|
|
||||||
FROM vn.ticket t
|
|
||||||
JOIN vn.warehouse w ON w.id = t.warehouseFk
|
|
||||||
JOIN vn.country c ON w.countryFk = c.id
|
|
||||||
JOIN vn.address a ON a.id = t.addressFk
|
|
||||||
JOIN vn.agencyMode am ON am.id = t.agencyModeFk
|
|
||||||
JOIN vn.agency ag ON ag.id = am.agencyFk
|
|
||||||
JOIN tmp.ticket_PackagingEstimated tpe ON tpe.ticketFk = t.id
|
|
||||||
WHERE t.shipped BETWEEN vStarted AND vEnded
|
|
||||||
AND ag.isOwn = FALSE
|
|
||||||
GROUP BY ag.id
|
|
||||||
) sub
|
|
||||||
ORDER BY Agencia;
|
|
||||||
|
|
||||||
DROP TEMPORARY TABLE tmp.ticket_PackagingEstimated;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -1,15 +0,0 @@
|
||||||
DELIMITER $$
|
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`article`()
|
|
||||||
BEGIN
|
|
||||||
/**
|
|
||||||
* Crea la tabla temporal: article_inventory
|
|
||||||
*/
|
|
||||||
DROP TEMPORARY TABLE IF EXISTS article_inventory;
|
|
||||||
CREATE TEMPORARY TABLE article_inventory
|
|
||||||
(
|
|
||||||
`article_id` INT(11) NOT NULL PRIMARY KEY,
|
|
||||||
`future` DATETIME
|
|
||||||
)
|
|
||||||
ENGINE = MEMORY;
|
|
||||||
END$$
|
|
||||||
DELIMITER ;
|
|
|
@ -23,7 +23,7 @@ AS SELECT `s`.`id` AS `Id_Proveedor`,
|
||||||
`s`.`isOfficial` AS `oficial`,
|
`s`.`isOfficial` AS `oficial`,
|
||||||
`s`.`workerFk` AS `workerFk`,
|
`s`.`workerFk` AS `workerFk`,
|
||||||
`s`.`payDay` AS `pay_day`,
|
`s`.`payDay` AS `pay_day`,
|
||||||
`s`.`isSerious` AS `serious`,
|
`s`.`isReal` AS `serious`,
|
||||||
`s`.`note` AS `notas`,
|
`s`.`note` AS `notas`,
|
||||||
`s`.`taxTypeSageFk` AS `taxTypeSageFk`,
|
`s`.`taxTypeSageFk` AS `taxTypeSageFk`,
|
||||||
`s`.`withholdingSageFk` AS `withholdingSageFk`,
|
`s`.`withholdingSageFk` AS `withholdingSageFk`,
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE vn.supplier CHANGE COLUMN isSerious isReal tinyint(1) unsigned NOT NULL DEFAULT 0;
|
|
@ -0,0 +1,8 @@
|
||||||
|
CREATE OR REPLACE TABLE `vn`.`accountReconciliationConfig` (
|
||||||
|
`id` INT AUTO_INCREMENT,
|
||||||
|
`currencyFk` TINYINT(3) unsigned,
|
||||||
|
`warehouseFk` SMALLINT(6) unsigned,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
CONSTRAINT `account_fk_currency` FOREIGN KEY (`currencyFk`) REFERENCES `currency` (`id`),
|
||||||
|
CONSTRAINT `account_fk_warehouse` FOREIGN KEY (`warehouseFk`) REFERENCES `warehouse` (`id`)
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
|
|
@ -0,0 +1,2 @@
|
||||||
|
INSERT INTO `vn`.`accountReconciliationConfig`(currencyFk, warehouseFk)
|
||||||
|
VALUES (1, 1);
|
|
@ -0,0 +1,13 @@
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`agencyVolume`()
|
||||||
|
BEGIN
|
||||||
|
END;
|
||||||
|
|
||||||
|
REVOKE EXECUTE ON PROCEDURE `vn2008`.`agencia_volume` FROM `agency`;
|
||||||
|
GRANT EXECUTE ON PROCEDURE `vn`.`agencyVolume` TO `agency`;
|
||||||
|
|
||||||
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`addAccountReconciliation`()
|
||||||
|
BEGIN
|
||||||
|
END;
|
||||||
|
|
||||||
|
REVOKE EXECUTE ON PROCEDURE `vn2008`.`account_conciliacion_add` FROM `financial`;
|
||||||
|
GRANT EXECUTE ON PROCEDURE `vn`.`addAccountReconciliation` TO `financial`;
|
|
@ -0,0 +1 @@
|
||||||
|
ALTER TABLE `vn`.`accountReconciliation` MODIFY debitCredit ENUM('debit', 'credit');
|
|
@ -0,0 +1,4 @@
|
||||||
|
ALTER TABLE IF EXISTS `vn`.`greugeConfig`
|
||||||
|
ADD COLUMN IF NOT EXISTS `daysAgoOffset` int(11) NOT NULL;
|
||||||
|
|
||||||
|
UPDATE vn.greugeConfig SET daysAgoOffset=15;
|
|
@ -1258,7 +1258,7 @@ export default {
|
||||||
},
|
},
|
||||||
supplierBasicData: {
|
supplierBasicData: {
|
||||||
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
alias: 'vn-supplier-basic-data vn-textfield[ng-model="$ctrl.supplier.nickname"]',
|
||||||
isSerious: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isSerious"]',
|
isReal: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isReal"]',
|
||||||
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
isActive: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isActive"]',
|
||||||
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
|
isPayMethodChecked: 'vn-supplier-basic-data vn-check[ng-model="$ctrl.supplier.isPayMethodChecked"]',
|
||||||
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
notes: 'vn-supplier-basic-data vn-textarea[ng-model="$ctrl.supplier.note"]',
|
||||||
|
|
|
@ -20,7 +20,7 @@ describe('Supplier basic data path', () => {
|
||||||
it('should edit the basic data', async() => {
|
it('should edit the basic data', async() => {
|
||||||
await page.clearInput(selectors.supplierBasicData.alias);
|
await page.clearInput(selectors.supplierBasicData.alias);
|
||||||
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
await page.write(selectors.supplierBasicData.alias, 'Plants Nick SL');
|
||||||
await page.waitToClick(selectors.supplierBasicData.isSerious);
|
await page.waitToClick(selectors.supplierBasicData.isReal);
|
||||||
await page.waitToClick(selectors.supplierBasicData.isActive);
|
await page.waitToClick(selectors.supplierBasicData.isActive);
|
||||||
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
|
await page.waitToClick(selectors.supplierBasicData.isPayMethodChecked);
|
||||||
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
await page.write(selectors.supplierBasicData.notes, 'Some notes');
|
||||||
|
@ -41,8 +41,8 @@ describe('Supplier basic data path', () => {
|
||||||
expect(result).toEqual('Plants Nick SL');
|
expect(result).toEqual('Plants Nick SL');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should check the isSerious checkbox is now checked', async() => {
|
it('should check the isReal checkbox is now checked', async() => {
|
||||||
const result = await page.checkboxState(selectors.supplierBasicData.isSerious);
|
const result = await page.checkboxState(selectors.supplierBasicData.isReal);
|
||||||
|
|
||||||
expect(result).toBe('checked');
|
expect(result).toBe('checked');
|
||||||
});
|
});
|
||||||
|
|
|
@ -11,7 +11,7 @@ columns:
|
||||||
postcodeFk: postcode
|
postcodeFk: postcode
|
||||||
isActive: active
|
isActive: active
|
||||||
isOfficial: official
|
isOfficial: official
|
||||||
isSerious: serious
|
isReal: real
|
||||||
isTrucker: trucker
|
isTrucker: trucker
|
||||||
note: note
|
note: note
|
||||||
street: street
|
street: street
|
||||||
|
|
|
@ -11,7 +11,7 @@ columns:
|
||||||
postcodeFk: código postal
|
postcodeFk: código postal
|
||||||
isActive: activo
|
isActive: activo
|
||||||
isOfficial: oficial
|
isOfficial: oficial
|
||||||
isSerious: serio
|
isReal: real
|
||||||
isTrucker: camionero
|
isTrucker: camionero
|
||||||
note: nota
|
note: nota
|
||||||
street: calle
|
street: calle
|
||||||
|
|
|
@ -25,7 +25,7 @@ module.exports = Self => {
|
||||||
'id',
|
'id',
|
||||||
'name',
|
'name',
|
||||||
'nickname',
|
'nickname',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isActive',
|
'isActive',
|
||||||
'note',
|
'note',
|
||||||
'nif',
|
'nif',
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
"isOfficial": {
|
"isOfficial": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"isSerious": {
|
"isReal": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
"isTrucker": {
|
"isTrucker": {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Verified"
|
label="Verified"
|
||||||
ng-model="$ctrl.supplier.isSerious">
|
ng-model="$ctrl.supplier.isReal">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Active"
|
label="Active"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<vn-icon
|
<vn-icon
|
||||||
vn-tooltip="Unverified supplier"
|
vn-tooltip="Unverified supplier"
|
||||||
icon="icon-supplierfalse"
|
icon="icon-supplierfalse"
|
||||||
ng-if="$ctrl.supplier.isSerious == false">
|
ng-if="$ctrl.supplier.isReal == false">
|
||||||
</vn-icon>
|
</vn-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="quicklinks">
|
<div class="quicklinks">
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Controller extends Descriptor {
|
||||||
'payDemFk',
|
'payDemFk',
|
||||||
'payDay',
|
'payDay',
|
||||||
'isActive',
|
'isActive',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isTrucker',
|
'isTrucker',
|
||||||
'account'
|
'account'
|
||||||
],
|
],
|
||||||
|
|
|
@ -26,7 +26,7 @@ describe('Supplier Component vnSupplierDescriptor', () => {
|
||||||
'payDemFk',
|
'payDemFk',
|
||||||
'payDay',
|
'payDay',
|
||||||
'isActive',
|
'isActive',
|
||||||
'isSerious',
|
'isReal',
|
||||||
'isTrucker',
|
'isTrucker',
|
||||||
'account'
|
'account'
|
||||||
],
|
],
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
</vn-label-value>
|
</vn-label-value>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Verified"
|
label="Verified"
|
||||||
ng-model="$ctrl.summary.isSerious"
|
ng-model="$ctrl.summary.isReal"
|
||||||
disabled="true">
|
disabled="true">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
<vn-check
|
<vn-check
|
||||||
|
|
Loading…
Reference in New Issue