6218 Commits

Author	SHA1	Message	Date
Pako Natek	e9b93ff99b	Merge branch 'dev' into 7999-longTermStorage	2024-09-20 08:13:52 +00:00
Pako Natek	e8add6e614	feat(TPV): refs #7999 new frmLongTermStorage ... Parking table foreign key updated Old proc removed Refs: #7999	2024-09-20 10:12:24 +02:00
Alex Moreno	ccb60eee87	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-19 12:42:12 +02:00
Alex Moreno	b7e712b738	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-19 12:38:08 +02:00
Jorge Penadés	22af34c0cb	feat: refs #7323 use scopes	2024-09-19 09:27:05 +02: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	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
Ivan Mas	51981eda06	Merge branch 'dev' into 7934-DeleteVn.MIDNIGHT	2024-09-18 10:01:17 +00:00
Carlos Andrés	ba6b6572c3	fix: collection_new	2024-09-18 09:45:12 +02:00
Javier Segarra	3783bddd2c	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-18 07:05:18 +00:00
Guillermo Bonet	7f9cd1e0d9	Merge pull request 'feat: refs #7893 Created waste_addSalesLauncher' (!2972) from 7893-waste_addSales into dev ... Reviewed-on: #2972 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-18 05:40:17 +00:00
Robert Ferrús	168e2e3e25	Merge branch 'dev' into 7964-entry_getCommission	2024-09-18 05:19:46 +00: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
Javier Segarra	96159224a4	Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf	2024-09-17 16:48:09 +02:00
Ivan Mas	7cd8e535f0	refactor: refs #7934 Delete vn.MIDNIGHT function	2024-09-17 16:19:09 +02:00
Carlos Andrés	8f9a7802ab	fix: refs #7760 tmp.ticketIPT	2024-09-17 15:50:51 +02:00
Javi Gallego	06d06d7b1a	Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev ... Reviewed-on: #2970 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 13:09:18 +00:00
Javier Segarra	7f6bd55eaa	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 13:07:25 +00:00
Pablo Natek	ad6fcc0d36	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 11:57:54 +00:00
Sergio De la torre	974827443c	fix: refs #6861 itemShelvingSale transaction	2024-09-17 13:11:27 +02:00
Pako Natek	8b8c64ed65	Merge branch 'master' into 7969-plantTray	2024-09-17 10:53:44 +00:00
Guillermo Bonet	a3022a7379	Merge branch 'dev' into 7893-waste_addSales	2024-09-17 10:35:27 +00:00
Guillermo Bonet	fa5ace677c	refactor: refs #7893 Requested changes	2024-09-17 12:35:08 +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
Javier Segarra	2e32dfddc4	perf(salix): refs #7677 #7677 restore files	2024-09-17 11:43:28 +02:00
Javier Segarra	3e5442c40b	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 11:42:04 +02:00
Pako Natek	019d855fbf	fix: refs #7969 new plantTray restriction	2024-09-17 11:22:07 +02:00
Jon Elias	eb083d6d2b	Merge branch 'dev' into 6346-WagonToCard	2024-09-17 09:07:26 +00:00
Jon Elias	c8315714d4	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-17 09:05:17 +00:00
Pablo Natek	d308f185bc	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 08:11:17 +00: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	88f434435b	Merge branch 'test' into dev	2024-09-17 08:42:34 +02: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
Javi Gallego	361d60a8a8	Merge pull request 'feat: refs #7956 itemGetSimilar' (!2945) from 7956-itemGetSimilar into dev ... Reviewed-on: #2945 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-17 05:28:48 +00:00
Javi Gallego	06efa8be94	Merge branch 'dev' into 3505-closureTests	2024-09-17 07:12:01 +02:00
Carlos Andrés	faf963ba52	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:11:51 +02:00
Carlos Andrés	1d42f58c39	fix: refs #7760 tmp.ticketIPT	2024-09-16 15:09:34 +02:00
Carlos Andrés	2e03fe8193	fix: refs #7760 tmp.ticketIPT	2024-09-16 14:41:29 +02:00