2465 Commits

Author	SHA1	Message	Date
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
Alex Moreno	f113bfbc95	Merge branch 'dev' into test	2023-06-12 12:32:29 +00: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	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
Alex Moreno	d735f142a1	Merge branch 'dev' into 5472-user_passExpired	2023-06-12 05:04:28 +00:00
Alex Moreno	fdb9d2ed7f	refs #5701 fix dockerFile and sh's	2023-06-09 14:38:44 +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
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
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
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
Alex Moreno	5ba8a15316	refs #5809 deploy 232401 dev in test	2023-06-08 10:25:25 +02:00
Vicent Llopis	a88166cdb5	Merge branch 'dev' into 5252-canRefund_withOutWarehouse2	2023-06-08 05:15:24 +00:00
Juan Ferrer	980ea67c24	Merge pull request 'test' (!1596) from test into dev ... Reviewed-on: #1596	2023-06-07 21:02:22 +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	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	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	bfd421c188	Merge branch 'dev' into 5137-aviso-impresora	2023-06-07 06:30:43 +00:00
Alex Moreno	ac0e7ae32b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-07 07:08:02 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Vicent Llopis	b144948dcf	conflictos resueltos	2023-06-06 12:31:44 +02:00
Vicent Llopis	98af8ee10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-06-06 12:31:20 +02:00
Carlos Satorres	6f3704c365	hotfix colors ticket advance ticket future	2023-06-06 11:42:35 +02:00
Alex Moreno	5d6eaca6b8	refs #5472 test(changePassword): e2e	2023-06-05 15:20:07 +02:00
Alexandre Riera	9c9a2d4fe2	Merge branch 'dev' into 5513-backs-embalajes	2023-06-05 12:25:50 +00:00
Alexandre Riera	15b5f10a93	refs #5513 addFromBuy back added	2023-06-05 09:10:19 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alex Moreno	d02ee2fd12	deploy(232201)	2023-06-01 07:16:06 +02:00
Alex Moreno	4f3b6c3035	typo	2023-05-31 15:00:33 +02:00
Alex Moreno	0263d76021	refs #5701 update to mariadb 10.7.7	2023-05-31 14:58:16 +02:00
Vicent Llopis	46b6625527	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token	2023-05-30 12:06:31 +02:00
Alexandre Riera	30816f7947	Merge branch 'dev' into 5513-backs-embalajes	2023-05-30 09:51:42 +00:00
Alexandre Riera	ba850415be	refs #5137 moved sql	2023-05-29 12:56:54 +02:00
Alexandre Riera	1bb5033729	Merge branch 'dev' into 5137-aviso-impresora	2023-05-29 10:56:21 +00:00
Alex Moreno	f37d93b469	refs #5488 correct folder	2023-05-26 14:04:00 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Alex Moreno	375fdf2a21	fix item_getBalance	2023-05-25 14:31:28 +02:00
Vicent Llopis	ce211b436d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5252-canRefund_withOutWarehouse2	2023-05-25 13:00:11 +02:00
Vicent Llopis	886c4a15b5	refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía	2023-05-25 10:19:00 +02:00
Alex Moreno	256f30987f	refs #5730 new version 232401	2023-05-25 09:46:39 +02:00
Alex Moreno	33928aa406	refs #5730 correct folder	2023-05-25 09:29:46 +02:00