17477 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
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
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
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
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	65b0ec387f	refs #5890 fix: format	2023-09-28 08:09:54 +02:00
Sergio De la torre	4048627c76	refs #5890 fix: format	2023-09-28 08:08:40 +02:00
Sergio De la torre	18de92f9e7	refs #5134 fix: format	2023-09-28 07:51:54 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Alex Moreno	1307d4727c	refs #6254 feat(collection): add getTickets	2023-09-27 15:08:36 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +02:00
Alex Moreno	d313f6ea5c	Merge branch 'dev' into 5673-claim-development	2023-09-26 12:59:32 +00:00
Sergio De la torre	2ea2943eca	refs #5134 feat: models	2023-09-26 13:12:18 +02:00
Jorge Penadés	7876561188	Merge pull request 'ref #6246 check sales and update test' (!1763) from 6246-checkTicketSales into dev ... Reviewed-on: #1763 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-26 06:25:21 +00:00
Alex Moreno	3ffc4e39f1	refs #6033 add changeLog	2023-09-26 08:19:17 +02:00
Alex Moreno	e36f98195c	refs #6033 feat: create user-photo component for worker and user descriptor	2023-09-26 08:15:19 +02:00
Jorge Penadés	db8dc8487b	ref #6246 replace name	2023-09-25 15:28:08 +02:00
Alex Moreno	7a3d3d5e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-09-25 14:14:23 +02:00
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	5a3094cd70	refs #6033 feat(VnLog): better if	2023-09-25 13:24:30 +02:00
Alex Moreno	eb0e6dd985	refs #6033 feat(VnLog): can use accountDescriptor	2023-09-25 13:06:28 +02:00
Alex Moreno	d05106cc83	Merge branch 'dev' into 5673-claim-development	2023-09-25 10:10:21 +00:00
Pablo Natek	2b08a0107c	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-25 06:25:11 +00:00