Commit Graph

15970 Commits

Author SHA1 Message Date
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:53:25 +02:00
Alex Moreno 0045edb698 refs #5094 fix get email
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:39:43 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Alex Moreno f030ecd2a7 Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1526
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-22 14:44:37 +00:00
Carlos Satorres 71ba45c580 Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 15:56:16 +02:00
Carlos Satorres 3994e65040 refs #5648 spaces fix2 2023-05-22 15:56:14 +02:00
Carlos Satorres a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 13:51:35 +00:00
Alex Moreno 380287b819 Merge pull request 'correct type' (!1545) from 5094-fix_id_type into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1545
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
2023-05-22 13:05:29 +00:00
Alex Moreno 3189799b4c correct type
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:45:00 +02:00
Alex Moreno c42400a637 Merge branch 'dev' into 5579-db-export
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:43:57 +00:00
Carlos Satorres fb4697e8fa Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:31:18 +00:00
Carlos Satorres 5e651d7b8c Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:30:06 +02:00
Carlos Satorres 6d147e7af7 refs #5648 fix spaces 2023-05-22 14:30:04 +02:00
Alexandre Riera c15e77f5c1 Merge pull request 'fixes #5655 Afinar login' (!1516) from 5655-afinar-login into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1516
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-22 10:36:05 +00:00
Alexandre Riera e589e70e06 Merge branch 'dev' into 5655-afinar-login
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:31:27 +00:00
Carlos Satorres 6093cb4794 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:26:57 +00:00
Carlos Satorres 9bc20493fe #refs #5648 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:02:07 +02:00
Alex Moreno 03d69f81c5 Merge pull request 'refs #5094 add scopes' (!1540) from 5094-test_docuware_autoSend into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1540
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-22 09:32:48 +00:00
Carlos Satorres 1b19035d8d refs #5648 vn-confirm
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 10:41:02 +02:00
Carlos Satorres a731cbf0cd Merge pull request 'refs #5689 fix pixels' (!1530) from 5689-fixedPricesSize into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1530
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-22 06:53:59 +00:00
Carlos Satorres e9222dbcb7 Merge branch 'dev' into 5689-fixedPricesSize
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 06:31:51 +00:00
Carlos Satorres 23287e5ebf refs #5648 setTimeout
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-22 08:30:23 +02:00
Carlos Satorres 32ce0c1a1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim 2023-05-22 08:13:31 +02:00
Juan Ferrer e08f848812 refs #5667 Model id html fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-21 14:35:50 +02:00
Juan Ferrer 69b892f2fd refs #5667 Translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 16:59:39 +02:00
Juan Ferrer a4beb84e66 refs #5667 Translations fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 16:49:34 +02:00
Juan Ferrer 08e0bf7ddd refs #5667 Color fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 14:16:24 +02:00
Juan Ferrer 35331e355f refs #5667 Fixes: Colors, translation
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 14:09:11 +02:00
Juan Ferrer 1160cbc279 refs #5667 Fixes: Style, translations, icons
gitea/salix/pipeline/head This commit looks good Details
2023-05-20 13:50:55 +02:00
Juan Ferrer 718002d5aa refs #5667 Style fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 14:38:45 +02:00
Juan Ferrer c1e222db83 refs #5667 Style fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 14:31:16 +02:00
Juan Ferrer 20b3c4f5b8 refs #5667 Style improved
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 13:51:20 +02:00
Vicent Llopis f81e9ec23e Merge pull request '5638-ticket.summary_states' (!1538) from 5638-ticket.summary_states into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1538
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-05-19 11:35:31 +00:00
Vicent Llopis 8eedba8a66 refs #5609 feat: solo muestra error cuando hay 'from' sin 'to y viceversa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 13:34:07 +02:00
Juan Ferrer a190f2152b refs #5667 Fixes: Translations, help
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 11:14:29 +02:00
Juan Ferrer 29610e52cc refs #5667 No detail label fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 11:01:34 +02:00
Juan Ferrer c7febc9699 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 10:56:19 +02:00
Juan Ferrer 6b0fd99eb8 refs #5667 Fixes: Style, translations, fixtures, UI 2023-05-19 10:56:15 +02:00
Vicent Llopis 5ec107188c refs #5609 feat: no deja buscar si no tiene un filtro de fecha
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 10:30:36 +02:00
Alex Moreno 8b0d7eb26c Merge pull request 'refs #4548 hotFix(invoiceIn): report use invoiceIn.issued' (!1527) from hotFix_invoiceIn_issued into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1527
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-19 06:27:28 +00:00
Alex Moreno 975154c929 Merge branch 'master' into hotFix_invoiceIn_issued
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 06:16:18 +00:00
Vicent Llopis 8cf988b7d2 refs #5638 refactor: code
gitea/salix/pipeline/head This commit looks good Details
2023-05-19 08:02:17 +02:00
Vicent Llopis 2402b27632 Merge branch 'dev' into 5600-workerPhoto_incorrectSize
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-19 05:55:40 +00:00
Alex Moreno f54d9180b1 fix front test
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 14:44:05 +02:00
Alex Moreno 15a1965a53 refs #5094 add scopes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:12:46 +02:00
Vicent Llopis ec02972efb refs #5609 mostrar filtro por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 14:11:29 +02:00
Vicent Llopis d389860704 refs #5609 eliminadas peticiones duplicadas 2023-05-18 14:11:18 +02:00
Carlos Satorres 814568f2a9 refs #5297 errors solve, trad
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-18 13:11:17 +02:00
Alexandre Riera cbbb571638 refs #3628 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 11:45:50 +02:00