Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
This commit is contained in:
commit
033b176e72
|
|
@ -22,7 +22,7 @@ module.exports = Self => {
|
|||
const {url} = await Self.app.models.Url.findOne({
|
||||
where: {
|
||||
appName,
|
||||
enviroment: process.env.NODE_ENV || 'development'
|
||||
environment: process.env.NODE_ENV || 'development'
|
||||
}
|
||||
});
|
||||
return url;
|
||||
|
|
|
|||
|
|
@ -137,9 +137,6 @@ INSERT INTO vn.ticket (clientFk, warehouseFk, shipped, nickname, refFk, addressF
|
|||
INSERT INTO vn.sale (itemFk, ticketFk, concept, quantity, originalQuantity, price, discount, priceFixed, reserved, isPicked, isPriceFixed, created, isAdded)
|
||||
VALUES (1, 24, 'Ranged weapon longbow 2m', 1.00, NULL, 8.07, 0, 0.00, 0, 0, 0, '2022-07-06 00:00:00', 0);
|
||||
*/
|
||||
INSERT INTO vn2008.zones (zone_id,name,printingOrder)
|
||||
VALUES (1,'zone Test',1);
|
||||
|
||||
-- XXX: lab
|
||||
|
||||
INSERT INTO `vn`.`businessReasonEnd` (`id`, `reason`)
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`isPalletHomogeneus`(vExpedition INT)
|
||||
RETURNS tinyint(1)
|
||||
NOT DETERMINISTIC
|
||||
READS SQL DATA
|
||||
BEGIN
|
||||
DECLARE vScanId INT;
|
||||
DECLARE vDistinctRoutesInThePallet INT;
|
||||
|
||||
SELECT scan_id INTO vScanId
|
||||
FROM vn2008.scan_line
|
||||
WHERE code = vExpedition
|
||||
LIMIT 1;
|
||||
|
||||
SELECT COUNT(*) INTO vDistinctRoutesInThePallet
|
||||
FROM (
|
||||
SELECT DISTINCT t.Id_Ruta
|
||||
FROM vn2008.scan_line sl
|
||||
JOIN expedition e ON e.id = sl.code
|
||||
JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticketFk
|
||||
WHERE sl.scan_id = vScanId
|
||||
AND t.Id_Ruta
|
||||
) t1;
|
||||
|
||||
RETURN vDistinctRoutesInThePallet = 1;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
@ -22,6 +22,7 @@ BEGIN
|
|||
SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
|
||||
SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
|
||||
|
||||
DELETE FROM workerActivity WHERE created < v2Years;
|
||||
DELETE FROM ticketParking WHERE created < vDateShort;
|
||||
DELETE FROM routesMonitor WHERE dated < vDateShort;
|
||||
DELETE FROM workerTimeControlLog WHERE created < vDateShort;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ BEGIN
|
|||
*/
|
||||
DECLARE vTaxRowLimit INT;
|
||||
DECLARE vLines INT;
|
||||
DECLARE vHasDistinctTransactions INT;
|
||||
|
||||
SELECT taxRowLimit INTO vTaxRowLimit FROM invoiceInConfig;
|
||||
|
||||
|
|
@ -19,5 +20,17 @@ BEGIN
|
|||
IF vLines >= vTaxRowLimit THEN
|
||||
CALL util.throw (CONCAT('The maximum number of lines is ', vTaxRowLimit));
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(DISTINCT transactionTypeSageFk) INTO vHasDistinctTransactions
|
||||
FROM invoiceIn ii
|
||||
JOIN invoiceInTax iit ON iit.invoiceInFk = ii.id
|
||||
JOIN invoiceInSerial iis ON iis.code = ii.serial
|
||||
WHERE ii.id = vInvoiceInFk
|
||||
AND iis.taxAreaFk = 'CEE'
|
||||
AND transactionTypeSageFk;
|
||||
|
||||
IF vHasDistinctTransactions > 1 THEN
|
||||
CALL util.throw ('This invoice does not allow different types of transactions');
|
||||
END IF;
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,25 @@ BEGIN
|
|||
* @param vSaleGroupFk Identificador de vn.saleGroup
|
||||
* @param vSectorCollectionFk Identificador de vn.sectorCollection
|
||||
*/
|
||||
DECLARE vHasSaleGroup INT;
|
||||
DECLARE vHasSectorCollection INT;
|
||||
|
||||
SELECT COUNT(id) INTO vHasSaleGroup
|
||||
FROM saleGroup
|
||||
WHERE id = vSaleGroupFk;
|
||||
|
||||
IF !vHasSaleGroup THEN
|
||||
CALL util.throw ("invalid saleGroup");
|
||||
END IF;
|
||||
|
||||
SELECT COUNT(id) INTO vHasSectorCollection
|
||||
FROM sectorCollection
|
||||
WHERE id = vSectorCollectionFk;
|
||||
|
||||
IF !vHasSectorCollection THEN
|
||||
CALL util.throw ("invalid sectorCollection");
|
||||
END IF;
|
||||
|
||||
REPLACE sectorCollectionSaleGroup
|
||||
SET sectorCollectionFk = vSectorCollectionFk,
|
||||
saleGroupFk = vSaleGroupFk;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn`.`saleLabel_afterUpdate`
|
||||
AFTER UPDATE ON `vn`.`saleLabel`
|
||||
FOR EACH ROW
|
||||
IF NEW.stem >= (SELECT s.quantity FROM sale s WHERE s.id = NEW.saleFk) THEN
|
||||
UPDATE sale s SET s.isPicked = TRUE WHERE s.id = NEW.saleFk;
|
||||
END IF$$
|
||||
DELIMITER ;
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`exchangeInsuranceInPrevious`
|
||||
AS SELECT `ei`.`finished` AS `dated`,
|
||||
`ei`.`amount` AS `amount`,
|
||||
`ei`.`rate` AS `rate`
|
||||
FROM `vn`.`exchangeInsurance` `ei`
|
||||
WHERE `ei`.`amount` <> 0
|
||||
AND `ei`.`financialProductTypefk` = 'SC'
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`unaryScanLineBuy`
|
||||
AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
|
||||
`u`.`Id_Article` AS `itemFk`
|
||||
FROM `vn2008`.`unary_scan_line_buy` `u`
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn`.`unaryScanLineExpedition`
|
||||
AS SELECT `u`.`scan_line_id` AS `unaryScanLineFk`,
|
||||
`u`.`expedition_id` AS `expeditionFk`
|
||||
FROM `vn2008`.`unary_scan_line_expedition` `u`
|
||||
|
|
@ -45,7 +45,6 @@ proc: BEGIN
|
|||
DELETE FROM cl_main WHERE Fecha < vDate18;
|
||||
DELETE FROM hedera.`order` WHERE date_send < vDate18;
|
||||
DELETE FROM vn.message WHERE sendDate < vDate;
|
||||
DELETE FROM travel_reserve WHERE odbc_date < vDate;
|
||||
|
||||
DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
DELIMITER $$
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost` TRIGGER `vn2008`.`movement_label_afterUpdate`
|
||||
AFTER UPDATE ON `movement_label`
|
||||
FOR EACH ROW
|
||||
IF NEW.stem >= (SELECT Cantidad FROM Movimientos WHERE Id_Movimiento = NEW.Id_Movimiento) THEN
|
||||
UPDATE Movimientos SET OK = 1 WHERE Id_Movimiento = NEW.Id_Movimiento;
|
||||
END IF$$
|
||||
DELIMITER ;
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`financialProductType`AS
|
||||
SELECT * FROM vn.financialProductType;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`flight`
|
||||
AS SELECT
|
||||
`f`.`id` AS `flight_id`,
|
||||
`f`.`duration` AS `duration`,
|
||||
`f`.`flightPath` AS `route`,
|
||||
`f`.`days` AS `days`,
|
||||
`f`.`airlineFk` AS `airline_id`,
|
||||
`f`.`airportArrivalFk` AS `airport_out`,
|
||||
`f`.`airportDepartureFk` AS `airport_in`
|
||||
FROM
|
||||
`vn`.`flight` `f`;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`gastos_resumen`
|
||||
AS SELECT
|
||||
`es`.`expenseFk` AS `Id_Gasto`,
|
||||
`es`.`year` AS `year`,
|
||||
`es`.`month` AS `month`,
|
||||
`es`.`amount` AS `importe`,
|
||||
`es`.`companyFk` AS `empresa_id`
|
||||
FROM
|
||||
`vn`.`expenseManual` `es`;
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`integra2`
|
||||
AS SELECT
|
||||
`i2`.`postCode` AS `postal_code`,
|
||||
`i2`.`frequency` AS `frequency`,
|
||||
`i2`.`warehouseFk` AS `warehouse_id`
|
||||
FROM
|
||||
`vn`.`integra2` `i2`;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`integra2_province`
|
||||
AS SELECT
|
||||
`ip`.`provinceFk` AS `province_id`,
|
||||
`ip`.`franchise` AS `franquicia`
|
||||
FROM
|
||||
`vn`.`integra2Province` `ip`;
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`pago_sdc`
|
||||
AS SELECT `ei`.`id` AS `pago_sdc_id`,
|
||||
`ei`.`amount` AS `importe`,
|
||||
`ei`.`dated` AS `fecha`,
|
||||
`ei`.`dueDated` AS `vencimiento`,
|
||||
`ei`.`entityFk` AS `entity_id`,
|
||||
`ei`.`ref` AS `ref`,
|
||||
`ei`.`rate` AS `rate`,
|
||||
`ei`.`companyFk` AS `empresa_id`,
|
||||
`ei`.`financialProductTypefk` AS `financialProductTypefk`,
|
||||
`ei`.`upperBarrier` AS `upperBarrier`,
|
||||
`ei`.`lowerBarrier` AS `lowerBarrier`,
|
||||
`ei`.`strike` AS `strike`
|
||||
FROM `vn`.`exchangeInsurance` `ei`
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`warehouse_pickup`
|
||||
AS SELECT
|
||||
`wp`.`warehouseFk` AS `warehouse_id`,
|
||||
`wp`.`agencyModeFk` AS `agency_id`
|
||||
FROM
|
||||
`vn`.`warehousePickup` `wp`;
|
||||
|
|
@ -81,10 +81,6 @@ ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_avisar__ COMMENT='refs #6371 deprec
|
|||
ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar RENAME vn2008.MovimienRENAMEs_revisar__;
|
||||
ALTER TABLE IF EXISTS vn2008.MovimienRENAMEs_revisar__ COMMENT='refs #6371 deprecated 2024-01-11';
|
||||
|
||||
-- Para la tabla Proveedores_cargueras
|
||||
ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras RENAME vn2008.Proveedores_cargueras__;
|
||||
ALTER TABLE IF EXISTS vn2008.Proveedores_cargueras__ COMMENT='refs #6371 deprecated 2024-01-11';
|
||||
|
||||
-- Para la tabla Proveedores_comunicados
|
||||
ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados RENAME vn2008.Proveedores_comunicados__;
|
||||
ALTER TABLE IF EXISTS vn2008.Proveedores_comunicados__ COMMENT='refs #6371 deprecated 2024-01-11';
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE IF EXISTS `vn2008`.`financialProductType` RENAME `vn`.`financialProductType`;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
ALTER TABLE IF EXISTS `vn2008`.`flight` RENAME `vn`.`flight`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`flight`
|
||||
CHANGE COLUMN IF EXISTS `flight_id` `id` varchar(10) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `airline_id` `airlineFk` smallint(2) unsigned DEFAULT NULL,
|
||||
CHANGE COLUMN IF EXISTS `route` `flightPath` varchar(20) DEFAULT NULL,
|
||||
CHANGE COLUMN IF EXISTS `airport_out` `airportArrivalFk` varchar(3) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `airport_in` `airportDepartureFk` varchar(3) NOT NULL;
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
ALTER TABLE IF EXISTS vn2008.gastos_resumen DROP FOREIGN KEY IF EXISTS gastos_resumen_expense_FK;
|
||||
ALTER TABLE IF EXISTS `vn2008`.`gastos_resumen` RENAME `vn`.`expenseManual`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`expenseManual`
|
||||
CHANGE COLUMN IF EXISTS `Id_Gasto` `expenseFk` varchar(10) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) DEFAULT NULL,
|
||||
CHANGE COLUMN IF EXISTS `empresa_id` `companyFk` int(11) NOT NULL;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.expenseManual COLLATE=utf8mb3_general_ci;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS expenseFk varchar(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_expense_FK FOREIGN KEY IF NOT EXISTS (expenseFk) REFERENCES vn.expense(id) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.expenseManual MODIFY COLUMN IF EXISTS companyFk int(10) unsigned NOT NULL;
|
||||
|
||||
ALTER TABLE vn.expenseManual MODIFY COLUMN companyFk int(10) unsigned NULL;
|
||||
|
||||
UPDATE vn.expenseManual
|
||||
SET companyFK= NULL
|
||||
WHERE companyFk= 0;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.expenseManual ADD CONSTRAINT expenseManual_company_FK FOREIGN KEY IF NOT EXISTS (companyFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
ALTER TABLE IF EXISTS `vn2008`.`integra2` RENAME `vn`.`integra2`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`integra2`
|
||||
CHANGE COLUMN IF EXISTS `postal_code` `postCode` varchar(10) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `frequency` `frequency` decimal(10,2) DEFAULT NULL,
|
||||
CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(6) unsigned NOT NULL;
|
||||
|
||||
ALTER TABLE IF EXISTS vn.integra2 ADD CONSTRAINT integra2_warehouse_FK
|
||||
FOREIGN KEY (warehouseFk) REFERENCES vn.warehouse(id) ON DELETE CASCADE ON UPDATE CASCADE;
|
||||
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
ALTER TABLE IF EXISTS `vn2008`.`integra2_province` RENAME `vn`.`integra2Province`;
|
||||
ALTER TABLE IF EXISTS `vn`.`integra2Province`
|
||||
CHANGE COLUMN IF EXISTS `franquicia` `franchise` varchar(65) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `province_id` `provinceFk` smallint(6) unsigned NOT NULL;
|
||||
|
|
@ -0,0 +1 @@
|
|||
DROP TABLE IF EXISTS vn2008.intervalos__;
|
||||
|
|
@ -0,0 +1 @@
|
|||
DROP TABLE IF EXISTS vn2008.mail_templates__;
|
||||
|
|
@ -0,0 +1 @@
|
|||
DROP TABLE IF EXISTS vn2008.ticket_location__;
|
||||
|
|
@ -0,0 +1 @@
|
|||
DROP TABLE IF EXISTS vn2008.turn__;
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
DROP TRIGGER IF EXISTS `vn2008`.`movement_label_afterUpdate`;
|
||||
|
||||
DROP VIEW IF EXISTS `vn`.`saleLabel`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn2008`.`movement_label` RENAME `vn`.`saleLabel`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`saleLabel`
|
||||
CHANGE COLUMN IF EXISTS `Id_movimiento` `saleFk` int(11) NOT NULL;
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
DROP VIEW IF EXISTS `vn`.`exchangeInsurance`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn2008`.`pago_sdc` RENAME `vn`.`exchangeInsurance`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`exchangeInsurance`
|
||||
CHANGE COLUMN IF EXISTS `pago_sdc_id` `id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
CHANGE COLUMN IF EXISTS `importe` `amount` decimal(10,2) NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `fecha` `dated` date NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `vencimiento` `dueDated` date NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `entity_id` `entityFk` int(10) unsigned NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `empresa_id` `companyFk`int(10) unsigned NOT NULL DEFAULT 442;
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
ALTER TABLE IF EXISTS `vn2008`.`warehouse_pickup` RENAME `vn`.`warehousePickup`;
|
||||
|
||||
ALTER TABLE IF EXISTS `vn`.`warehousePickup`
|
||||
CHANGE COLUMN IF EXISTS `warehouse_id` `warehouseFk` smallint(5) unsigned NOT NULL,
|
||||
CHANGE COLUMN IF EXISTS `agency_id` `agencyModeFk` int(11) DEFAULT NULL;
|
||||
|
||||
ALTER TABLE `vn`.`warehousePickup` COMMENT='Agencia de recogida para cada almacén';
|
||||
|
|
@ -0,0 +1,155 @@
|
|||
ALTER TABLE IF EXISTS vn2008.template_bionic_component RENAME vn2008.template_bionic_component__;
|
||||
ALTER TABLE IF EXISTS vn2008.template_bionic_component__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.template_bionic_lot RENAME vn2008.template_bionic_lot__;
|
||||
ALTER TABLE IF EXISTS vn2008.template_bionic_lot__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.template_bionic_price RENAME vn2008.template_bionic_price__;
|
||||
ALTER TABLE IF EXISTS vn2008.template_bionic_price__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS RENAME vn2008.tmpNEWTARIFAS__;
|
||||
ALTER TABLE IF EXISTS vn2008.tmpNEWTARIFAS__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unaryScanFilter RENAME vn2008.unaryScanFilter__;
|
||||
ALTER TABLE IF EXISTS vn2008.unaryScanFilter__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary_source RENAME vn2008.unary_source__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary_source__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.viaxpress RENAME vn2008.viaxpress__;
|
||||
ALTER TABLE IF EXISTS vn2008.viaxpress__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_filtro RENAME vn2008.warehouse_filtro__;
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_filtro__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_group RENAME vn2008.warehouse_group__;
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_group__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_joined RENAME vn2008.warehouse_joined__;
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_joined__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_lc RENAME vn2008.warehouse_lc__;
|
||||
ALTER TABLE IF EXISTS vn2008.warehouse_lc__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.wh_selection RENAME vn2008.wh_selection__;
|
||||
ALTER TABLE IF EXISTS vn2008.wh_selection__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.trolley RENAME vn2008.trolley__;
|
||||
ALTER TABLE IF EXISTS vn2008.trolley__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.zones RENAME vn2008.zones__;
|
||||
ALTER TABLE IF EXISTS vn2008.zones__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.tblIVA RENAME vn2008.tblIVA__;
|
||||
ALTER TABLE IF EXISTS vn2008.tblIVA__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.filtros RENAME vn2008.filtros__;
|
||||
ALTER TABLE IF EXISTS vn2008.filtros__ COMMENT='refs #6372 @deprecated 2023-11-21;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.form_query RENAME vn2008.form_query__;
|
||||
ALTER TABLE IF EXISTS vn2008.form_query__ COMMENT='refs #6372 @deprecated 2023-11-21;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.guillen RENAME vn2008.guillen__;
|
||||
ALTER TABLE IF EXISTS vn2008.guillen__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.guillen_carry RENAME vn2008.guillen_carry__;
|
||||
ALTER TABLE IF EXISTS vn2008.guillen_carry__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.integra2_escala RENAME vn2008.integra2_escala__;
|
||||
ALTER TABLE IF EXISTS vn2008.integra2_escala__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.invoice_observation RENAME vn2008.invoice_observation__;
|
||||
ALTER TABLE IF EXISTS vn2008.invoice_observation__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.nichos RENAME vn2008.nichos__;
|
||||
ALTER TABLE IF EXISTS vn2008.nichos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones RENAME vn2008.payroll_bonificaciones__;
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_bonificaciones__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_datos RENAME vn2008.payroll_datos__;
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_datos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_embargos RENAME vn2008.payroll_embargos__;
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_embargos__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_tipobasess RENAME vn2008.payroll_tipobasess__;
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_tipobasess__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.preparation_exception RENAME vn2008.preparation_exception__;
|
||||
ALTER TABLE IF EXISTS vn2008.preparation_exception__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial RENAME vn2008.payrroll_apEmpresarial__;
|
||||
ALTER TABLE IF EXISTS vn2008.payrroll_apEmpresarial__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.rec_translator RENAME vn2008.rec_translator__;
|
||||
ALTER TABLE IF EXISTS vn2008.rec_translator__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.recibida_agricola RENAME vn2008.recibida_agricola__;
|
||||
ALTER TABLE IF EXISTS vn2008.recibida_agricola__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.rounding RENAME vn2008.rounding__;
|
||||
ALTER TABLE IF EXISTS vn2008.rounding__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.scanTree RENAME vn2008.scanTree__;
|
||||
ALTER TABLE IF EXISTS vn2008.scanTree__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto RENAME vn2008.sort_merge_results_ernesto__;
|
||||
ALTER TABLE IF EXISTS vn2008.sort_merge_results_ernesto__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.route RENAME vn2008.route__;
|
||||
ALTER TABLE IF EXISTS vn2008.route__ COMMENT='refs #6372 @deprecated 2023-11-28;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.travel_reserve RENAME vn2008.travel_reserve__;
|
||||
ALTER TABLE IF EXISTS vn2008.travel_reserve__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.wks RENAME vn2008.wks__;
|
||||
ALTER TABLE IF EXISTS vn2008.wks__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary RENAME vn2008.unary__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan RENAME vn2008.unary_scan__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line RENAME vn2008.unary_scan_line__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy RENAME vn2008.unary_scan_line_buy__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_buy__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition RENAME vn2008.unary_scan_line_expedition__;
|
||||
ALTER TABLE IF EXISTS vn2008.unary_scan_line_expedition__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.widget RENAME vn2008.widget__;
|
||||
ALTER TABLE IF EXISTS vn2008.widget__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.scan RENAME vn2008.scan__;
|
||||
ALTER TABLE IF EXISTS vn2008.scan__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.scan_line RENAME vn2008.scan_line__;
|
||||
ALTER TABLE IF EXISTS vn2008.scan_line__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.tipsa RENAME vn2008.tipsa__;
|
||||
ALTER TABLE IF EXISTS vn2008.tipsa__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_basess RENAME vn2008.payroll_basess__;
|
||||
ALTER TABLE IF EXISTS vn2008.payroll_basess__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.pago_sdc RENAME vn2008.pago_sdc__;
|
||||
ALTER TABLE IF EXISTS vn2008.pago_sdc__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.transport RENAME vn2008.transport__;
|
||||
ALTER TABLE IF EXISTS vn2008.transport__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.travel_pattern RENAME vn2008.travel_pattern__;
|
||||
ALTER TABLE IF EXISTS vn2008.travel_pattern__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.jerarquia RENAME vn2008.jerarquia__;
|
||||
ALTER TABLE IF EXISTS vn2008.jerarquia__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.language RENAME vn2008.language__;
|
||||
ALTER TABLE IF EXISTS vn2008.language__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
||||
ALTER TABLE IF EXISTS vn2008.link RENAME vn2008.link__;
|
||||
ALTER TABLE IF EXISTS vn2008.link__ COMMENT='refs #6372 @deprecated 2023-12-13;';
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
-- flight
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`flight` AS
|
||||
SELECT 1;
|
||||
GRANT SELECT, INSERT, UPDATE ON TABLE vn2008.flight TO `logistic`;
|
||||
GRANT SELECT, INSERT, UPDATE ON TABLE vn.flight TO `logistic`;
|
||||
-- integra2_province
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`integra2_province` AS
|
||||
SELECT 1;
|
||||
GRANT SELECT ON TABLE vn2008.integra2_province TO `employee`;
|
||||
GRANT SELECT ON TABLE vn.integra2Province TO `employee`;
|
||||
-- link
|
||||
|
||||
GRANT SELECT ON TABLE vn.company TO `administrative`;
|
||||
GRANT SELECT ON TABLE vn.company TO `hr`;
|
||||
|
||||
-- warehouse_pickup
|
||||
CREATE OR REPLACE DEFINER=`root`@`localhost`
|
||||
SQL SECURITY DEFINER
|
||||
VIEW `vn2008`.`warehouse_pickup` AS
|
||||
SELECT 1;
|
||||
GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `logistic`;
|
||||
GRANT SELECT ON TABLE vn.warehousePickup TO `logistic`;
|
||||
GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `claimManager`;
|
||||
GRANT SELECT ON TABLE vn.warehousePickup TO `claimManager`;
|
||||
GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `employee`;
|
||||
GRANT SELECT ON TABLE vn.warehousePickup TO `employee`;
|
||||
GRANT SELECT ON TABLE vn2008.warehouse_pickup TO `deliveryAssistant`;
|
||||
GRANT SELECT ON TABLE vn.warehousePickup TO `deliveryAssistant`;
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
-- Place your SQL code here
|
||||
CREATE TABLE vn.workerActivity (
|
||||
id INT PRIMARY KEY AUTO_INCREMENT,
|
||||
created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
model ENUM('COM', 'ENT', 'TPV', 'ENC', 'LAB', 'ETI') NOT NULL,
|
||||
workerFk INT(10) UNSIGNED NOT NULL,
|
||||
event ENUM('open', 'close', 'insert', 'delete', 'update', 'refresh') NOT NULL,
|
||||
description VARCHAR(255) DEFAULT NULL,
|
||||
CONSTRAINT fk_workerActivity_worker FOREIGN KEY (workerFk)
|
||||
REFERENCES vn.worker (id)
|
||||
ON DELETE CASCADE
|
||||
ON UPDATE CASCADE
|
||||
);
|
||||
|
|
@ -36,6 +36,7 @@ describe('Worker new', () => {
|
|||
payMethodFk: 1,
|
||||
roleFk: 1
|
||||
};
|
||||
|
||||
const req = {accessToken: {userId: 9}};
|
||||
|
||||
it('should return error if personal mail already exists', async() => {
|
||||
|
|
@ -140,15 +141,24 @@ describe('Worker new', () => {
|
|||
it('should create a new worker', async() => {
|
||||
const newWorker = await models.Worker.new({args: defaultWorker, req});
|
||||
|
||||
await models.Worker.destroyById(newWorker.id);
|
||||
await models.Address.destroyAll({clientFk: newWorker.id});
|
||||
await models.Mandate.destroyAll({clientFk: newWorker.id});
|
||||
await models.Client.destroyById(newWorker.id);
|
||||
await models.VnUser.destroyById(newWorker.id);
|
||||
await removeWorker(newWorker.id);
|
||||
|
||||
expect(newWorker.id).toBeDefined();
|
||||
});
|
||||
|
||||
it('should create a new client', async() => {
|
||||
let newWorker;
|
||||
let client;
|
||||
try {
|
||||
newWorker = await models.Worker.new({args: defaultWorker, req});
|
||||
client = await models.Client.findById(newWorker.id);
|
||||
} finally {
|
||||
await removeWorker(newWorker.id);
|
||||
}
|
||||
|
||||
expect(client).toBeDefined();
|
||||
});
|
||||
|
||||
it('should create a new worker in client', async() => {
|
||||
const bruceWayneId = 1101;
|
||||
const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
|
||||
|
|
@ -170,3 +180,11 @@ describe('Worker new', () => {
|
|||
expect(newWorker.id).toEqual(bruceWayneId);
|
||||
});
|
||||
});
|
||||
|
||||
async function removeWorker(id) {
|
||||
await models.Worker.destroyById(id);
|
||||
await models.Address.destroyAll({clientFk: id});
|
||||
await models.Mandate.destroyAll({clientFk: id});
|
||||
await models.Client.destroyById(id);
|
||||
await models.VnUser.destroyById(id);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue