Commit Graph

15152 Commits

Author SHA1 Message Date
Vicent Llopis 9311a59a54 Merge pull request '4858-chat_realTime' (!1313) from 4858-chat_realTime into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1313
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-24 10:12:23 +00:00
Vicent Llopis dca760d4e4 Merge branch 'dev' into 4858-chat_realTime
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:02:51 +00:00
Vicent Llopis 6433e889c7 Merge pull request '5013-observaciones_facturas' (!1401) from 5013-observaciones_facturas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1401
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-03-24 09:56:27 +00:00
Vicent Llopis 91cc91716f Merge branch 'dev' into 5013-observaciones_facturas
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:37:13 +00:00
Vicent Llopis cbe79a964c refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 10:31:02 +01:00
Vicent Llopis 925774c75b refs #5331 add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:16:39 +01:00
Joan Sanchez 00a0f88dc4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:03:23 +01:00
Joan Sanchez e67a40714c Claim log hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:59:55 +01:00
Alexandre Riera cfe4570d3b refs #5206 e2es fixed
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:21:55 +01:00
Vicent Llopis 5784f05fd4 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-24 08:34:04 +01:00
Vicent Llopis dd412606ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5013-observaciones_facturas
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:26:06 +01:00
Alexandre Riera 0baccc4745 refs #5206 fix tests front
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:25:37 +01:00
Alexandre Riera 8f2398bc8c 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-24 08:12:50 +01:00
Vicent Llopis 92aed3eac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5331-monitor.tickets_actualizarFiltro
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:11:35 +01:00
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