Commit Graph

15363 Commits

Author SHA1 Message Date
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez b71ad207ff Merge pull request 'fixes #5437 Desactivar correos "Cliente con email/teléfono/móvil duplicados"' (!1420) from 5437-deactivate-mail-duplicated-client into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1420
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:07:35 +00:00
Joan Sanchez a8af280de5 Merge pull request '5439-newFilterEnPeticionesDeCompra' (!1406) from 5439-newFilterEnPeticionesDeCompra into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1406
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:05:18 +00:00
Joan Sanchez 033927d5b4 Merge pull request '5410-client.defaulter_getChecked' (!1403) from 5410-client.defaulter_getChecked into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1403
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:04:32 +00:00
Vicent Llopis 041590e541 refs #4856 maneja errores y notifica a los jefes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:54:12 +02:00
Joan Sanchez 936d66f8b8 Merge pull request 'hotfix_kmPrice_addDecimals' (!1427) from hotfix_kmPrice_addDecimals into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1427
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 06:45:46 +00:00
Vicent Llopis 6fc2867551 permite decimales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:05:37 +02:00
Pablo Natek 1e01f26d76 refs #5211 empty commit
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:03:41 +02:00
Alexandre Riera c823a0d6f1 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 05:44:33 +00:00
Vicent Llopis a44a640d15 refs #4856 manejo errores
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:14:42 +02:00
Vicent Llopis 6a0bca1a94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:06:33 +02:00
Vicent Llopis de31d98e2e refs #5275 fix test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 13:03:18 +02:00
David Domenech 44d4df9c21 Merge branch 'dev' into 5211-cleanItemShelvings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:00:08 +00:00
Alexandre Riera 7e42bd1116 refs #5379 referencia a vn2008 quitada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 12:01:42 +02:00
Vicent Llopis 3450e7ffdf refs #5275 fix test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 09:20:56 +02:00
Carlos Satorres 8741a9f913 Merge branch 'dev' into 5439-newFilterEnPeticionesDeCompra
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 06:51:21 +00:00
Carlos Satorres 7d3c6a98f3 refs #5439 search panel solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:48:15 +02:00
Vicent Llopis fb5969a120 refs #5275 add test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:43:47 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Satorres 77b91b77b2 refs #5439 requesterFk solve
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 08:19:50 +02:00
Vicent Llopis e97b5a9f80 refs #5275 fix backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:54:56 +02:00
Vicent Llopis 28a12d0706 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 07:36:53 +02:00
Alexandre Riera 8f4de7e7e9 refs #5259 undo delete, update trigger
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:27:10 +02:00
Alexandre Riera 589e996b69 refs #5259 minor fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:17:19 +02:00
Juan Ferrer d0c94b985d Merge pull request 'fixes #5529 Fixes: missing awaits, buffer-to-file' (!1422) from 5529-invoicingFixes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1422
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-04-04 13:13:30 +00:00
Carlos Andrés e342852ed8 Merge branch 'master' into 5529-invoicingFixes
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-04-04 13:05:49 +00:00
Joan Sanchez d464818ddb Merge pull request 'hotfix_sendMail_insertsIntoWorkerTimeControlMail' (!1419) from hotfix_sendMail_insertsIntoWorkerTimeControlMail into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1419
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-04 13:02:18 +00:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Alexandre Riera 81cf35f2d3 refs #5259 drop procedure invoiceOut_afterInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:55:37 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
Vicent Llopis 14f966ab9a Merge branch 'master' into hotfix_sendMail_insertsIntoWorkerTimeControlMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 12:32:56 +00:00
Vicent Llopis 35d19e586a add translatiojn
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:27:16 +02:00
Vicent Llopis 7a274e2721 Merge branch 'dev' into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:12:20 +00:00
Vicent Llopis 3630c7d398 refs #5410 creada ruta de back para enviar emails
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 14:09:55 +02:00
Joan Sanchez c126c6044a Updated format
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 13:55:44 +02:00
Joan Sanchez b6cfab26d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:53:42 +02:00
Joan Sanchez b49307463e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:53:25 +02:00
Joan Sanchez e8f0a49f0c fix(resetPassword): increased token TTL for password recovery
gitea/salix/pipeline/head This commit looks good Details
Refs #5474
2023-04-04 13:51:44 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +02:00
Alexandre Riera 9380b88460 refs #5437 back and test deprecated
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 12:40:03 +02:00
Vicent Llopis 0bfa4c54aa fix: inserta en workerTimeControlMail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 09:52:46 +02:00
Alexandre Riera ecbfdad102 refs #5418 changelog
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 09:51:07 +02:00
Alexandre Riera 1a14c793cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:47:31 +02:00
Vicent Llopis 0db3bc5e26 refs #4856 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 09:29:51 +02:00
Vicent Llopis 21b7050cfd refs #4856 otros usuarios pueden actualizar el estado 2023-04-04 09:29:40 +02:00
Alexandre Riera 25df36eec9 Merge pull request 'fixes #5092 Listado tickets sin facturar' (!1368) from 5092-listado-ticketsSinFacturar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1368
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-04 07:17:15 +00:00
Alexandre Riera 98f61ecfdb refs #5092 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 08:47:56 +02:00
Alexandre Riera 32df51ecca refs #5092 moved sql
gitea/salix/pipeline/head Build queued... Details
2023-04-04 08:40:51 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 08:40:03 +02:00
Vicent Llopis d1100384bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control_2 2023-04-04 08:27:27 +02:00