25086 Commits

All Branches

Search

Author	SHA1	Message	Date
Ivan Mas	c82c9395a4	feat: refs #7343 Requested changes	2024-09-19 12:49:45 +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
Ivan Mas	c30ecd3760	feat: refs #7343 Modify driverRouteEmail.js	2024-09-19 12:26:06 +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
Carlos Satorres	6b90690924	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-19 06:10:15 +00: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
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
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
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