diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index 683e5b51f..b8f17d6ed 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -34,7 +34,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:49 +-- Dump completed on 2021-05-25 11:53:07 USE `account`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -120,7 +120,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:50 +-- Dump completed on 2021-05-25 11:53:07 USE `salix`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -176,7 +176,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:50 +-- Dump completed on 2021-05-25 11:53:08 USE `vn`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -403,6 +403,16 @@ LOCK TABLES `continent` WRITE; INSERT INTO `continent` VALUES (1,'Asia','AS'),(2,'América','AM'),(3,'África','AF'),(4,'Europa','EU'),(5,'Oceanía','OC'); /*!40000 ALTER TABLE `continent` ENABLE KEYS */; UNLOCK TABLES; + +-- +-- Dumping data for table `volumeConfig` +-- + +LOCK TABLES `volumeConfig` WRITE; +/*!40000 ALTER TABLE `volumeConfig` DISABLE KEYS */; +INSERT INTO `volumeConfig` VALUES (2.67,1.60,0.8,150,0.30,120,57); +/*!40000 ALTER TABLE `volumeConfig` ENABLE KEYS */; +UNLOCK TABLES; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; @@ -412,7 +422,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:51 +-- Dump completed on 2021-05-25 11:53:09 USE `cache`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -448,7 +458,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:52 +-- Dump completed on 2021-05-25 11:53:10 USE `hedera`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -514,7 +524,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:52 +-- Dump completed on 2021-05-25 11:53:10 USE `postgresql`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -600,7 +610,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:52 +-- Dump completed on 2021-05-25 11:53:10 USE `sage`; -- MariaDB dump 10.19 Distrib 10.5.9-MariaDB, for debian-linux-gnu (x86_64) -- @@ -656,4 +666,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2021-05-25 10:34:53 +-- Dump completed on 2021-05-25 11:53:11 diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 8d8c144e5..8df46890d 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -30508,7 +30508,7 @@ BEGIN NEW.currencyFk != OLD.currencyFk THEN - CALL vn2008.recibidaIvaDivisaUpdate(NEW.id); + -- CALL vn2008.recibidaIvaDivisaUpdate(NEW.id); END IF; diff --git a/db/export-data.sh b/db/export-data.sh index 5538d945e..5292e8f6a 100755 --- a/db/export-data.sh +++ b/db/export-data.sh @@ -59,6 +59,7 @@ TABLES=( component componentType continent + volumeConfig ) dump_tables ${TABLES[@]} diff --git a/e2e/paths/05-ticket/06_basic_data_steps.spec.js b/e2e/paths/05-ticket/06_basic_data_steps.spec.js index f7834e562..a5f9a60cf 100644 --- a/e2e/paths/05-ticket/06_basic_data_steps.spec.js +++ b/e2e/paths/05-ticket/06_basic_data_steps.spec.js @@ -75,7 +75,7 @@ describe('Ticket Edit basic data path', () => { const result = await page .waitToGetProperty(selectors.ticketBasicData.stepTwoTotalPriceDif, 'innerText'); - expect(result).toContain('-€248.00'); + expect(result).toContain('-€232.75'); }); it(`should select a new reason for the changes made then click on finalize`, async() => { diff --git a/e2e/paths/14-account/01_create_and_basic_data.spec.js b/e2e/paths/14-account/01_create_and_basic_data.spec.js index 183ae5fa3..15c9118d1 100644 --- a/e2e/paths/14-account/01_create_and_basic_data.spec.js +++ b/e2e/paths/14-account/01_create_and_basic_data.spec.js @@ -80,7 +80,7 @@ describe('Account create and basic data path', () => { await page.reloadSection('account.card.roles'); const rolesCount = await page.countElement(selectors.accountRoles.anyResult); - expect(rolesCount).toEqual(34); + expect(rolesCount).toEqual(35); }); }); diff --git a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js index 64cc35bfa..0666544e7 100644 --- a/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js +++ b/modules/monitor/back/methods/sales-monitor/specs/salesFilter.spec.js @@ -41,7 +41,7 @@ describe('SalesMonitor salesFilter()', () => { const filter = {}; const result = await app.models.SalesMonitor.salesFilter(ctx, filter); - expect(result.length).toEqual(7); + expect(result.length).toEqual(6); }); it('should return the tickets matching the problems on null', async() => { diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js index 7798b156e..0f4a1660e 100644 --- a/modules/ticket/back/methods/ticket/specs/filter.spec.js +++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js @@ -41,7 +41,7 @@ describe('ticket filter()', () => { const filter = {}; const result = await app.models.Ticket.filter(ctx, filter); - expect(result.length).toEqual(7); + expect(result.length).toEqual(6); }); it('should return the tickets matching the problems on null', async() => {