2524 Commits

Author	SHA1	Message	Date
Vicent Llopis	854e07cfae	refs #4770 move sql changes	2023-07-04 13:33:44 +02:00
Vicent Llopis	d44418ecea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap	2023-07-04 13:33:25 +02:00
Alex Moreno	7fe8698b6f	refs #5753 fix ticketToInvoice	2023-07-03 10:04:03 +02:00
Alex Moreno	d1fb2859be	Merge branch 'dev' into 5753_232401_db_dump	2023-07-03 06:59:42 +00:00
Alex Moreno	f636c3b1ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-30 11:57:56 +02:00
Alex Moreno	6fcbf69f60	refs #5753 isNotEditableCredit to zeroCreditEditor	2023-06-30 08:26:51 +02:00
Alex Moreno	ff320895a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump	2023-06-30 08:23:00 +02:00
Alex Moreno	273c06a210	refs #5833 deploy: test to master 232601	2023-06-29 12:54:56 +02:00
Vicent Llopis	3bd890c343	refs #5554 fix: solo llama al back cuando se tiene q renovar	2023-06-29 12:11:16 +02:00
Carlos Andrés	1d993c74e5	refs #5590 fix total invoiceOut	2023-06-29 10:39:07 +02:00
Vicent Llopis	e3e0c7e97a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa	2023-06-28 14:31:54 +02:00
Alex Moreno	8723cf2958	refs #5753 fix legacy bugs	2023-06-28 14:10:21 +02:00
Alex Moreno	e43e52b561	refs #5753 db export and fix fixtures	2023-06-26 15:21:45 +02:00
Alex Moreno	224a44847d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-26 11:56:07 +02:00
Alex Moreno	ecf742959c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-06-26 11:55:28 +02:00
Alex Moreno	ef8e1c4169	refs #5531 refs #5753 fix travelConfig sql	2023-06-26 10:57:12 +02:00
Juan Ferrer	2fec5bf2aa	Merge pull request 'refs #5772 test into dev' (!1633) from test into dev ... Reviewed-on: #1633	2023-06-23 09:51:44 +00:00
Juan Ferrer	47a4a9950f	refs #5772 Parallelism added to PDF generation	2023-06-23 11:42:30 +02:00
Alex Moreno	344ba298f8	refs #5832 232801 init	2023-06-22 14:27:33 +02:00
Vicent Llopis	d9afdccd9c	fix: acl renewToken	2023-06-21 14:12:42 +02:00
Vicent Llopis	f37974c835	Merge branch 'dev' into 5468-account_privileges	2023-06-20 12:39:27 +00:00
Vicent Llopis	556bdb52ce	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:18:46 +00:00
Vicent Llopis	f6cb1cb130	Merge branch 'dev' into 5554-renovar_token	2023-06-20 12:07:52 +00:00
Robert Ferrús	503054fe05	refs #5112 modificaciones entry_updateComission	2023-06-20 08:58:22 +02:00
Alexandre Riera	73133778fc	Merge branch 'dev' into 5513-back-embalaje	2023-06-16 05:07:16 +00:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Sergio De la torre	1f454e6219	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje	2023-06-15 07:22:10 +02:00
Sergio De la torre	927c0fddc6	refs #5651	2023-06-14 13:15:37 +02:00
Sergio De la torre	c62e6fa0eb	refs #5651 packingSiteAdvanced	2023-06-14 10:51:22 +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
Alex Moreno	d8b041c734	refs #5472 correcto version folder	2023-06-12 22:04:02 +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
Alexandre Riera	703c224e91	refs #5513 modified-entry email	2023-06-12 10:26:50 +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
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
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