Commit Graph

17333 Commits

Author SHA1 Message Date
Vicent Llopis 5ab2913c39 Merge pull request 'fix intermittent backTest' (!1431) from fix_backTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1431
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-04-11 08:36:02 +00:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Vicent Llopis ec03c6edfa fix intermittent backTest
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 10:23:33 +02:00
Alexandre Riera 161fc25c5b 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-11 10:01:21 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez 5732f9a33b Merge pull request 'refs #5250 campo de notes' (!1407) from 5250-observacionesWorker into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1407
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:07:55 +00:00
Joan Sanchez fe0d861dc0 Merge pull request '4856-worker.time-control_2' (!1418) from 4856-worker.time-control_2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1418
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-11 07:06:04 +00:00
Joan Sanchez 4807fcb394 Removed focus
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:01:59 +02:00
Joan Sanchez b0f1bae33e Added unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 08:56:50 +02:00
Joan Sanchez 087e91e898 Updated unit tests 2023-04-11 08:15:46 +02:00
Vicent Llopis cd6a6f65b3 Merge branch '5327-ticket.sale_ordenarPorColumnas' of https://gitea.verdnatura.es/verdnatura/salix into 5327-ticket.sale_ordenarPorColumnas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:45:20 +02:00
Vicent Llopis cc9ce65678 test 2023-04-11 07:44:25 +02:00
Joan Sanchez b9e48f2102 Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:39:43 +02:00
Vicent Llopis 5e6cccbf57 Merge pull request '5275-item.fixed-price_refactor' (!1426) from 5275-item.fixed-price_refactor into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1426
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-11 05:18:14 +00:00
Juan Ferrer d7d4b9515e refs #5517 json value and date format fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 17:02:45 +02:00
Carlos Satorres 9f4d027014 refs #5316 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 15:36:14 +02:00
Joan Sanchez 2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02:00
Vicent Llopis ba31613ac9 Merge branch 'dev' into 5275-item.fixed-price_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 09:58:07 +00:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:32:05 +00:00
Alexandre Riera 49300b6f19 Merge pull request 'fixes #4954 cliente datos comprobados' (!1421) from 4954-client-isTaxDataChecked-businessTypeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1421
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-04-06 08:12:31 +00:00
Vicent Llopis d9ae24c927 Merge branch 'dev' into 4856-worker.time-control_2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:08:10 +00:00
Vicent Llopis 8a297469d6 refs #4856 añadido myOptions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 10:06:29 +02:00
Vicent Llopis faab024e24 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 09:59:45 +02:00
Alexandre Riera 05912610f8 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:47:06 +00:00
Carlos Satorres 30761781fa Merge branch '5250-observacionesWorker' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 09:34:49 +02:00
Carlos Satorres f307f79dc2 refs #5250 cambio a ult version de changes 2023-04-06 09:34:46 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Joan Sanchez 213766afdf Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:27:13 +00:00
Joan Sanchez 641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-06 09:26:55 +02:00
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
Juan Ferrer f7191f0f7f refs #5517 log relativeDate function fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:37:26 +02: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
Joan Sanchez 902709d61b Added authCode table
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:22:09 +02: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
Carlos Satorres 014998952e refs #084200 recipientId
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:39:51 +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
Carlos Satorres 1e71f7487a refs #084200 I18n footer
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:16:07 +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