24013 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	a6168e61f1	refactor: refs #7323 improve role resolver	2024-09-18 12:19:49 +02:00
Guillermo Bonet	91ee956fbd	Merge pull request 'feat: refs #7882 Added model and method' (!2879) from 7882-quadMinds into master ... Reviewed-on: #2879 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-18 05:16:45 +00:00
Guillermo Bonet	871d5457d0	refactor: refs #7882 Requested changes	2024-09-18 07:14:52 +02:00
Sergio De la torre	ee234577a3	Merge pull request 'fix: refs #6861 itemShelvingSale transaction' (!2983) from 6861-itemShelvingSalesTransaction into master ... Reviewed-on: #2983 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-17 11:17:40 +00:00
Sergio De la torre	974827443c	fix: refs #6861 itemShelvingSale transaction	2024-09-17 13:11:27 +02:00
Pako Natek	8620db056e	Merge pull request '7969-plantTray' (!2982) from 7969-plantTray into master ... Reviewed-on: #2982 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-17 10:56:00 +00:00
Pako Natek	8b8c64ed65	Merge branch 'master' into 7969-plantTray	2024-09-17 10:53:44 +00:00
Guillermo Bonet	ca84f7e184	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-17 12:10:56 +02:00
Guillermo Bonet	4a102d315d	fix: refs #7564 Ticket volume item cost	2024-09-17 12:10:47 +02:00
Pako Natek	829475b49b	feat(collection_new): refs #7969 new restriction hasPlantTray for pickers ... Refs: #7969	2024-09-17 11:57:00 +02:00
Jorge Penadés	f3907e8656	Merge pull request 'fix: refs #7524 getAmountPaid wip' (!2971) from 7524-hotfix-getAmountPaid into master ... Reviewed-on: #2971 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 09:53:48 +00:00
Jorge Penadés	529be86d84	fix: refs #7524 too records error	2024-09-17 11:44:09 +02:00
Jorge Penadés	4332fccfcc	chore: refs #7524 rollback	2024-09-17 11:43:34 +02:00
Jorge Penadés	3f321e8ee8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid	2024-09-17 11:40:52 +02:00
Pako Natek	019d855fbf	fix: refs #7969 new plantTray restriction	2024-09-17 11:22:07 +02:00
Guillermo Bonet	55df919076	fix: refs #7760 collection_new	2024-09-17 09:37:25 +02:00
Guillermo Bonet	267ce3167c	fix: refs #7760 collection_new	2024-09-17 09:30:40 +02:00
Guillermo Bonet	3fe1724e84	fix: refs #7760 ticket_splitItemPackingType	2024-09-17 09:12:25 +02:00
Pablo Natek	81eb875132	Merge pull request 'fix: refs #7760 remove throw on ticket split' (!2980) from 7760-fixTicketSplit into master ... Reviewed-on: #2980 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 06:58:02 +00:00
Guillermo Bonet	2980b2da51	fix: refs #7759 Added more grants for vn user	2024-09-17 08:41:52 +02:00
Pablo Natek	9896ac2361	fix: refs #7760 remove throw on ticket split	2024-09-17 08:21:29 +02:00
Alex Moreno	fa0c8689d4	Merge pull request '7983-testToMaster_2438' (!2977) from 7983-testToMaster_2438 into master ... Reviewed-on: #2977 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 05:36:45 +00:00
Alex Moreno	3011421526	fix: refs #7983 correct version	2024-09-16 15:19:46 +02:00
Alex Moreno	d46be39786	chore: refs #7983 changelog	2024-09-16 15:19:21 +02:00
Carlos Andrés	2e03fe8193	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:41:29 +02:00
Alex Moreno	8803ae0534	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-16 14:25:27 +02:00
Sergio De la torre	0e81114696	Merge pull request 'fix: refs #6861 itemShelvingSale debug' (!2969) from 6861-itemShelvingSaleReserve into master ... Reviewed-on: #2969 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-16 12:21:22 +00:00
Sergio De la torre	9d50b228f6	Merge pull request '7760-tmp.ticketIPT' (!2973) from 7760-tmp.ticketIPT into test ... Reviewed-on: #2973 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-09-16 12:21:08 +00:00
Carlos Andrés	33540063f4	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:17:51 +02:00
Carlos Andrés	e7343b7e25	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:16:48 +02:00
Jorge Penadés	8fedfbd090	fix: refs #7524 getAmountPaid wip	2024-09-16 13:32:14 +02:00
Sergio De la torre	c33740e36e	fix: refs #6861 itemShelvingSale debug	2024-09-16 13:00:20 +02:00
Pako Natek	eb098b41ba	Merge pull request 'fix: refs #7969 no agency restriction removed' (!2963) from 7969-hotFixplantTray3 into master ... Reviewed-on: #2963 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-16 06:41:37 +00:00
Pako Natek	f3988fd3a9	Merge branch 'master' into 7969-hotFixplantTray3	2024-09-16 06:40:03 +00:00
Pako Natek	6983a2fbd9	fix: refs #7969 no agency restriction removed	2024-09-16 08:38:06 +02:00
Pako Natek	51a770960c	Merge pull request 'fix: refs #7969 fix on collectionNew' (!2962) from 7969-hotFixplatTray2 into master ... Reviewed-on: #2962 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-16 06:23:14 +00:00
Pako Natek	390b8271c2	fix: root instead of vn	2024-09-16 08:20:17 +02:00
Pako Natek	6cbf25dee5	fix: refs #7969 fix on collectionNew	2024-09-16 08:10:58 +02:00
Guillermo Bonet	2e34f1bbe6	Merge branch 'master' into test	2024-09-16 07:16:13 +02:00
Guillermo Bonet	d3dc77d3ee	Merge pull request 'fix: refs #7644 Update in print method' (!2961) from 7644-updateInPrint into master ... Reviewed-on: #2961 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-16 05:11:45 +00:00
Guillermo Bonet	635eb405a2	fix: refs #7644 Update in print method	2024-09-13 14:53:44 +02:00
Guillermo Bonet	6f1d962db2	fix: refs #7644 Update in print method	2024-09-13 14:39:47 +02:00
Jon Elias	f15df1ef66	Merge pull request 'Hotfix: fixed balance create amount field' (!2950) from Hotfix-BalanceDialog into master ... Reviewed-on: #2950 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-13 06:06:37 +00:00
Jon Elias	fb7bf5b4eb	Merge branch 'master' into Hotfix-BalanceDialog	2024-09-13 06:05:17 +00:00
Sergio De la torre	1ef9cc0458	Merge pull request 'master' (!2957) from master into test ... Reviewed-on: #2957 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-09-13 05:39:45 +00:00
Sergio De la torre	99761c97e8	Merge pull request '6861-availableReserve' (!2952) from 6861-availableReserve into master ... Reviewed-on: #2952 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-11 12:38:14 +00:00
Guillermo Bonet	8518351790	Merge branch 'master' into test	2024-09-11 14:19:37 +02:00
Jon Elias	eab0a7d914	Merge branch 'master' into Hotfix-BalanceDialog	2024-09-11 12:19:13 +00:00
Guillermo Bonet	889f3bdab4	fix: refs #7213 risk F11	2024-09-11 14:12:07 +02:00
Sergio De la torre	7e06c2ab37	fix: available refs #6861	2024-09-11 13:57:03 +02:00