16427 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	f797cc1761	refs #5489 refactor e2e	2023-06-09 08:31:05 +02:00
Carlos Satorres	c66feb53f0	refs #5760 fix fixtures	2023-06-09 08:29:18 +02:00
Carlos Satorres	ec9dfa90fd	refs #5760 fixtures	2023-06-09 08:06:45 +02:00
Pablo Natek	ac67a2606f	Merge branch 'dev' into 5735-creditFormat	2023-06-09 07:11:13 +02:00
Juan Ferrer	9c007504ea	refs #5667 UI improved, filter by record	2023-06-09 01:22:36 +02:00
Carlos Satorres	bdffc0401f	refs #5760 update getChanges, traduccion	2023-06-08 15:29:03 +02:00
Alex Moreno	96d88cdf4b	refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking	2023-06-08 14:42:07 +02:00
Vicent Llopis	dfdf948c42	move sql changes	2023-06-08 13:15:00 +02:00
Vicent Llopis	929b29e7e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-08 13:14:33 +02:00
Vicent Llopis	0ab23477d1	refs #5468 move sql changes	2023-06-08 13:13:55 +02:00
Vicent Llopis	653c37f048	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-06-08 13:12:59 +02:00
Carlos Satorres	7ea7816800	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy	2023-06-08 12:49:28 +02:00
Juan Ferrer	32a0955c1d	refs #5667 Zone translations fixed	2023-06-08 12:48:14 +02:00
Alex Moreno	3e39564695	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-08 12:39:36 +02:00
Alex Moreno	dd72ac9107	refs #5809 version 232601 init	2023-06-08 10:48:35 +02:00
Carlos Satorres	9cdaf2e519	refs #5728 fix e2e buy	2023-06-08 10:45:27 +02:00
Carlos Satorres	0afc26e20c	refs #5728 remove add, quit e2e	2023-06-08 10:30:03 +02:00
Alex Moreno	5ba8a15316	refs #5809 deploy 232401 dev in test	2023-06-08 10:25:25 +02:00
Vicent Llopis	8b92b35e29	Merge pull request '5252-canRefund_withOutWarehouse2' (!1567) from 5252-canRefund_withOutWarehouse2 into dev ... Reviewed-on: #1567 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2023-06-08 05:25:19 +00:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	9a63ce86aa	refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models	2023-06-07 23:54:27 +02:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +00:00
Juan Ferrer	2b70bfb3c2	Merge pull request 'master' (!1595) from master into test ... Reviewed-on: #1595	2023-06-07 21:01:47 +00:00
Vicent Llopis	e2c7a38e82	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-06-07 14:18:36 +02:00
Vicent Llopis	bd4eee6606	refs #5252 eliminado warehouseFk = 1 por defecto #5252	2023-06-07 14:17:46 +02:00
Alex Moreno	e3562f9c32	Merge branch '5472-user_passExpired' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 13:44:55 +02:00
Alex Moreno	60024f8454	typo	2023-06-07 13:44:52 +02:00
Alex Moreno	1240a6b71a	Merge branch 'dev' into 5472-user_passExpired	2023-06-07 11:44:47 +00:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Vicent Llopis	3fdb546d86	refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created	2023-06-07 10:28:29 +02:00
Carlos Satorres	4e08f51848	Merge branch 'dev' into 5635-contadotTicketExpedition	2023-06-07 07:16:13 +00:00
Vicent Llopis	7cf85eeef8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-07 09:03:33 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Alexandre Riera	0bc4570706	Merge pull request 'fixes #5642 Arreglar e2e ticket Advance y ticket Future' (!1525) from 5642-arreglar-e2e-ticketFuture-ticketAdvance into dev ... Reviewed-on: #1525 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-06-07 06:48:00 +00:00