verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
15,159 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

15159 Commits

Author SHA1 Message Date
Vicent Llopis 3b9a17e179 Merge pull request '5342-monitor.tickets_isFragile' (!1393) from 5342-monitor.tickets_isFragile into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1393
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-03-24 07:10:25 +00:00
Vicent Llopis a45308c6a5 refs #5342 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 07:58:27 +01:00
Vicent Llopis 0f6092483c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:51:31 +01:00
Alexandre Riera 74312a3cdf refs #5056 changed acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:30:35 +01:00
Alexandre Riera 24d032910a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:58:31 +01:00
Vicent Llopis afdfe5e3f3 refs #5331 al filtrar por 'Pendiente' no muestra los estados 'Previa x'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 14:55:19 +01:00
Vicent Llopis 2513377add Merge branch 'dev' into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 13:38:08 +00:00
Joan Sanchez ea50da8a19 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-03-23 14:33:10 +01:00
Alexandre Riera 6738243534 refs #5206 added e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 14:30:58 +01:00
Joan Sanchez 7ee33a77b1 Merge pull request 'fix tests logs' (!1408) from fix-tests-logs into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1408
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-23 12:47:05 +00:00
Joan Sanchez 4762f3b54f fix(deliveryNote): ticket without delivery address
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 13:33:14 +01:00
Joan Sanchez 83c1750aae Merge pull request 'hotfix_claim.detail_noPermiteModificarReclamados' (!1409) from hotfix_claim.detail_noPermiteModificarReclamados into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1409
 2023-03-23 09:59:00 +00:00
Vicent Llopis 805df64bb2 fallo cantidad reclamados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:54:04 +01:00
Alexandre Riera c6fc2dee24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:53:11 +01:00
Alexandre Riera 4e5364dc0b refs #5036 fix tests logs
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 10:05:02 +01:00
Vicent Llopis 2b73fb5a7e Merge branch 'dev' into 5013-observaciones_facturas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 08:29:23 +00:00
Vicent Llopis 46e61543a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 09:29:03 +01:00
Vicent Llopis 7e37d7f3f1 refs #5342 actualido el itemType.isFragile para las 'plants'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 09:25:56 +01:00
Joan Sanchez 7b5e0bae8e 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-03-23 08:20:33 +01:00
Alexandre Riera 3fcfc3d640 refs #5056 adding fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 07:53:26 +01:00
Joan Sanchez 72b30c91a2 Merge pull request 'hotfix-added-grabUser-logs' (!1404) from hotfix-added-grabUser-logs into test
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1404
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-23 06:11:48 +00:00
Vicent Llopis d98bd7b92b Merge branch 'dev' into 5013-observaciones_facturas
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 06:04:20 +00:00
Joan Sanchez fcd422eb49 added relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 14:55:54 +01:00
Carlos Satorres 1ab8570ed3 Merge branch 'dev' into 5425-modCamposBasicos(pesoycaja)
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:28:07 +00:00
Carlos Satorres b2cc79a98e Merge branch 'dev' into 5432-propiedadesBotonMas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 13:24:32 +00:00
Vicent Llopis 27bb50ad12 refs #5342 esta tabla ya se borra en el proc
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 12:17:48 +01:00
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
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
Alexandre Riera 5598bbaaa8 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:37 +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 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 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