Commit Graph

14198 Commits

Author SHA1 Message Date
Pau 0b15236129 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:18:40 +00:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Pau 15f14062ca Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 14:06:52 +01:00
Vicent Llopis e34fb3e4db Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:59:29 +00:00
Joan Sanchez 0f40aa3e27 Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-11-24 12:49:53 +00:00
Vicent Llopis d233286a3f Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:44:37 +00:00
Vicent Llopis 9517063853 Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1164
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 12:44:19 +00:00
Pau 001c3ec2ac requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:06:13 +01:00
Vicent Llopis 20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:03:23 +00:00
Vicent Llopis 8e74ddf267 Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1148
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 11:03:08 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Pau 37a7a12f87 requested change
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:47:32 +01:00
Pau 8e6d0bd6b0 Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1116
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 09:45:43 +00:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:40:43 +00:00
Alexandre Riera 4fdcbb3077 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:28:35 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:27:49 +00:00
Pau c17435f6c4 Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1153
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 09:27:18 +00:00
Pau 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:23:00 +00:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Alexandre Riera a2e08c5907 Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1161
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 08:48:40 +00:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Alexandre Riera e3831cc1e3 Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1172
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-24 08:40:35 +00:00
Pau dfdf3d68bf changes needed for the worker Notification manager to work
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:36:05 +01:00
Alexandre Riera 23cf2d9aaf Merge branch 'dev' into 3949-invoiceIn-add-docFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:33:39 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Alex Moreno 42adba3538 mail content
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:11:46 +01:00
Alex Moreno f70a9cb785 feat(worker_new): use resetPassword funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:46:25 +01:00
Alex Moreno 7651dcb473 feat: resetPasswordRequest use more params
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:43:18 +01:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis 14eba75a8e feat: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 14:08:43 +01:00
Vicent Llopis 1c6a5164d4 feat: buscar por itemFk y claimResponsibleFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 14:04:43 +01:00
Alex Moreno 30a25664de out-layout component
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 13:49:50 +01:00
Vicent Llopis 7f89899d6c fix: closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 12:54:52 +01:00
Alexandre Riera 164b797ab8 front and e2e tests done
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 11:09:32 +01:00
Vicent Llopis 9a47b2fea4 Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:00:27 +00:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Vicent Llopis 6a2af344aa feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:41:32 +01:00
Vicent Llopis 9cfab2b3f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-23 10:23:17 +01:00
Vicent Llopis bf782c3782 fix: añadido esquema account
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 10:09:09 +01:00
Vicent Llopis e854fd248e feat: add checkInBox 2022-11-23 10:08:58 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:28:07 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau c02be35e1c Merge pull request 'closes #4511 kkear-expedition.itemFk' (!1146) from 4511-kkear-expedition.itemFk into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1146
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-23 07:37:28 +00:00
Pau 88db9c0d80 Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:25:20 +01:00
Pau 4c4e0e109d refactor test to use toBeGreaterThan 2022-11-23 08:25:15 +01:00
Alex Moreno 0f8eca4700 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:23:58 +01:00
Pau b6ff1d99b1 Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:20:13 +01:00