Commit Graph

15569 Commits

Author SHA1 Message Date
Vicent Llopis 56565ed47a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 12:16:58 +01:00
Alexandre Riera 60eabbf7a0 Merge branch 'test' into hotfix-added-grabUser-logs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:37:57 +00:00
Alexandre Riera 81472a5e50 removed duplicated log
gitea/salix/pipeline/head Build queued... Details
2023-03-22 11:36:28 +01:00
Alexandre Riera 59c3ef23de grabUser added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 11:03:13 +01:00
Alexandre Riera 48f7c4d251 Merge pull request 'fixes e2e' (!1402) from fix-e2e into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1402
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-22 09:58:05 +00:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Vicent Llopis eb910e1b4d refs #5395 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:25:04 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis 18afcbabc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community 2023-03-22 10:20:55 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Alexandre Riera 5598bbaaa8 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:37 +01:00
Vicent Llopis bf38098e5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-22 09:31:08 +01:00
Vicent Llopis c8eb6dfb31 refs #5013 borrado changes sql, pq fallan los test de back
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 09:24:28 +01:00
Vicent Llopis 9ef5c0c560 refs #5013 mostrar las observaciones del ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 09:07:22 +01:00
Alexandre Riera 700151b500 refs #5092 amount <> 0
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 08:18:56 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 41c79263c4 refs #5410 feat: envia email cuando se añade una nota
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:53:36 +01:00
Vicent Llopis 1d0024c538 refs #5013 feat: añadida observacion para cada ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:08:34 +01:00
Vicent Llopis 4141a97356 refs #4858 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 11:37:26 +01:00
Vicent Llopis 32e2d1c0fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime
gitea/salix/pipeline/head Build queued... Details
2023-03-21 11:26:41 +01:00
Vicent Llopis d1f0ae3865 refs #4858 fix: filtro corregido
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 11:26:25 +01:00
Joan Sanchez d209b35071 Merge pull request 'refs #5423 añadido 3r decimal' (!1392) from #5423-tercerDecimalCoste into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1392
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-21 10:22:37 +00:00
Joan Sanchez 82a674e2f6 Merge pull request 'refs #5073 adaptacion para solo el año' (!1397) from 5073-diaActual into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1397
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-21 10:21:59 +00:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Joan Sanchez 46b40c03a7 Merge pull request '5241-virtual_pos' (!1399) from 5241-virtual_pos into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1399
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-03-21 09:35:19 +00:00
Joan Sanchez 3a922b453f Merge branch 'dev' into 5241-virtual_pos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:10:34 +00:00
Joan Sanchez 6d6c2cbfb3 Default formatter
gitea/salix/pipeline/head Build queued... Details
2023-03-21 10:09:03 +01:00
Joan Sanchez 5e61cbabc7 Merge pull request 'refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion' (!1398) from 5203-supplier.create_refactor into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1398
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-21 09:07:07 +00:00
Joan Sanchez 12a9ff599b Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:05:27 +01:00
Joan Sanchez 3881e435f4 Renamed method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 09:55:45 +01:00
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +01:00
Carlos Satorres 1bc3103d9f refs #5439 filtro comercial
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 08:44:28 +01:00
Joan Sanchez 634db7c7fc refactor(getTransactions): lilium customer transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 23:09:17 +01:00
Carlos Satorres da05140635 Merge branch '#5423-tercerDecimalCoste' of https://gitea.verdnatura.es/verdnatura/salix into #5423-tercerDecimalCoste
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:14:11 +01:00
Carlos Satorres 306573b1bf refs #5439 campos fecha y salesperson
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 15:11:55 +01:00
Carlos Satorres f0f2a8c731 refs #5432 quitar comentario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-20 13:41:32 +01:00
Carlos Satorres a670795f9d refs #5432 mod ng-show, add tooltip and disabled 2023-03-20 13:22:21 +01:00
Carlos Satorres 78d8bbd82a refs #5423 tercer decimal en entrada 2023-03-20 10:44:44 +01:00
Alexandre Riera 61a0d8bcb2 refs #5092 showing clients with multiple negative bases
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 10:15:18 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 09:54:02 +01:00
Carlos Satorres f5109724bf refs #5073 adaptacion para solo el año
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 11:39:16 +01:00
Joan Sanchez 40ccc4f409 Merge pull request 'refs #4357 add operator model' (!1395) from 4357-operatorSalix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1395
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-17 10:12:48 +00:00
Carlos Satorres 9e42ab52ce refs #5425 modificación usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-17 09:32:20 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Carlos Satorres 9565bb33f2 refs #5425 modificacion de los campos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:12:54 +01:00
Vicent Llopis 6d04933fe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5395-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 14:01:19 +01:00
Vicent Llopis 98916bf5e1 refs #5410 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 13:57:22 +01:00
Vicent Llopis 5794ae5130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked 2023-03-16 13:55:54 +01:00
Vicent Llopis bc47fc35d6 refs #5410 feat: añadido filtro a las columnas created y defaulterSinced
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 13:55:21 +01:00