Commit Graph

18582 Commits

Author SHA1 Message Date
Vicent Llopis 5af961ac69 fix: maneja si se elimina la sale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:53:21 +02:00
Alexandre Riera af1ad7e08c fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 09:47:34 +02:00
Carlos Satorres 10def65a3f Merge branch '5540-validarSupplierIsVies' of https://gitea.verdnatura.es/verdnatura/salix into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:14:32 +02:00
Carlos Satorres d8b5659a5d refs #5540 client vies 2023-04-21 09:14:30 +02:00
Alex Moreno 3103e60d4b fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 60000
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 09:14:06 +02:00
Alex Moreno df3f2f3b62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test 2023-04-21 09:12:56 +02:00
Alexandre Riera b3a10698af hotfix negativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 08:20:38 +02:00
Vicent Llopis 07e76a9333 Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-21 06:07:27 +00:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Juan Ferrer 9694a35343 refs #5517 Added: Tests, filter panel, model and props titles
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 19:46:57 +02:00
Juan Ferrer 6f1744baff Merge branch 'dev' into 5517-improveLogs+translations 2023-04-20 16:30:24 +02:00
Carlos Satorres 088f2f9181 Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:27:57 +00:00
Carlos Satorres b942bc2fe7 Merge branch 'dev' into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:26:45 +00:00
Carlos Satorres e32939cde9 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:25:06 +00:00
Carlos Satorres 46938b224c Merge branch 'dev' into 5436-mensajeClienteSinCorreo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:24:18 +00:00
Vicent Llopis bcf7b6ab3d borrado acl innecesario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 15:17:49 +02:00
Vicent Llopis 89cca5ee9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5456-client-welcome_email_añadirTraducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 15:12:23 +02:00
Vicent Llopis 681b027098 refs #5456 añadida traducción al francés y corregida la de portugués
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 15:11:01 +02:00
Alexandre Riera 6fc71672a6 Merge pull request 'fixes #5527 cabecera facturas' (!1468) from 5527-cabecera-facturas into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1468
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-04-20 12:43:09 +00:00
Carlos Satorres 33c296c34d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5439-inheritRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 14:31:46 +02:00
Vicent Llopis a898c6d4c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 14:00:31 +02:00
Vicent Llopis ec9a5722c2 refs #5128 añadido icono de grafana
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 13:58:49 +02:00
Carlos Satorres d6e6dab03b Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:55:52 +02:00
Carlos Satorres b4183c2698 refs #5436 mod de error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 11:33:28 +02:00
Alexandre Riera d8fff8f3c4 refs #5527
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:51:21 +02:00
Alexandre Riera 5a4fcc2728 refs #5527 header fixed
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:43:35 +02:00
Carlos Satorres c103eeab7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5436-mensajeClienteSinCorreo 2023-04-20 10:40:22 +02:00
Carlos Satorres 237c83c6f5 refs #5066 getVehicleSorted small mod
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:20:15 +02:00
Carlos Satorres 30924bb8f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5575-tercerDecimalLatest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:44:38 +02:00
Carlos Satorres 89a3ef5f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:30:20 +02:00
Carlos Satorres 16fdfa00fd refs #5066 e2e solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 09:09:48 +02:00
Alex Moreno 239685b43f (231401) master to test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:52:48 +02:00
Juan Ferrer 6f35eb0ce3 Merge pull request '231401_test_to_production' (!1464) from 231401_test_to_production into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1464
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-04-20 06:45:45 +00:00
Alex Moreno 7df4a2b15d fix(231401): fix tests and fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:25:15 +02:00
Alex Moreno 63e0031bc6 deploy(231401): test to master 2023-04-20 08:24:43 +02:00
Carlos Satorres b45b0ff826 refs #5066 copy project from the other
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 08:23:46 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alexandre Riera 84c2512847 refs #5293 open lilium in the same page
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:51:25 +02:00
Alexandre Riera 4f25f153a9 Merge pull request 'fix e2e smartTable' (!1462) from fix-e2e-smartTable into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-04-20 05:15:53 +00:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Vicent Llopis f6bf92b74b refs #5128 intentando poner icono grafana
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 15:21:59 +02:00
Vicent Llopis 6fbb734a34 quitado salto de linea
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 14:43:23 +02:00
Vicent Llopis 187ba032d2 refs #5128 rol por ACL 2023-04-19 14:43:15 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Alexandre Riera 0b5d16a78c fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:26:56 +02:00
Vicent Llopis 34b360040b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 12:18:45 +02:00
Guillermo Bonet 6f96820168 refs #5237 Ahora lee un conjunto de arrays
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 10:16:37 +02:00
Vicent Llopis 5ace66ebca refs #5318 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:54:54 +02:00
Vicent Llopis be8a11cafc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 09:52:28 +02:00
Carlos Satorres a559c1f648 refs #5575 mod3Decimal
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 09:02:04 +02:00