Commit Graph

919 Commits

Author SHA1 Message Date
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Vicent Llopis 78721e7ffa feat: add fixtures 2023-03-08 09:50:47 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-03-07 08:28:13 +00:00
Vicent Llopis 0bda8c0ed6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 09:14:30 +01:00
Vicent Llopis 4830f8489a remove unnecessary fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:12:08 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
gitea/salix/pipeline/head This commit looks good Details
Refs: #5340
2023-03-06 12:37:37 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Javi Gallego e01fa40531 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:51:41 +01:00
Carlos Andrés 6f5e25493d invoicing test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 10:36:38 +01:00
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Alexandre Riera 6eab4bbe94 refs #5149 fixing tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 08:15:58 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Joan Sanchez f88c9b904c Updated fixtures 2023-02-21 10:38:23 +01:00
Joan Sanchez 0a7b3647b8 Updated fixtures 2023-02-21 07:57:35 +01:00
Joan Sanchez 39527cbc50 Updated structure & data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-20 14:46:38 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Javi Gallego 4a562c3110 unificado todo a claimState isEditable 2023-02-07 15:40:03 +01:00
Vicent Llopis cec7602e1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-07 13:44:53 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:24:26 +01:00
Alex Moreno 03d7a2908b refactor: only mock vn.time from 2000 to 2002
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 11:25:14 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 11:42:48 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Joan Sanchez 0a0cca0585 Set client bcrypt password
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 09:06:23 +01:00
Vicent Llopis f7fa082294 refator: name endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:49:09 +01:00
Pau c13bffcc57 refs #4797 @1h requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:11:16 +01:00
Pau dfa3022949 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-24 08:20:45 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:11:46 +01:00
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Alex Moreno bd0f4d89f8 Merge branch '5043-mock_Date' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 08:07:45 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Alexandre Riera 199fabbb1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:11:52 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:56:39 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Pau ec4c628adf Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 06:43:45 +00:00
Alex Moreno 8d33aa8454 fix(fixtures): use static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-17 15:36:39 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 12:50:34 +01:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Vicent Llopis eef926d09d fix: fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:34:51 +01:00
Vicent Llopis 76fe32924c fix: update url
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:25:20 +01:00
Alex Moreno 6b1a6fe44b feat: mock dates front and back 2023-01-16 15:18:00 +01:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Vicent Llopis 6a8e7873fa fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +01:00
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:29:45 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head Build queued... Details
2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:29:03 +01:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 12:48:03 +00:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:33:21 +00:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Alexandre Riera 6185b2f055 refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:04:38 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Pau ea7f4b7c02 remove broken fixture 2022-12-27 10:34:12 +01:00
Pau 3ca1d1f4ee remove error in fixtures 2022-12-27 10:29:15 +01:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01:00
Pau fce0352986 add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 10:41:07 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 09:25:52 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:15:50 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Vicent Llopis 1ddaf7ff08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-20 10:52:23 +01:00