24368 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	e523b12536	fix: refs #7792 enable null	2024-09-18 09:50:55 +02:00
Carlos Andrés	ba6b6572c3	fix: collection_new	2024-09-18 09:45:12 +02:00
Javier Segarra	c9db888266	Merge pull request '#7677 - return more postcode fields' (!2865) from 7677_vnLocation_perf into dev ... Reviewed-on: #2865 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 07:08:42 +00:00
Javier Segarra	3783bddd2c	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-18 07:05:18 +00:00
Alex Moreno	c75cc87129	refactor: refs #7792 revert TwoFactorType	2024-09-18 08:31:26 +02:00
Alex Moreno	829ecba2ef	refactor: refs #7792 revert TwoFactorType	2024-09-18 08:30:05 +02: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	72feaba2d2	Merge pull request 'feat: refs #7964 entry_beforeUpdate' (!2966) from 7964-entry_getCommission into dev ... Reviewed-on: #2966 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-18 05:26:23 +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	f6c5f41d44	Merge pull request '7404-stockBuyed' (!2836) from 7404-stockBuyed into dev ... Reviewed-on: #2836 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 11:59:48 +00:00
Pablo Natek	ad6fcc0d36	Merge branch 'dev' into 7404-stockBuyed	2024-09-17 11:57:54 +00: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	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	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
Javier Segarra	f962b2e38b	perf(salix): refs #7677 #7677 restore files because unnecessary change	2024-09-17 11:44:34 +02: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
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
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
Jon Elias	5ee5da24e1	Merge pull request '#6346 Added script for wagon section' (!2968) from 6346-WagonToCard into dev ... Reviewed-on: #2968 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 09:09:46 +00:00
Jon Elias	eb083d6d2b	Merge branch 'dev' into 6346-WagonToCard	2024-09-17 09:07:26 +00:00
Jon Elias	bd621c7848	Merge pull request 'fix: refs #6346 fixed SQL' (!2959) from Hotfix-WagonSQL into dev ... Reviewed-on: #2959 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 09:07:14 +00:00
Jon Elias	c8315714d4	Merge branch 'dev' into Hotfix-WagonSQL	2024-09-17 09:05:17 +00:00
Pablo Natek	1036330471	Merge branch '7404-stockBuyed' of https://gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-09-17 10:32:29 +02:00
Pablo Natek	0c259b7a81	fix: refs #7404 remove duplicate translate	2024-09-17 10:32:26 +02: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