24092 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	0c35e1fa9c	feat: refs #8000 modificar comentario	2024-09-20 07:33:05 +02:00
Robert Ferrús	e75ac1bb8d	Merge branch 'master' into 8000-catalog_calculate	2024-09-20 04:58:51 +00:00
Carlos Andrés	4c0e05fdab	fix: refs #8011 Previas compo F	2024-09-19 18:03:59 +02:00
Guillermo Bonet	e40e3ebed6	fix: refs #7882 Quadmind api config	2024-09-19 16:40:33 +02:00
Robert Ferrús	5456490dcd	feat: refs #8000 poner comentario	2024-09-19 12:09:47 +02:00
Carlos Andrés	e8a203efc7	fix: ticket_splitItemPackingType	2024-09-19 12:09:36 +02:00
Jorge Penadés	b6027d3724	Merge pull request 'feat: refs #7323 use scopes' (!2993) from 7323-hotfix-advancedSummary into master ... Reviewed-on: #2993 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-19 10:08:56 +00:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02:00
Robert Ferrús	b48c221028	feat: refs #8000 refs #800 catalog_calculate itemMaxLength	2024-09-19 08:33:33 +02:00
Javi Gallego	da0e735fb2	fix: hotFix limit 5	2024-09-18 23:41:01 +02:00
Pako Natek	e9015f6c05	Merge pull request 'fix(productionControl): refs #7969' (!2991) from hotFix-productionControl into master ... Reviewed-on: #2991 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-09-18 15:49:45 +00:00
Pablo Natek	6f5cb6c70a	Merge branch 'master' into hotFix-productionControl	2024-09-18 15:47:15 +00:00
Pablo Natek	8aad80cbf1	fix(productionControl): refs #7969	2024-09-18 17:45:58 +02:00
Guillermo Bonet	d9f39967ea	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-18 13:43:03 +02:00
Guillermo Bonet	e3c92c3644	fix: refs #6421 worker_getHierarchy infinite loop	2024-09-18 13:43:00 +02:00
Jorge Penadés	4068cfe5da	Merge pull request 'refactor: refs #7323 improve role resolver' (!2989) from 7323-fixResolver into master ... Reviewed-on: #2989 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 10:38:44 +00:00
Jorge Penadés	d08e2d39fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fixResolver	2024-09-18 12:20:32 +02:00
Jorge Penadés	a6168e61f1	refactor: refs #7323 improve role resolver	2024-09-18 12:19:49 +02:00
Guillermo Bonet	4dd70ccc69	build: dump 2438	2024-09-18 12:01:25 +02:00
Pablo Natek	eb22a77e25	fix: timesstampadd to interval	2024-09-18 11:48:50 +02:00
Pablo Natek	6c4b1cd522	fix(shelving_clean): less time por shelving removal	2024-09-18 11:37:47 +02:00
Carlos Andrés	26a078504f	fix: collection_new	2024-09-18 11:27:57 +02:00
Carlos Andrés	4f9b6030e8	fix: collection_new	2024-09-18 10:30:16 +02:00
Carlos Andrés	d5f18b9187	fix: collection_new	2024-09-18 10:25:21 +02:00
Carlos Andrés	dcd7237d67	Merge branch 'master' into solve_merge_problems	2024-09-18 10:17:57 +02:00
Carlos Andrés	ba6b6572c3	fix: collection_new	2024-09-18 09:45:12 +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
Carlos Andrés	8f9a7802ab	fix: refs #7760 tmp.ticketIPT	2024-09-17 15:50:51 +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	1cbba0b52f	Merge branch 'master' into test	2024-09-17 08:42:02 +02: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