25531 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	e3c92c3644	fix: refs #6421 worker_getHierarchy infinite loop	2024-09-18 13:43:00 +02:00
Carlos Satorres	2af4d86c28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-09-18 13:32:02 +02:00
Alex Moreno	9efc712859	Merge pull request 'refactor(vnUser): refs #7792 use twoFactorFk and add foreignKey' (!2937) from 7792-twoFactorFk into dev ... Reviewed-on: #2937 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-18 10:41:40 +00: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
Ivan Mas	09dfacd753	Merge pull request 'refactor: refs #7934 Delete vn.MIDNIGHT function' (!2984) from 7934-DeleteVn.MIDNIGHT into dev ... Reviewed-on: #2984 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-18 10:14:01 +00:00
Carlos Satorres	5da6c09f68	fix: refs #7529 workerPit	2024-09-18 12:08:49 +02:00
Alex Moreno	79d79f0c9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk	2024-09-18 12:03:52 +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
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
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
Jorge Penadés	c0c8548216	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-18 09:41:40 +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
Jon Elias	35358834d9	Merge branch 'dev' into 7884-AddLabelerField	2024-09-18 06:23:44 +00:00
Carlos Satorres	c0ee82fd4f	Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT	2024-09-18 07:56:03 +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
Jorge Penadés	75b7e603c9	fix: refs #7323 drop acl	2024-09-17 16:08:51 +02:00
Carlos Andrés	8f9a7802ab	fix: refs #7760 tmp.ticketIPT	2024-09-17 15:50:51 +02:00
Jorge Penadés	eb430ea5c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-17 15:44:19 +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
Jon Elias	59c6d316dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField	2024-09-17 14:21:14 +02: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
Jorge Penadés	24780c4511	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-17 13:27:11 +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
Jon Elias	33c3ceaf33	Merge branch 'dev' into 7884-AddLabelerField	2024-09-17 10:44:30 +00:00
Jon Elias	71362baa66	feat: refs #7884 added filter when daysOnward and daysAgo have value and refactor ifs block	2024-09-17 12:42:47 +02: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