16753 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	72b779f5c0	refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro	2023-06-13 10:26:12 +02:00
Vicent Llopis	fa9719de78	refs #5691 feat: cambiado url por data en los crudModel	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	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	2023-06-13 07:35:29 +02:00
Vicent Llopis	6f3c28c4a4	refs #5468 refactor: eliminado código obsoleto	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	2023-06-12 22:04:02 +02:00
Carlos Satorres	b7c8b03a65	refs #5325 e2e 2	2023-06-12 19:51:16 +02:00
Carlos Satorres	7127c5a3a8	refs #5325 e2e 1 smart Table	2023-06-12 17:37:25 +02:00
Juan Ferrer	cc788d7e06	refs #5667 Account translations added	2023-06-12 16:28:47 +02:00
Juan Ferrer	3386af9b17	refs #5667 MailAliasAccount translations added	2023-06-12 16:27:02 +02:00
Carlos Satorres	59642ab3ca	refs #5325 defaultSearch	2023-06-12 15:44:22 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Alex Moreno	983081a08e	Merge pull request 'test' (!1606) from test into dev ... 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	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 ... 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	2023-06-12 11:45:56 +00:00
Alex Moreno	80f6c72fee	Merge pull request '5472-user_passExpired' (!1594) from 5472-user_passExpired into dev ... 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	2023-06-12 10:31:25 +00:00
Carlos Satorres	0718a486e7	Merge pull request 'refs #5635 smart-table' (!1542) from 5635-contadotTicketExpedition into dev ... 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	2023-06-12 09:56:34 +00:00
Alex Moreno	1c39ad873c	resolve dev conflicts	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	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 ... 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	2023-06-12 10:27:18 +02:00
Alexandre Riera	703c224e91	refs #5513 modified-entry email	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	2023-06-12 10:25:46 +02:00
Alex Moreno	473dc0e48b	Merge branch 'dev' into 5701-update_to_mariadb10.7.7	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	2023-06-12 09:11:17 +02:00
Alex Moreno	2c0c0f24b0	reactive	2023-06-12 08:36:19 +02:00
Alex Moreno	1a58424531	refs #5327 warnFix(ticket_sale): fix orderBy amount itemPackingType	2023-06-12 08:33:31 +02:00
Alexandre Riera	167c3f8f8a	Merge pull request 'fixes #5595 Al modificar tablas dentro de procedimientos los logs creados no añaden el usuario loggeado' (!1499) from 5595-modify-loggable-tables-in-procs into dev ... Reviewed-on: #1499 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-12 05:37:56 +00:00
Alex Moreno	33f2d556fd	refs #5701 fix(db/dockerFile): fix docker-temp-stop	2023-06-12 07:33:45 +02:00
Alex Moreno	a8215e38f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7	2023-06-12 07:31:25 +02:00
Alexandre Riera	48ee29568d	Merge branch 'dev' into 5595-modify-loggable-tables-in-procs	2023-06-12 05:26:28 +00:00
Alex Moreno	d735f142a1	Merge branch 'dev' into 5472-user_passExpired	2023-06-12 05:04:28 +00:00
Juan Ferrer	94ebf50279	Merge pull request 'test' (!1603) from test into dev ... Reviewed-on: #1603	2023-06-09 20:00:27 +00:00
Juan Ferrer	decc5e471f	refs #5667 Changes added to changelog	2023-06-09 21:57:47 +02:00
Juan Ferrer	0fb114b06d	refs #5667 Search & entity filters moved to top	2023-06-09 21:45:36 +02:00
Alex Moreno	fdb9d2ed7f	refs #5701 fix dockerFile and sh's	2023-06-09 14:38:44 +02:00
Carlos Satorres	edb06a894a	Merge pull request '5760-changesSMS' (!1601) from 5760-changesSMS into dev ... Reviewed-on: #1601 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-09 11:26:51 +00:00
Carlos Satorres	9b4c4496b6	Merge branch 'dev' into 5760-changesSMS	2023-06-09 11:16:02 +00:00
Pablo Natek	b81b6c7020	Merge pull request 'refs #5735 fix currency' (!1570) from 5735-creditFormat into dev ... Reviewed-on: #1570 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-06-09 07:31:02 +00:00
Carlos Andrés	74c300fd53	Merge branch 'test' into use_invoiceIn_booking	2023-06-09 07:23:12 +00:00
Carlos Satorres	a06cd1929f	Merge branch 'dev' into 5760-changesSMS	2023-06-09 07:11:33 +00:00
Pablo Natek	9aadd71356	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:08:42 +00:00
Alexandre Riera	81a96e7d82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-09 09:03:23 +02:00
Alex Moreno	50ced36338	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5701-update_to_mariadb10.7.7	2023-06-09 08:43:39 +02:00
Juan Ferrer	d083ba795d	Merge pull request 'refs #5667 UI improved, filter by record' (!1600) from test into dev ... Reviewed-on: #1600	2023-06-09 06:31:47 +00:00