Commit Graph

14122 Commits

Author SHA1 Message Date
Alexandre Riera c3508c50d4 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:29:44 +01:00
Alexandre Riera c99bfef917 refs #3302 fixed scss
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:29:21 +01:00
Alexandre Riera 140509202b Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:20:26 +00:00
Vicent Llopis 799c26796e feat: añadidos chips
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:19:05 +01:00
Alexandre Riera c949b7f6c7 Merge pull request 'fixes #4962 Refactor Ticket Tour a Futuro' (!1212) from 4700-split-tour into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1212
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-20 14:17:38 +00:00
Alexandre Riera 1982e4c989 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:25:38 +01:00
Alexandre Riera 27e0c2d0be refs #3302 where with changedModel and changedModelId
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:23:47 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:16:40 +01: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 9291f4a380 refs #3963 sql moved
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:10:02 +01:00
Pau 1305513b07 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:01:38 +00: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
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Vicent Llopis d178800c14 movidos change sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:53:13 +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
Vicent Llopis 8b5f5d928e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:39 +01:00
Joan Sanchez 73ea928b33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:23 +01:00
Joan Sanchez 47e1c05e47 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:39:39 +01:00
Joan Sanchez 70b1854cc5 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:20:31 +01:00
Vicent Llopis b7100873a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:11:52 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Vicent Llopis 63343998d8 refactor: cambiada la forma en que se descarga el zip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:48:58 +01:00
Joan Sanchez c063c0e72f fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good Details
Refs: #4531
2022-12-20 09:48:41 +01:00
Vicent Llopis 1a616fa1d4 refactor: delete transaction
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:09:21 +01:00
Vicent Llopis cb9ad5d012 refactor: show ticketId error
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 08:45:14 +01:00
Pau d8cae400a8 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:11:59 +00:00
Alexandre Riera 2bb37e733a Merge pull request 'fixes #4928 Supplier payMethod notify' (!1202) from 4928-supplier-payMethod-notify into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2022-12-20 07:07:35 +00:00
Alexandre Riera cd71a59dfe Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:01:45 +00:00
Alexandre Riera 6517e9e6ce Merge pull request 'fixes #4503 Añadir opción de rocket si o rocket no' (!1145) from 4503-opcion-rocket into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1145
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-12-20 06:59:28 +00:00
Alexandre Riera 0009f27462 Merge branch 'dev' into 4503-opcion-rocket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 06:55:11 +00:00
Alex Moreno 5d2b69d063 test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 15:06:59 +01:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 14:39:38 +01:00
Pau 6b3876b200 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 12:26:52 +00:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 11:24:18 +01:00
Pau a34c006dc9 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 08:14:02 +00:00
Joan Sanchez c94c8a159e Merge pull request '4548 fix: invoiceIn' (!1211) from 4548-invoiceIn-pdf-2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1211
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-19 07:45:32 +00:00
Alex Moreno 17a3896c1c Merge branch 'dev' into 4548-invoiceIn-pdf-2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:32:52 +00:00
Pau 07d52f551d Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 06:56:06 +00:00
Pau 43b957cb9b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 06:50:33 +00:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Pau 410e51f96b Merge pull request 'removed pending from working test' (!1195) from 4875-skip-tests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1195
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-19 06:43:31 +00:00
Pau d356e5352b delete old files
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:41:15 +01:00
Pau 055a479aba Merge branch 'dev' into #288-traducir-state-i18n 2022-12-19 07:40:56 +01:00
Pau cc6e2a8d01 remove package locks to avoid merge conflicts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 07:30:47 +01:00