Commit Graph

17173 Commits

Author SHA1 Message Date
Sergio De la torre 927c0fddc6 refs #5651 2023-06-14 13:15:37 +02:00
Vicent Llopis 98b270b885 refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 13:05:46 +02:00
Vicent Llopis 9b692e00d4 Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-14 11:01:43 +00:00
Vicent Llopis 9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:57:58 +00:00
Vicent Llopis 65108943ab refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:48:14 +02:00
Vicent Llopis e62a3ce166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:39:16 +02:00
Sergio De la torre c62e6fa0eb refs #5651 packingSiteAdvanced
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 10:51:22 +02:00
Alex Moreno aa2d3be451 typo
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 07:30:50 +02:00
Alex Moreno 5288f96836 Merge pull request '5094-ticket_index_docuware' (!1612) from 5094-ticket_index_docuware into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1612
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-06-14 05:29:25 +00:00
Juan Ferrer 961941ecb3 refs #5667 TicketRequest translations added/fixed
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 20:52:26 +02:00
Carlos Satorres 66c5eda6f2 refs #5325 remove defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 16:08:11 +02:00
Vicent Llopis 0cc5781f3f refs #4734 feat: añadido método putExpedicionInternacional de viaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 15:05:37 +02:00
Carlos Satorres 3cef6d642d refs #5325 smartTable e2e fix
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 14:15:31 +02:00
Carlos Satorres 61ce25c1e1 refs #5325 all e2e fix smartTable
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 13:32:04 +02:00
Alex Moreno dd4b62d0a5 description
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 12:42:12 +02:00
Alex Moreno aeb04efe82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-13 11:49:42 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 11:37:35 +02:00
Vicent Llopis 5d3ecfa00e refs #5554 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 10:44:29 +02:00
Vicent Llopis ddd23a9842 refs #5554 refactor: sustiuido window.localStorage por this
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-13 10:40:26 +02:00
Vicent Llopis 72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 10:26:12 +02:00
Vicent Llopis fa9719de78 refs #5691 feat: cambiado url por data en los crudModel
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 08:16:37 +02:00
Vicent Llopis 61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:43:23 +02:00
Vicent Llopis 0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:35:29 +02:00
Vicent Llopis 6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 07:34:41 +02:00
Alex Moreno a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware 2023-06-13 07:11:39 +02:00
Alex Moreno d8b041c734 refs #5472 correcto version folder
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 22:04:02 +02:00
Carlos Satorres b7c8b03a65 refs #5325 e2e 2
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 19:51:16 +02:00
Carlos Satorres 7127c5a3a8 refs #5325 e2e 1 smart Table
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 17:37:25 +02:00
Juan Ferrer cc788d7e06 refs #5667 Account translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:28:47 +02:00
Juan Ferrer 3386af9b17 refs #5667 MailAliasAccount translations added
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 16:27:02 +02:00
Carlos Satorres 59642ab3ca refs #5325 defaultSearch
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 15:44:22 +02:00
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 15:20:46 +02:00
Alex Moreno 983081a08e Merge pull request 'test' (!1606) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1606
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-06-12 12:58:00 +00:00
Alex Moreno f113bfbc95 Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 12:32:29 +00:00
Carlos Andrés e6c486b19c Merge pull request 'refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking' (!1599) from use_invoiceIn_booking into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1599
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-06-12 12:20:16 +00:00
Carlos Andrés ff6a2daf37 Merge branch 'test' into use_invoiceIn_booking
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 11:45:56 +00:00
Carlos Satorres 58bcad7b2d refs #4764 validator create
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-12 12:42:30 +02:00
Alex Moreno 80f6c72fee Merge pull request '5472-user_passExpired' (!1594) from 5472-user_passExpired into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1594
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-12 10:38:24 +00:00
Alex Moreno 24b3697ac6 Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:31:25 +00:00
Carlos Satorres 0718a486e7 Merge pull request 'refs #5635 smart-table' (!1542) from 5635-contadotTicketExpedition into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1542
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-12 10:09:44 +00:00
Carlos Satorres c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:56:34 +00:00
Alex Moreno 1c39ad873c resolve dev conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 11:06:45 +02:00
Alex Moreno 22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-12 11:06:27 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:46:21 +02:00
Alex Moreno bbdc0d3e7f Merge pull request '5701-update_to_mariadb10.7.7' (!1581) from 5701-update_to_mariadb10.7.7 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1581
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-06-12 08:43:56 +00:00
Alexandre Riera f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:27:18 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:26:50 +02:00
Robert Ferrús 77c7e58f80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5112-entryUpdateComission
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:25:46 +02:00
Alex Moreno 473dc0e48b Merge branch 'dev' into 5701-update_to_mariadb10.7.7
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 08:08:40 +00:00
Alex Moreno 051269d646 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 09:11:17 +02:00