18102 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Carlos Satorres	6ff7edfada	Merge pull request '6220-addressFilter' (!1886) from 6220-addressFilter into dev ... Reviewed-on: #1886 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-18 11:45:09 +00:00
Carlos Satorres	e4de704b4c	Merge branch 'dev' into 6220-addressFilter	2023-12-18 11:16:58 +00:00
Javier Segarra	1810377738	Merge pull request '#2051 - DMS unify methods' (!1888) from 2051_dms_methods_refactor into dev ... Reviewed-on: #1888 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-18 07:14:35 +00:00
Javier Segarra	1515b55f7d	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-15 12:06:07 +00:00
Javier Segarra	29a7d9b941	Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-15 13:01:47 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Guillermo Bonet	e89ec55839	fix: refs #6172	2023-12-14 15:09:07 +01:00
Carlos Satorres	fe184156a1	Merge branch 'dev' into 6220-addressFilter	2023-12-14 13:51:09 +00:00
Carlos Satorres	f73f3813b3	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-14 14:37:22 +01:00
Carlos Satorres	bbb9f58a9e	refs #6220 fix(client_filter): fix where	2023-12-14 14:37:14 +01:00
Javier Segarra	043c411f68	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 11:41:11 +00:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Alex Moreno	e7911738c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-14 08:50:20 +01:00
Alex Moreno	157fe6f32f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-12-14 08:16:58 +01:00
Javier Segarra	397eb4d32b	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 06:22:22 +00:00
Sergio De la torre	0130130cee	Merge pull request '6275-silex-to-salix' (!1878) from 6275-silex-to-salix into dev ... Reviewed-on: #1878 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-14 05:52:08 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Carlos Satorres	9a5536a3a3	Merge branch 'dev' into 6220-addressFilter	2023-12-13 14:05:51 +00:00
Carlos Satorres	cfa08963fb	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-13 15:05:43 +01:00
Carlos Satorres	40499e44cf	refs #6220 remove concat	2023-12-13 15:05:41 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Javier Segarra	7bdb1b2078	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-13 13:49:38 +01:00
Javier Segarra	bdf5dd6e3c	refs #2051 feat: restore dms methods	2023-12-13 13:48:22 +01:00
Javier Segarra	a5ecec9603	refs #2051 feat: remove front methods refactor	2023-12-13 13:47:30 +01:00
David Domenech	e7db97a671	Merge pull request 'refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit' (!1890) from 6125-roleCreditLimitFix into dev ... Reviewed-on: #1890 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-13 11:46:39 +00:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
David Domenech	fb74ea3b2c	Merge pull request 'refactor(ticketTracking.userFk): refs #6398 workerFk to userFk' (!1874) from 6398-ticketTracking-change-workerFk-to-userFk into dev ... Reviewed-on: #1874 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-13 11:20:22 +00:00
David Domenech	d4fa1e9aca	refs #6398	2023-12-13 12:04:07 +01:00
David Domenech	2f61b648f7	refs #6398	2023-12-13 09:49:03 +01:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	f63b26b71f	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 07:52:36 +00:00
Carlos Satorres	371a202230	Merge branch 'dev' into 6220-addressFilter	2023-12-13 07:51:23 +00:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Sergio De la torre	435819cf3c	refs #6275 feat:Silex_to_Salix test getExpeditionSummary	2023-12-13 07:24:13 +01:00
Sergio De la torre	9e23f475cc	Merge pull request '6028_routesByWorkerEmail' (!1880) from 6028_routesByWorkerEmail into dev ... Reviewed-on: #1880 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-13 05:59:18 +00:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Sergio De la torre	c44dc90075	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-12 14:47:11 +00:00
Javier Segarra	d206c93305	refs #2051 feat: getAllowedContentTypes approach	2023-12-12 15:03:00 +01:00
Javier Segarra	6334431d2b	refs #2051 feat: uploadFile approach	2023-12-12 14:00:35 +01:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Carlos Satorres	16a76f0bbf	Merge branch 'dev' into 6220-addressFilter	2023-12-12 12:21:12 +00:00
Carlos Satorres	78aa25d74f	refs #6220 fix testback	2023-12-12 13:21:08 +01:00
Carlos Satorres	6cefc982e4	refs #6220 add filter address	2023-12-12 13:14:41 +01:00
Alex Moreno	ea39f8b3be	remove duplicate	2023-12-12 12:25:51 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00