22694 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	afbce80303	hotFix solve isPicked refs #6861	2024-07-22 13:42:42 +02:00
Guillermo Bonet	32e88532f9	fix: refs #7752 fix table name (change pablo)	2024-07-22 10:07:21 +02:00
Guillermo Bonet	a0abc29167	Revert "Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master" ... This reverts commit d41262798c, reversing changes made to 3d20908a42.	2024-07-22 10:04:03 +02:00
Pablo Natek	d41262798c	Merge pull request 'fix: refs #7752 fix table name' (!2767) from 7752-fixproc into master ... Reviewed-on: #2767 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-22 07:52:29 +00:00
Pablo Natek	7b44e9f866	fix: refs #7752 fix format	2024-07-22 09:49:54 +02:00
Pablo Natek	2ba4ca088d	fix: refs #7752 fix table name	2024-07-22 09:46:20 +02:00
Javier Segarra	3d20908a42	Merge pull request '7648_myEntries' (!2744) from 7648_myEntries into master ... Reviewed-on: #2744 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 10:27:39 +00:00
Javier Segarra	2a044dd90b	Merge branch 'master' into 7648_myEntries	2024-07-19 09:59:35 +00:00
Javier Segarra	287f9edc83	fix(salix): refs #7648 #7648 improve update ACL	2024-07-19 11:54:21 +02:00
Carlos Andrés	d4bbd3530c	Merge pull request 'fix: refs#7748 solicitud de domiciliación bancaria' (!2752) from 7748-Modificar-solicitud-de-domiciliación-bancaria into master ... Reviewed-on: #2752 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 09:43:15 +00:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Carlos Andrés	2b85e44fd5	Merge branch '7748-Modificar-solicitud-de-domiciliación-bancaria' of https://gitea.verdnatura.es/verdnatura/salix into 7748-Modificar-solicitud-de-domiciliación-bancaria	2024-07-19 11:27:16 +02:00
Carlos Andrés	64b127d73c	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-19 11:27:14 +02:00
Pablo Natek	d0a635e86a	Merge pull request 'fix: refs #7752 add new state after scan' (!2760) from 7752-insertExpeditionState into master ... Reviewed-on: #2760 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 08:35:39 +00:00
Alex Moreno	ed1b0ff53d	Merge branch 'master' into 7748-Modificar-solicitud-de-domiciliación-bancaria	2024-07-19 05:05:15 +00:00
Carlos Andrés	9d17a9e827	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-18 19:48:35 +02:00
Carlos Andrés	9003f2db91	fix: refs #7748 solicitud de domiciliación bancaria	2024-07-18 19:37:03 +02:00
Sergio De la torre	117da914f7	Merge pull request 'hotFix reservas refs #6861' (!2759) from 6861_hotFix_resevas into master ... Reviewed-on: #2759 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-18 15:22:22 +00:00
Sergio De la torre	2d2eafd4ed	Merge branch 'master' into 6861_hotFix_resevas	2024-07-18 15:17:26 +00:00
Carlos Andrés	29e7d97878	fix: refs#7748 solicitud de domiciliación bancaria	2024-07-18 16:58:20 +02:00
Pablo Natek	3b529440ba	fix: refs #7752 refactor insert	2024-07-18 15:16:25 +02:00
Pablo Natek	684983ee42	fix: refs #7752 add new state after scan	2024-07-18 15:14:18 +02:00
Guillermo Bonet	ba5c44994d	feat: refs #7686 Added cascade on update vn.state.alertLevel	2024-07-18 13:45:06 +02:00
Sergio De la torre	bd10741311	hotFix reservas refs #6861	2024-07-18 12:42:00 +02:00
Pablo Natek	1bb20b1bc3	Merge pull request 'feat: refs #6403 add address mobile' (!2756) from 6403-addAddressMobile into master ... Reviewed-on: #2756 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-18 08:17:06 +00:00
Pablo Natek	409daaf584	feat: refs #6403 add address mobile	2024-07-18 10:13:21 +02:00
Alex Moreno	9d4e976e5a	Merge pull request 'fix: refs #7039 country order' (!2755) from 7039-hotFixOrderCountry into master ... Reviewed-on: #2755 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-18 07:30:58 +00:00
Robert Ferrús	e96fa75356	fix: refs #7039 country order	2024-07-18 09:22:27 +02:00
Carlos Andrés	b6761d3dc0	fix: refs#7748 solicitud de domiciliación bancaria	2024-07-17 19:08:01 +02:00
Carlos Andrés	87f9c93ca7	Merge pull request 'Hotfix itemShelvingSale_doReserve Ticket #204044' (!2751) from Hotfix--itemShelvingSale_doReserve into master ... Reviewed-on: #2751 Reviewed-by: Ivan Mas <ivanm@verdnatura.es>	2024-07-17 16:28:14 +00:00
Carlos Andrés	f7429f3927	Hotfix itemShelvingSale_doReserve Ticket #204044	2024-07-17 18:24:27 +02:00
Sergio De la torre	15c5fefc92	Merge pull request '6861_reservas_hotFix' (!2749) from 6861_reservas_hotFix into master ... Reviewed-on: #2749 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:05:18 +00:00
Sergio De la torre	a35ec4a42c	hotFix reservas refs #6861	2024-07-17 16:48:52 +02:00
Sergio De la torre	a54456ac7d	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:21:38 +02:00
Sergio De la torre	8ff3e8acb0	hotFix reservas refs #6861	2024-07-17 16:21:37 +02:00
Sergio De la torre	5130b4ebdd	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:18:00 +02:00
Sergio De la torre	2e313b47b1	Merge branch '6861_reservas_hotFix' of https://gitea.verdnatura.es/verdnatura/salix into 6861_reservas_hotFix	2024-07-17 16:14:31 +02:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Sergio De la torre	7047578809	hotFix reservas refs #686	2024-07-17 16:09:09 +02:00
Alex Moreno	2763839c54	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:42:23 +02:00
Alex Moreno	d52a229613	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:40:57 +02:00
Alex Moreno	021d315a01	fix: weeklyHourRecordEmail workerId prop and correct request in frontend	2024-07-17 13:30:47 +02:00
Alex Moreno	563c70c65d	fix(cancelShipment): fix	2024-07-17 11:18:12 +02:00
Alex Moreno	4ff388198b	fix(deletExpeditions): add try catch	2024-07-17 10:14:41 +02:00
Pablo Natek	b5728b43f0	Merge pull request 'feat: refs #6403 add cancelShipment on deleteExpeditions' (!2747) from 6403-featDeleteMrw into master ... Reviewed-on: #2747 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-17 06:25:32 +00:00
Pablo Natek	f83dd37a28	fix: refs #6403 remove line	2024-07-17 08:23:33 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02:00
Javier Segarra	5293becb6d	Merge branch 'master' into 7648_myEntries	2024-07-16 11:52:54 +00:00
Sergio De la torre	5869979c55	Merge pull request 'hotFix itemShelvingSale refs #6861' (!2742) from hotFix_reserves into master ... Reviewed-on: #2742 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-16 11:09:46 +00:00
Sergio De la torre	3f297acbd3	hotFix itemShelvingSale refs #6861	2024-07-16 13:06:04 +02:00