26890 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	76751ad584	fix: refs #8244 refs #7759 Requested changes	2025-02-21 12:11:42 +01:00
Guillermo Bonet	ea5b78394d	fix: refs #8244 refs #7759 Requested changes	2025-02-21 12:08:34 +01:00
Guillermo Bonet	529ddc5098	Merge branch 'dev' into 8244-floricode	2025-02-21 11:15:35 +01:00
Guillermo Bonet	2059b8eaa6	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:48:05 +01:00
Guillermo Bonet	c80e6f3240	fix: refs #7759 mockDate and increased myt version	2025-02-21 10:38:28 +01:00
Juan Ferrer	c74714a825	ci(db): refs #6695 Allow 0.0.0.0	2025-02-20 17:20:04 +00:00
Guillermo Bonet	2eafebbc53	Merge branch 'dev' into 8244-floricode	2025-02-20 12:51:24 +00:00
Guillermo Bonet	009eae44ef	refactor: refs #7759 Update SQL permissions for 'vn' user to include DROP and clarify comments	2025-02-20 08:57:00 +01:00
Guillermo Bonet	59f243136d	refactor: refs #7759 deprecate unused columns and tables in user and vn schemas	2025-02-20 08:48:49 +01:00
Guillermo Bonet	bf83c9b460	Merge branch 'test' into dev	2025-02-20 07:49:51 +01:00
Guillermo Bonet	c254f31da2	Merge branch 'master' into test	2025-02-20 07:49:39 +01:00
Guillermo Bonet	f414ababb2	fix: refs #8227 Added localPalletM3	2025-02-20 07:29:38 +01:00
Carlos Satorres	1bf8acafa0	Merge pull request 'fix: fix operator' (!3460) from fix-workerSection2 into dev ... Reviewed-on: #3460 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-19 15:27:28 +00:00
Carlos Satorres	4c0169aba3	Merge branch 'dev' into fix-workerSection2	2025-02-19 15:19:56 +00:00
Guillermo Bonet	0019c37f83	feat: refs #8244 Requested changes	2025-02-19 13:45:06 +01:00
Guillermo Bonet	720aff8c02	Merge branch 'dev' into 8244-floricode	2025-02-19 11:36:37 +00:00
Guillermo Bonet	2b248e3f6c	feat: refs #8244 Requested changes	2025-02-19 12:36:12 +01:00
Ivan Mas	b42f5885bf	Merge pull request 'feat: refs #8558 modify claim_beforeInsert' (!3463) from 8558-futureTicketsClaims into dev ... Reviewed-on: #3463 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-19 11:31:53 +00:00
Ivan Mas	c61ea07b6a	Merge branch 'dev' into 8558-futureTicketsClaims	2025-02-19 11:30:08 +00:00
Guillermo Bonet	8185343d12	feat: refs #8244 Added tests	2025-02-19 09:51:04 +01:00
Carlos Andrés	b8a216444c	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-02-18 13:11:27 +00:00
Guillermo Bonet	411868209e	Merge branch 'dev' into 8244-floricode	2025-02-18 12:58:10 +00:00
Guillermo Bonet	cba381ce2f	feat: refs #8244 Refactor	2025-02-18 13:52:27 +01:00
Alex Moreno	728e6e921a	build: init version	2025-02-18 13:38:46 +01:00
Alex Moreno	f316349ac2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 13:38:21 +01:00
Alex Moreno	7ec29d1972	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 13:38:10 +01:00
Alex Moreno	40492d6489	Merge pull request '8627-devToTest' (!3474) from 8627-devToTest into test ... Reviewed-on: #3474 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 12:33:29 +00:00
Guillermo Bonet	96cba1f24f	feat: refs #8244 Last changes	2025-02-18 13:21:29 +01:00
Guillermo Bonet	a8469b403c	Merge branch 'dev' into 8244-floricode	2025-02-18 12:11:35 +00:00
Guillermo Bonet	bf1770dcc5	feat: refs #8244 Floricode api	2025-02-18 13:05:57 +01:00
Jon Elias	0f0504e590	Merge pull request '#8555: Added new filter field' (!3434) from 8555-AddNewField into dev ... Reviewed-on: #3434 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 11:46:12 +00:00
Jon Elias	6118154ef9	Merge branch 'dev' into 8555-AddNewField	2025-02-18 11:44:01 +00:00
Jon Elias	5a1c826f15	Merge pull request '#8606: Show correct text of duplicate entry error' (!3461) from 8606-FixZoneModule into dev ... Reviewed-on: #3461 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-18 11:29:46 +00:00
Jon Elias	16bb716abd	Merge branch 'dev' into 8606-FixZoneModule	2025-02-18 10:36:49 +00:00
Alex Moreno	dc989cb075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8627-devToTest	2025-02-18 10:35:00 +01:00
Jorge Penadés	e29e5e28ed	Merge pull request 'fix: refs #8388 update booking status in toUnbook method' (!3462) from 8388-fixUnbook into dev ... Reviewed-on: #3462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 09:31:22 +00:00
Alex Moreno	2386874a96	fix: refs #8627 add claim in getSales	2025-02-18 10:28:00 +01:00
Alex Moreno	06c123d7f2	fix: refs #8627 ticket isTaxDataChecked	2025-02-18 10:15:28 +01:00
Alex Moreno	a8c03548d9	fix: refs #8627 update stateFk assignment to use code instead of id	2025-02-18 09:51:08 +01:00
Carlos Andrés	5488a229c1	Merge pull request 'fix: priceOptimum error' (!3471) from PriceOptimum-error into master ... Reviewed-on: #3471 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-18 08:50:27 +00:00
Alex Moreno	664ba03425	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 09:26:30 +01:00
Alex Moreno	dd8ca1eed2	Merge pull request 'build: refs #8622 dump db' (!3473) from 8622-dump into master ... Reviewed-on: #3473 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-02-18 08:26:18 +00:00
Alex Moreno	08b4d0a4fa	build: refs #8622 dump db	2025-02-18 09:16:31 +01:00
Alex Moreno	f83055057e	fix: expeditionTruck use editorFk	2025-02-18 09:14:08 +01:00
Alex Moreno	ca8bc43262	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:53:24 +01:00
Alex Moreno	61df9a0f79	Merge pull request '8622-testToMaster' (!3470) from 8622-testToMaster into master ... Reviewed-on: #3470 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-18 07:52:22 +00:00
Alex Moreno	669b7cd67f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-18 08:45:19 +01:00
Alex Moreno	6e4667a563	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-18 08:45:11 +01:00
Alex Moreno	7d08c1796a	fix: update ticket_setState procedure to include created timestamp in ticketTracking insert	2025-02-18 08:44:07 +01:00
Juan Ferrer	5a5da0a863	fix: refs #6695 Code refactor	2025-02-17 19:46:14 +01:00