Commit Graph

17337 Commits

Author SHA1 Message Date
Vicent Llopis 15429293dd fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 11:34:13 +01:00
Alexandre Riera 16a6167db0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 10:39:26 +01:00
Pau 6807d8d5b1 Merge pull request '4797-lilium-worker-notifications' (!1229) from 4797-lilium-worker-notifications into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1229
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 08:53:28 +00:00
Alexandre Riera 3b0e8c2412 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:40:57 +00:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:36:07 +00:00
Pau 99e6ef5a36 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:35:14 +00:00
Joan Sanchez 4d8af54b1e Added version 23.06.01
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 09:21:12 +01:00
Vicent Llopis 76865fc7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 09:18:37 +01:00
Joan Sanchez d45c0cb99a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:59:39 +01:00
Joan Sanchez 52d2e091ac Merge pull request 'fixes #5131 Cambios en Ticket Advance' (!1291) from 5131-cambios-ticketAdvance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1291
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:59:20 +00:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Joan Sanchez 37b0b32c0d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:50:48 +01:00
Joan Sanchez 85bde58752 Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1230
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:47:38 +00:00
Joan Sanchez 176b47bf97 Merge pull request 'fixes #5077 Ticket/Basic Data no guarda la hora de envío' (!1274) from 5077-horaEnvio-ticketBasicData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1274
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:44:24 +00:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:40:49 +01:00
Alexandre Riera 52a3f77bc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:39:28 +01:00
Joan Sanchez d0e65b9539 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 07:38:12 +00:00
Alex Moreno 5b228c5e71 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 07:35:34 +00:00
Joan Sanchez 7a700de5c2 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 08:23:17 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 07:32:38 +01:00
Alex Moreno 4a587049fc feat(recover-password): use user
gitea/salix/pipeline/head This commit looks good Details
refs #5170
2023-02-01 15:13:38 +01:00
Alexandre Riera 96a3ae8912 Merge pull request 'fixes #5072 client.fiscal-data comprobar que tiene email' (!1278) from 5072-comprobar-email-clientFiscalData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1278
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 08:55:33 +00:00
Alexandre Riera 547c7a336b Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:17 +00:00
Alexandre Riera 5871909401 Merge pull request 'fixes #5138 route summary cambiar orden de campos' (!1281) from 5138-cambiarOrdenCampos-routeSummary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1281
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 08:51:37 +00:00
Pau ec73b512fc Merge branch 'dev' into 5063-item-module-doPhoto
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 09:26:25 +01:00
Alexandre Riera 6af6a17a45 Merge pull request 'hotfix #5157 No se pueden desplegar los campos de fecha' (!1299) from 5157-desplegar-fechas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1299
2023-02-01 08:05:08 +00:00
Alex Moreno 39d4b53872 fix: sql fail in real structure...
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 09:00:49 +01:00
Alexandre Riera 73b7a1d761 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:53 +01:00
Alexandre Riera fc5206d56a Merge branch '5072-comprobar-email-clientFiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:06 +01:00
Alexandre Riera 62766706b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData 2023-02-01 08:52:03 +01:00
Alexandre Riera b810e54b95 Merge branch 'master' into 5157-desplegar-fechas
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:49:53 +00:00
Alex Moreno 56f7794d87 typo
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:47 +01:00
Alexandre Riera 2ef7b0d756 refs #5157 clip-path deleted
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:33 +01:00
Alexandre Riera 7d7e1a74da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:46:28 +01:00
Alexandre Riera d17f9396ad refs #3291 save button
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:43:13 +01:00
Pau 9ece9d8625 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:42:21 +01:00
Pau 650cc68f4a requested changes 2023-02-01 08:42:20 +01:00
Pau e309c63efb Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:38:10 +00:00
Alex Moreno 00ffc82f8d use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:34:14 +01:00
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +01:00
Alex Moreno 4a1c97c6b2 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:00:12 +00:00
Alexandre Riera 5d0ac58850 Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1296) from 5088-clientBalance-ponerReceiptId into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1296
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 06:26:50 +00:00
Guillermo Bonet d30f471bc5 Merge pull request 'refs #4975 Added chat/send in mdbVersion/upload' (!1295) from 4975-mdbConfig-and-upload into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1295
2023-02-01 06:21:03 +00:00
Alex Moreno ae6e0f0772 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:20:48 +00:00
Alexandre Riera a52be50dad Merge branch 'dev' into 5088-clientBalance-ponerReceiptId
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:18:41 +00:00
Alexandre Riera 17bb4b6072 refs #5088 added receiptId
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:17:16 +01:00
Alexandre Riera d046cd69a9 Merge pull request 'fixes #5129 Enriquecer mensaje si no se pueden editar ticket.sale' (!1287) from 5129-enriquecer-mensaje into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1287
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-01 06:13:15 +00:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Guillermo Bonet 909f0c3532 Merge branch 'master' into 4975-mdbConfig-and-upload
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:09:44 +00:00