7646 Commits

Author	SHA1	Message	Date
Jorge Penadés	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +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
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	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Alex Moreno	f3c55cdee9	refs #5929 fix(isEditable): can edit if is weekly	2023-09-28 16:00:09 +02: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	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
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
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +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
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
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
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	af8773612c	refs #6213 remove f	2023-09-25 08:23:59 +02:00
Pablo Natek	fc4019ad69	Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors	2023-09-25 08:23:25 +02:00
Pablo Natek	9b10a2904c	refs #6213 unifyTest	2023-09-25 08:23:23 +02: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
Pablo Natek	ed157d1fd1	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-22 11:11:25 +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
Carlos Satorres	5b22314b07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-09-22 12:17:23 +02: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	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Carlos Satorres	c7e26f9155	refs #5768 autocomplete	2023-09-22 06:08:07 +02:00
Carlos Satorres	7b246b1bac	refs #5768 trad choose address	2023-09-21 13:15:00 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +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
Pablo Natek	324b3ed8ee	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-21 05:21:06 +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	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
Pablo Natek	971d77a198	refs #6213 specChangeId	2023-09-19 07:46:44 +02:00
Pablo Natek	361c2b4cad	refs #6213 fixSpec	2023-09-19 07:33:28 +02:00
Alex Moreno	656492b9a6	Merge branch 'dev' into 5673-claim-development	2023-09-18 10:40:26 +00: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
Pablo Natek	c1da4815cb	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-18 08:12:08 +00:00
Pablo Natek	cdf0951a1b	refs #6213 newSuplierSpec	2023-09-18 10:12:32 +02:00
Guillermo Bonet	6c34421413	refs #5995 Requested changes	2023-09-18 10:03:31 +02:00
Jorge Penadés	32a0aedf11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-18 08:07:27 +02:00
Pablo Natek	55b53c86c4	refs #6213 formatfix	2023-09-18 07:38:31 +02:00
Sergio De la torre	881a1ee0b8	refs #5652 modify: solved Tests	2023-09-15 11:24:17 +02:00
Sergio De la torre	0403c67bad	Merge branch 'dev' into 5652-ItemTrash	2023-09-15 05:47:00 +00:00
Carlos Satorres	2a1e828e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-15 07:30:46 +02:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Pablo Natek	cf138a0814	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-14 13:15:52 +00:00
Pablo Natek	a44e5206a7	refs #6213 fixConcatBug	2023-09-14 14:18:00 +02:00
Javi Gallego	eff0975eb2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-14 10:27:03 +02:00
Javi Gallego	82631d6fcd	claimingRate divide por 100	2023-09-14 10:26:59 +02:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Pablo Natek	7ab8cb37cd	ref #6213 fixformat	2023-09-13 19:22:21 +02:00
Pablo Natek	72026332ba	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-13 13:07:38 +00:00
Carlos Satorres	12dff3e248	Merge branch 'dev' into 4764-serviceAbono	2023-09-13 08:52:59 +00:00
Javi Gallego	7bd3bfddc3	fix sin bankEntity ya no falla	2023-09-13 07:07:22 +02:00
Sergio De la torre	1d25355423	refs #5652 fix:without fit	2023-09-12 08:44:42 +02:00
Pablo Natek	6a753d26af	refs #6213 default account value	2023-09-11 18:28:47 +02:00
Sergio De la torre	5f5a0645be	refs #5652 feat:itemTrash_new	2023-09-11 16:16:49 +02:00
Pablo Natek	cbaf6001a8	refs #6213 remove console log	2023-09-11 12:36:42 +02:00
Pablo Natek	ccfd8fad05	refs #6213 fixCreateError	2023-09-11 12:32:46 +02:00
Carlos Satorres	a29b25cffd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-11 10:48:38 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +02:00
Javi Gallego	08e97b6a19	Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev ... Reviewed-on: #1728 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-11 07:00:20 +00:00
Jorge Penadés	48a6bf2969	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-08 08:05:17 +02:00
Carlos Satorres	c2f73eb548	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-07 13:38:38 +02:00
Carlos Andrés	4784e71350	refs #6176 book entry deleted	2023-09-07 13:21:03 +02:00
Jorge Penadés	427425a750	ref #6119 simplifiy component	2023-09-07 09:50:13 +02:00
Carlos Andrés	0465c2ca54	Merge branch 'dev' into 6176-book-entry-deleted	2023-09-06 19:27:02 +00:00
Carlos Andrés	0d2db7749f	refs #6176 book entry deleted	2023-09-06 21:22:10 +02:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Sergio De la torre	8218eb2a6b	refs #5652 feat:itemTrash_new	2023-09-06 09:37:41 +02:00