17337 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	f4ce5db93b	Merge branch 'dev' into 6246-checkTicketSales	2023-09-25 11:49:18 +00:00
Javi Gallego	2607c1d215	Merge pull request '4059-revocar-permisos-client-account' (!1760) from 4059-revocar-permisos-client-account into dev ... Reviewed-on: #1760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-25 11:29:58 +00:00
Alex Moreno	d05106cc83	Merge branch 'dev' into 5673-claim-development	2023-09-25 10:10:21 +00:00
Alex Moreno	d43b70c971	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-22 14:30:28 +02:00
Alex Moreno	cf36b10763	refs #4815 feat: add serialNumber in deviceLog	2023-09-22 14:29:48 +02:00
Carlos Satorres	da9fe5c86e	Merge pull request '5843-quitUserFk2' (!1758) from 5843-quitUserFk2 into dev ... Reviewed-on: #1758 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-22 11:18:15 +00:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00:00
Jorge Penadés	6fe52ba3e8	ref #6246 check sales and update test	2023-09-22 12:48:54 +02:00
Sergio De la torre	ed1d8ca94f	refs #5134 feat: models	2023-09-22 12:29:56 +02:00
Pablo Natek	13febd30f5	Merge pull request 'refs #6159 fixBusinessAfterInsert' (!1719) from 6159-businessAfterInsert into dev ... Reviewed-on: #1719 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-22 09:18:03 +00:00
Carlos Satorres	c7f84ad6db	refs #5843 add return	2023-09-22 10:36:51 +02:00
Pablo Natek	c175bcfc97	refs #6159 rename spec	2023-09-22 09:40:37 +02:00
Pablo Natek	3013e3cd9c	refs #6159 removeSpaces	2023-09-22 09:14:59 +02:00
Pablo Natek	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Pablo Natek	850df64348	refs #6159 moveChangefile	2023-09-21 14:59:26 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Javi Gallego	4761b0f784	fixes #4059 añado comillas	2023-09-21 10:41:20 +02:00
Pablo Natek	e037b0074e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6159-businessAfterInsert	2023-09-21 09:24:18 +02:00
Pablo Natek	acd4f398c7	refs #6159 procBasedUpdate	2023-09-21 08:44:52 +02:00
Alex Moreno	b615062c09	refs #6225 add more info in changelog	2023-09-21 08:40:17 +02:00
Javi Gallego	4e6808ec4a	fixes #4059 muevo archivos a changes actual	2023-09-21 08:24:57 +02:00
Javi Gallego	7ec47f0cc3	Merge branch 'dev' into 4059-revocar-permisos-client-account	2023-09-21 07:34:12 +02:00
Carlos Satorres	cd20a2d06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-21 07:32:19 +02:00
Carlos Satorres	5e46e8a748	Merge pull request '5660-changeRolDeliveryAssistant' (!1607) from 5660-changeRolDeliveryAssistant into dev ... Reviewed-on: #1607 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-20 11:04:30 +00:00
Carlos Satorres	f60b6b84fe	refs #5843 fix back	2023-09-20 11:58:36 +02:00
Carlos Satorres	f92acdfe6f	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-20 09:52:32 +00:00
Javi Gallego	72a8256aee	Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev ... Reviewed-on: #1756 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-20 06:27:21 +00:00
Javi Gallego	29a186fa18	Merge branch 'dev' into 6241--arreglar--dbTest	2023-09-20 08:18:46 +02:00
Guillermo Bonet	e2229b6762	Merge branch 'test' into dev	2023-09-20 08:18:24 +02:00
Guillermo Bonet	4ccb09d057	Merge branch 'master' into test	2023-09-20 08:18:03 +02:00
Javi Gallego	45cf1b1ff3	fixes #6241 dbTest fixed	2023-09-20 08:12:07 +02:00
Guillermo Bonet	bf2528bacf	Merge pull request 'refs #5995 Implemented downloadCmrsZip' (!1734) from 5995-getExternalCmrRouteFk into master ... Reviewed-on: #1734 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-20 06:08:19 +00:00
Guillermo Bonet	d1e5b8e699	Merge pull request '6210-filterClient' (!1755) from 6210-filterClient into dev ... Reviewed-on: #1755 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-20 05:07:21 +00:00
Guillermo Bonet	56c1dbc096	Merge branch 'master' into 5995-getExternalCmrRouteFk	2023-09-19 12:42:46 +00:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Guillermo Bonet	2686fd0601	refs #6210 Minor change	2023-09-19 12:18:46 +02:00
Guillermo Bonet	77b55e5b09	refs #6210 Minor change	2023-09-19 12:15:23 +02:00
Guillermo Bonet	661563a2b6	refs #6210 Refactor filter client (zoneFk)	2023-09-19 12:14:55 +02:00
Carlos Satorres	9524ff6932	refs #5660 fix sql	2023-09-19 11:02:12 +02:00
Alex Moreno	32d5c80e92	Merge branch '5673-claim-development' of https://gitea.verdnatura.es/verdnatura/salix into 5673-claim-development	2023-09-18 13:49:47 +02:00
Alex Moreno	3d1ee374c2	refs #5673 feat: remove claim_development e2e	2023-09-18 13:49:45 +02:00
Alex Moreno	656492b9a6	Merge branch 'dev' into 5673-claim-development	2023-09-18 10:40:26 +00:00
Carlos Satorres	b6e0b6ac8a	Merge branch '5660-changeRolDeliveryAssistant' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 12:24:29 +02:00
Carlos Satorres	63068ddfb8	refs #5660 call and insert	2023-09-18 12:24:26 +02:00
Carlos Satorres	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Alex Moreno	6a33a15765	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-18 08:11:34 +00:00
Guillermo Bonet	6c34421413	refs #5995 Requested changes	2023-09-18 10:03:31 +02:00
Guillermo Bonet	a6b730ecc2	Merge branch 'test' into dev	2023-09-18 09:54:33 +02:00
Guillermo Bonet	4c5b97d448	Merge branch 'master' into test	2023-09-18 09:54:04 +02:00
Guillermo Bonet	73b79ed7b2	Merge pull request 'refs #5684 Fixed no error' (!1751) from 5684-updateDataHandledError into master ... Reviewed-on: #1751 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-18 07:50:01 +00:00