4190 Commits

Author	SHA1	Message	Date
Ivan Mas	b75af7b192	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-09 11:22:32 +00:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Alex Moreno	c69a4e1c98	Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ... Reviewed-on: #2269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-09 08:21:20 +00:00
Guillermo Bonet	f8be6be7a3	feat: refs #6636 Minor change	2024-04-09 10:10:11 +02:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Pablo Natek	1c064c7bfc	Merge branch 'dev' into 6021-floranet_RedMoon	2024-04-09 05:23:34 +00:00
Alex Moreno	0ecc09fcc4	Merge branch 'dev' into 6551-workerDms_refactor	2024-04-08 12:50:05 +00:00
Alex Moreno	9134216332	refactor(workerDms): adapat to lilium	2024-04-08 14:46:35 +02:00
Pako Natek	2eb229adf7	catalogue fixed	2024-04-08 14:30:46 +02:00
Juan Ferrer	75bed03ab7	Merge pull request 'test' (!2266) from test into dev ... Reviewed-on: #2266	2024-04-08 11:09:05 +00:00
Juan Ferrer	ccc644c298	fix: refs #6021 dump, floranet schema added	2024-04-08 13:07:04 +02:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Guillermo Bonet	e27279e20e	Merge branch 'dev' into 6636-pickup	2024-04-08 05:18:36 +00:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00:00
Carlos Andrés	cedfdbb421	fix: closeTicket idem salix Refs: #6549	2024-04-05 13:22:54 +02:00
Robert Ferrús	cf5113c5a6	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-05 10:23:55 +00:00
Guillermo Bonet	6c1e44638e	feat: refs #6636 Added getEnumValue method	2024-04-05 11:01:00 +02:00
Alex Moreno	0af3713a07	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-05 10:33:47 +02:00
Alex Moreno	2f4cd2bc7b	refs #7167 fix: acl mailAlias	2024-04-05 10:05:51 +02:00
Alex Moreno	ed95545de6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump	2024-04-05 10:00:34 +02:00
Javier Casado	6f2b3ea059	Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev ... Reviewed-on: #2255 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-05 07:55:46 +00:00
Guillermo Bonet	0cd4013f5e	Merge branch 'test' into dev	2024-04-05 07:51:19 +02:00
Guillermo Bonet	7ea917dc4d	hotfix: #6875 packing DEFAULT 1	2024-04-05 07:49:37 +02:00
Guillermo Bonet	ac658fb6af	Merge branch 'dev' into 6636-pickup	2024-04-05 05:29:26 +00:00
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +02:00
Sergio De la torre	2ed5237568	Merge branch 'dev' into 6964_itemOlder	2024-04-04 13:45:20 +00:00
Alex Moreno	a6e4bdd7ac	refs #7167 deploy: dump	2024-04-04 15:02:41 +02:00
Guillermo Bonet	fcb4fe92e8	Merge branch 'dev' into 6636-pickup	2024-04-04 12:14:23 +00:00
Guillermo Bonet	f44e19cae3	feat: refs #6636 Modified updateClaim, model and tests	2024-04-04 14:15:20 +02:00
jcasado	f9ef45f1d9	refs #6324 remove doc	2024-04-04 14:01:30 +02:00
jcasado	f5943e4445	refs #6324 remove column and dependencies	2024-04-04 13:57:23 +02:00
Robert Ferrús	9801279370	refs #169673 item_getSimilar	2024-04-04 13:28:29 +02:00
Guillermo Bonet	29eee4e8a7	Merge branch 'test' into dev	2024-04-04 11:30:03 +02:00
Guillermo Bonet	8702a6808c	hotfix: #7024 Modified duaInvoiceInBooking	2024-04-04 11:25:03 +02:00
Alex Moreno	ff2e00c51c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-03 16:24:45 +02:00
Guillermo Bonet	064d6dbb64	feat: refs #6829 Added two indexes	2024-04-03 11:57:28 +02:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable	2024-04-03 10:03:59 +02:00
Robert Ferrús	448b8e6ea3	Merge branch 'dev' into 6738-cleanTables2008Part2to2	2024-04-03 07:50:06 +00:00
Javi Gallego	d71f3e0818	test	2024-04-03 09:02:34 +02:00
Javi Gallego	52457b9642	feat: sin concatenar en el nombre	2024-04-03 07:09:07 +02:00
Pako Natek	cb745b0f4d	release_lock	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3a1f5109d9	lines and volume	2024-04-01 11:58:16 +02:00
Pako Natek	7c4fc31b50	version productionConfig	2024-04-01 08:55:21 +02:00
Pako Natek	df911b9b75	fora comentaris	2024-04-01 08:47:47 +02:00
Pako Natek	547df47049	delete old proc	2024-04-01 08:47:16 +02:00
Pako Natek	98b1e933f7	prova	2024-04-01 08:46:07 +02:00
Pako Natek	9aae9677e6	modificaciones	2024-04-01 08:43:26 +02:00