17750 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	7b8518ff5a	Merge branch 'dev' into 6033-vnLog_userDescriptor	2023-10-02 05:04:26 +00:00
Jorge Penadés	6f4a12e50f	ref #5417 date filters added	2023-09-29 14:42:47 +02:00
Jorge Penadés	d112fd0e5b	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 12:35:22 +00:00
Carlos Andrés	c469a221c7	refs #6254	2023-09-29 14:16:35 +02:00
Carlos Andrés	0e5a7bbb85	refs #6254	2023-09-29 14:11:11 +02:00
Carlos Andrés	17e6cffa3d	refs #6254 collection getTickets	2023-09-29 13:47:29 +02:00
Carlos Andrés	41ac907b05	refs #6254-collection_getTickets	2023-09-29 13:44:41 +02:00
Jorge Penadés	b4fdde29b7	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 11:04:08 +00:00
Alex Moreno	5797398cf2	refs #5890 correct version 234201 in dev	2023-09-29 12:41:23 +02:00
Alex Moreno	660a0381c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-29 12:40:30 +02:00
Alex Moreno	1d440d5c02	refs #5890 correct version 234002	2023-09-29 12:40:11 +02:00
Alex Moreno	10de00ea45	refs #5890 deploy: test to dev	2023-09-29 12:37:53 +02:00
Alex Moreno	6e06d21f9e	refs #5890 deploy: merge dev in test 234002	2023-09-29 12:36:36 +02:00
Carlos Andrés	2820b0253f	Merge branch 'test' into 6254-collection_getTickets	2023-09-29 10:31:14 +00:00
Jorge Penadés	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +00:00
Carlos Andrés	9a7cb3ef7b	refs #6254 collection_getTickets	2023-09-29 12:30:05 +02:00
Alex Moreno	3966f6a53a	Merge pull request 'refs #5890 feat: itemShelvingSaleAsignado' (!1767) from 5890--itemShelvingAsignado into dev ... Reviewed-on: #1767 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-29 10:28:19 +00:00
Alex Moreno	a0d705683b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-29 12:22:42 +02:00
Alex Moreno	53ab694ad4	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-29 10:18:34 +00:00
Alex Moreno	b33700abc9	refs #6216 feat(ticket_sale): open filtered ticketLog	2023-09-29 11:57:25 +02:00
Jorge Penadés	6691cbf32f	ref #5914 changes moved	2023-09-29 11:24:24 +02:00
Carlos Andrés	934b4c4b36	refs #5890	2023-09-29 10:53:06 +02:00
Jorge Penadés	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Alex Moreno	a0a59b672f	refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail	2023-09-29 10:04:57 +02:00
Pablo Natek	0fa56149d7	refs #6266 smsfix	2023-09-29 09:47:22 +02:00
Alex Moreno	542119983b	refs #5929 test: fix test after fix ticket_isEditable	2023-09-29 09:28:23 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Jorge Penadés	50eab23f39	Merge branch '6065-fixWorkerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:30 +02:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Jorge Penadés	5f4a07bb33	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 06:20:03 +00:00
Jorge Penadés	2506db69cb	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-29 08:20:00 +02:00
Jorge Penadés	19fc2a4523	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-29 06:18:20 +00:00
Jorge Penadés	d4e78ea889	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-29 08:16:12 +02:00
Alex Moreno	37227e79c8	Merge pull request 'refs #5673 feat(claim_development): redirect to lilium' (!1723) from 5673-claim-development into dev ... Reviewed-on: #1723 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-29 06:12:03 +00:00
Alex Moreno	f3c55cdee9	refs #5929 fix(isEditable): can edit if is weekly	2023-09-28 16:00:09 +02:00
Carlos Andrés	375429b147	Merge branch '5890--itemShelvingAsignado' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 15:14:43 +02:00
Carlos Andrés	b4c67c088c	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 13:14:13 +00:00
Carlos Andrés	52cba80dc8	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 15:13:37 +02:00
Alex Moreno	1d4001f520	Merge branch 'dev' into 5673-claim-development	2023-09-28 12:04:11 +00:00
Alex Moreno	204770c2de	refs #6224 deploy: init version 234201	2023-09-28 13:53:46 +02:00
Alex Moreno	28dfb895ca	refs #6224 deploy: correct sql folder and fix sql	2023-09-28 13:49:58 +02:00
Jorge Penadés	4b213c1c9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-28 13:31:45 +02:00
Alex Moreno	e51df063d3	refs #5890 feat: add userId in rawSql	2023-09-28 13:26:05 +02:00
Alex Moreno	75e54bd82f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 13:21:12 +02:00
Alex Moreno	2f22c2807a	Merge pull request '5134-ModelsSalix' (!1768) from 5134-ModelsSalix into dev ... Reviewed-on: #1768 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-28 11:20:20 +00:00
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +02:00
Alex Moreno	d4e5815d41	refs #6254 feat(collection_getTickets): refactor code and add test	2023-09-28 08:30:50 +02:00
Jorge Penadés	463fc8ae95	ref #5914 added fixtures in English	2023-09-28 08:20:59 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00