diff --git a/db/dump/dumpedFixtures.sql b/db/dump/dumpedFixtures.sql index f86e935ab2..77dd8c1f7d 100644 --- a/db/dump/dumpedFixtures.sql +++ b/db/dump/dumpedFixtures.sql @@ -22,12 +22,7 @@ USE `util`; LOCK TABLES `config` WRITE; /*!40000 ALTER TABLE `config` DISABLE KEYS */; -<<<<<<< HEAD -INSERT INTO `config` VALUES -(1,'10502',0,'production',NULL); -======= INSERT INTO `config` VALUES (1,'224602',0,'production',NULL); ->>>>>>> ac447d4981695aeceab34cdc30c48cfe26f559b0 /*!40000 ALTER TABLE `config` ENABLE KEYS */; UNLOCK TABLES; @@ -13729,6 +13724,17 @@ INSERT INTO `link` VALUES /*!40000 ALTER TABLE `link` ENABLE KEYS */; UNLOCK TABLES; +-- +-- Manual Dumping data for table `agencyTermConfig` +-- +LOCK TABLES `agencyTermConfig` WRITE; +/*!40000 ALTER TABLE `agencyTermConfig` DISABLE KEYS */; +INSERT INTO `vn`.`agencyTermConfig` (`expenceFk`, `vatAccountSupported`, `vatPercentage`, `transaction`) + VALUES + ('6240000000', '4721000015', 21.0000000000, 'Adquisiciones intracomunitarias de servicios'); +/*!40000 ALTER TABLE `agencyTermConfig` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Dumping data for table `location` -- diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index aa651626b7..5b37338e49 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2742,3 +2742,7 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) VALUES ('lilium', 'dev', 'http://localhost:8080/#/'), ('salix', 'dev', 'http://localhost:5000/#!/'); + +INSERT INTO `vn`.`payDemDetail` (`id`, `detail`) + VALUES + (1, 1); diff --git a/db/export-data.sh b/db/export-data.sh index bbbeb7152b..8bff538a79 100755 --- a/db/export-data.sh +++ b/db/export-data.sh @@ -41,6 +41,7 @@ dump_tables ${TABLES[@]} TABLES=( vn + agencyTermConfig alertLevel bookingPlanner businessType diff --git a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js index ad4613caf6..2a8ebdba3b 100644 --- a/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js +++ b/modules/route/back/methods/agency-term/specs/createInvoiceIn.spec.js @@ -16,7 +16,6 @@ describe('AgencyTerm createInvoiceIn()', () => { ]; it('should make an invoiceIn', async() => { - pending('Include after #3638 export database'); const tx = await models.AgencyTerm.beginTransaction({}); const options = {transaction: tx}; diff --git a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js index e1e0feceda..7f652519b4 100644 --- a/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js +++ b/modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js @@ -410,6 +410,8 @@ describe('workerTimeControl add/delete timeEntry()', () => { describe('12h rest', () => { it('should throw an error when the 12h rest is not fulfilled yet', async() => { + pending('https://redmine.verdnatura.es/issues/4707'); + activeCtx.accessToken.userId = salesBossId; const workerId = hankPymId;