24951 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	bbc4eff922	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-10-23 13:28:05 +00:00
Ivan Mas	c593b95935	feat: refs #7880 error code and translations	2024-10-23 15:21:24 +02:00
Sergio De la torre	5a8f43d0ea	Merge pull request 'feat: refs #8020 machineWorkerDeprecated' (!3141) from 8020-mahineWorkerDeprecated into dev ... Reviewed-on: #3141 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 12:14:36 +00:00
Guillermo Bonet	db4b540958	Merge branch 'test' into dev	2024-10-23 12:44:55 +02:00
Guillermo Bonet	fc56dbc5fb	Merge branch 'master' into test	2024-10-23 12:44:35 +02:00
Guillermo Bonet	9341a51ed4	Merge pull request 'feat: refs #8119 itemCampaignQuantity' (!3117) from 8119-itemCampaignQuantity into master ... Reviewed-on: #3117 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 10:40:42 +00:00
Guillermo Bonet	9eaa5a7585	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-23 10:38:00 +00:00
Sergio De la torre	3da08e3a23	feat: refs #8020 machineWorkerDeprecated	2024-10-23 11:33:45 +02:00
Guillermo Bonet	3cde6b6bc6	feat: refs #8119 Requested changes	2024-10-23 08:30:21 +02:00
Guillermo Bonet	31c89538bc	feat: refs #8119 Requested changes	2024-10-23 08:27:07 +02:00
Guillermo Bonet	37050361c2	feat: refs #8119 Requested changes	2024-10-23 08:26:36 +02:00
Guillermo Bonet	baec188ff5	feat: refs #8119 Requested changes	2024-10-23 08:23:28 +02:00
Javi Gallego	2f5f4ecc7c	Merge pull request 'feat: refs #7943 quitar lectura en metodos comunes' (!3136) from 7943-permisosWorker into dev ... Reviewed-on: #3136 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-23 05:53:03 +00:00
Javi Gallego	62f9f31279	feat: refs #7943 usa back con permisos	2024-10-23 07:44:41 +02:00
Guillermo Bonet	30c1a57b68	Merge branch 'test' into dev	2024-10-23 07:19:07 +02:00
Guillermo Bonet	fe3e7342bc	fix: refs #7935 version	2024-10-23 07:14:07 +02:00
Alex Moreno	b4e1b015de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-22 15:08:29 +02:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Guillermo Bonet	6227ef0821	Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity	2024-10-22 15:00:17 +02:00
Guillermo Bonet	1afb33c306	feat: refs #8119 Requested changes	2024-10-22 15:00:16 +02:00
Jorge Penadés	15fee5ac8d	Merge pull request '#8083 add prop' (!3140) from 8083-hotfix-changeState into master ... Reviewed-on: #3140 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-22 12:50:10 +00:00
Jorge Penadés	13a30783d9	Merge pull request 'feat: refs #8083 add prop' (!3115) from 8083-changeState into dev ... Reviewed-on: #3115 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-22 12:47:51 +00:00
Jorge Penadés	e772776028	Merge branch 'dev' into 8083-changeState	2024-10-22 12:45:56 +00:00
Jorge Penadés	a543fca01a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 8083-hotfix-changeState	2024-10-22 14:23:53 +02:00
Javi Gallego	4844bcf06f	Merge pull request '#7524 myteam filter' (!3134) from 7524-hotfix-myTeamFilter into master ... Reviewed-on: #3134 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-22 11:59:44 +00:00
Jorge Penadés	1c5e4f40ce	feat: refs #8083 add prop	2024-10-22 12:39:51 +02:00
Jorge Penadés	e2b57d695e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter	2024-10-22 12:25:43 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Sergio De la torre	29745d0af4	Merge pull request 'fix: refs #6861 fixTransactionCommit' (!3139) from 6861-Reservas into master ... Reviewed-on: #3139 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-22 08:13:00 +00:00
Sergio De la torre	6ef7760498	fix: refs #6861 fixTransactionCommit	2024-10-22 10:06:59 +02:00
Guillermo Bonet	b4d2c69b37	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-22 06:42:02 +00:00
Guillermo Bonet	5162c2037b	feat: refs #8119 Requested changes	2024-10-22 08:41:46 +02:00
Alex Moreno	db8573dd40	Merge pull request '8144-devToTest_2444' (!3137) from 8144-devToTest_2444 into test ... Reviewed-on: #3137 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-10-22 06:07:14 +00:00
Carlos Satorres	56cba385cf	Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev ... Reviewed-on: #3132 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 12:31:30 +00:00
Jorge Penadés	1efe258ea0	fix: refs #7524 filter by department	2024-10-21 14:30:45 +02:00
Carlos Satorres	aad616ff83	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 12:26:53 +00:00
Carlos Satorres	f8c83c8f68	Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev ... Reviewed-on: #3131 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 12:26:04 +00:00
Carlos Satorres	c3ffb31348	Merge branch 'dev' into 6831-observationDefaulterEmail	2024-10-21 12:23:39 +00:00
Javi Gallego	2b05e8c48e	feat: refs #7943 quitar lectura en metodos comunes	2024-10-21 13:29:33 +02:00
Jorge Penadés	b76b1c6d50	Merge pull request '#7919 delete if ticketRefund' (!3091) from 7919-deleteTicketRefund into dev ... Reviewed-on: #3091 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:21:34 +00:00
Jorge Penadés	2f77359892	Merge branch 'dev' into 7919-deleteTicketRefund	2024-10-21 11:00:31 +00:00
Pablo Natek	69a34ab0fa	Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev ... Reviewed-on: #3135 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 10:25:41 +00:00
Pablo Natek	1731af13ea	Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc	2024-10-21 12:19:22 +02:00
Pablo Natek	e479873547	fix: restore cursor	2024-10-21 12:19:20 +02:00
Alex Moreno	15a8a70201	Merge branch 'dev' into 8083-changeState	2024-10-21 10:11:56 +00:00
Pablo Natek	92f699aac3	Merge branch 'dev' into fixNightProc	2024-10-21 09:37:07 +00:00
Pablo Natek	e38c061deb	fix: add date format on insert data	2024-10-21 11:36:44 +02:00
Jon Elias	d75a032d75	Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev ... Reviewed-on: #3094 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 09:34:53 +00:00
Jon Elias	158f701f1e	Merge branch 'dev' into Fix-ItemRequest	2024-10-21 09:31:29 +00:00
Jorge Penadés	cb4e8355ba	feat: refs #7524 myteam filter	2024-10-21 10:58:36 +02:00