25012 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	55fced363e	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 07:42:58 +00:00
Guillermo Bonet	3158644032	fix: refs #7994 commented alter	2024-11-12 07:59:07 +01:00
Alex Moreno	732dd02a19	Merge pull request '8179-testToMaster' (!3176) from 8179-testToMaster into master ... Reviewed-on: #3176 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-12 06:41:51 +00:00
Pablo Natek	ffe947c73d	Merge pull request 'fix: refs #7404 remove volume from ticket sold on holland' (!3169) from 7404-fix-remove-tickets-volume into test ... Reviewed-on: #3169 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 06:31:32 +00:00
Pablo Natek	3d3bc0dbaa	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-12 06:24:06 +00:00
Pablo Natek	395e6997dd	Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume	2024-11-12 07:23:47 +01:00
Pablo Natek	2dd3ae1c75	fix: refs #7404 empty commit	2024-11-12 07:23:46 +01:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-11 14:09:03 +01:00
Pako Natek	b62b33d175	Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171) from hotFix-remove-notOwn-agency-collection-advantage into master ... Reviewed-on: #3171 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-11 10:02:42 +00:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets ... Refs: #0000	2024-11-11 09:02:04 +01:00
Robert Ferrús	94ed23ca07	feat: refs #8169 modifica role	2024-11-11 07:51:26 +01:00
Pablo Natek	82e62e8ee7	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-11 05:53:30 +00:00
Pablo Natek	f8c3d69c5d	fix: refs #7404 remove volume from ticket sold on holland	2024-11-08 13:44:20 +01:00
Javi Gallego	d95e455ccf	fix: refs #7935 sin modificar autonomy	2024-11-07 14:48:31 +01:00
Robert Ferrús	6031b1fe3f	feat: refs #8169 create table itemTextureTag	2024-10-28 12:17:56 +01:00
Guillermo Bonet	765d125219	Merge branch 'master' into test	2024-10-28 07:11:21 +01:00
Guillermo Bonet	a707f9cbff	Merge pull request 'fix: refs #235425 sale priceFixed update' (!3146) from hotfix235425-updatePrice into master ... Reviewed-on: #3146 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-28 06:06:56 +00:00
Guillermo Bonet	69e1df2504	fix: refs #235425 Requested changes	2024-10-25 08:47:43 +02:00
Guillermo Bonet	111480f7b7	fix: refs #235425 Requested changes	2024-10-25 07:22:36 +02:00
Guillermo Bonet	4da11c65bb	fix: refs #235425 sale priceFixed update	2024-10-24 12:26:03 +02:00
Javier Segarra	70b1628649	Merge pull request 'HOTFIX: RecalculatePrice not working with all ids' (!3144) from hotfix_recalculatePrice_list_ids into master ... Reviewed-on: #3144 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-24 08:36:34 +00:00
Javier Segarra	070a5640df	fix: recalculatePrice not working with all ids	2024-10-24 08:16:04 +00:00
Alex Moreno	4660118211	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-24 07:47:41 +02:00
Javi Gallego	ed6a062ca3	Merge pull request 'feat: refs #8083 add field' (!3143) from 8083-hotfix-insertRecord into master ... Reviewed-on: #3143 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-23 14:25:41 +00:00
Jorge Penadés	43f8b22593	feat: refs #8083 add field	2024-10-23 16:10:00 +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
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
Guillermo Bonet	fe3e7342bc	fix: refs #7935 version	2024-10-23 07:14:07 +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	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