18091 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	61a323078b	refs #6264 fix: remove DEFAULT_COURTESY_TIME	2023-12-14 12:04:05 +01:00
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +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	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	d364a50ec4	refs #6264 feat: remove validateToken endpoint	2023-12-13 13:39:43 +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
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
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00: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
Javier Segarra	8441877f36	refs #6264 perf: remove field's query	2023-12-12 19:43:32 +01:00
Javier Segarra	0ae75d973f	refs #6264 perf: remove async keyword	2023-12-12 19:42:46 +01: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
Alex Moreno	ea39f8b3be	remove duplicate	2023-12-12 12:25:51 +01:00
Carlos Satorres	977184f3e5	Merge pull request 'refs #5971 change sql address' (!1882) from 5971-addressInvoiceOut into dev ... Reviewed-on: #1882 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-12 10:41:57 +00:00
Carlos Satorres	f796227120	Merge branch 'dev' into 5971-addressInvoiceOut	2023-12-12 10:36:59 +00:00
Sergio De la torre	57739f4ed4	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-12 09:52:58 +00:00
Javier Segarra	24c7271dd8	Merge pull request '#6487 - Stop test container when finish' (!1884) from 6487_stop_test_container into dev ... Reviewed-on: #1884 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-11 11:47:34 +00:00
Javier Segarra	10247c744f	Merge branch 'dev' into 6487_stop_test_container	2023-12-11 11:37:15 +00:00
Guillermo Bonet	a36f22a414	Merge pull request 'refs #6172 Change' (!1735) from 6172-errorMsg into dev ... Reviewed-on: #1735 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-12-11 10:48:58 +00:00
Guillermo Bonet	95a8646d07	Merge branch 'dev' into 6172-errorMsg	2023-12-11 10:27:14 +00:00
Guillermo Bonet	09ad31a92d	feat: refs #6172 Requested changes	2023-12-11 10:58:48 +01:00
Carlos Satorres	9165995ee5	Merge branch 'dev' into 5971-addressInvoiceOut	2023-12-11 07:07:45 +00:00
Sergio De la torre	f774297321	Merge pull request 'refs #5867 fix: tickets sql' (!1800) from 5867-Driver-Route-Pdf into dev ... Reviewed-on: #1800 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-11 06:05:07 +00:00
Sergio De la torre	64ecf2e229	Merge branch 'dev' into 5867-Driver-Route-Pdf	2023-12-11 05:48:21 +00:00
Javier Segarra	b86c73777f	Update back/tests.js	2023-12-07 19:05:54 +00:00
Carlos Satorres	7e9134ecc3	refs #5971 change sql address	2023-12-07 13:47:07 +01:00
Sergio De la torre	9937fbed5e	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:59:01 +01:00
Sergio De la torre	67994188ee	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-07 10:42:30 +00:00
Sergio De la torre	fa65cc84a9	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:39:22 +01:00
Sergio De la torre	61ed53bd1d	REFS #6275 feat:Silex_to_Salix	2023-12-07 10:37:06 +01:00
Carlos Satorres	f5ef6c66a4	Merge pull request 'refs #6010 remove pending' (!1876) from 6010-testBackPending into dev ... Reviewed-on: #1876 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 08:41:03 +00:00
Carlos Satorres	3abbae7612	Merge branch 'dev' into 6010-testBackPending	2023-12-07 07:16:17 +00:00
Javi Gallego	be5df940bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-07 08:01:20 +01:00
Javi Gallego	58ba1c10d0	ci: dev-test	2023-12-07 08:01:16 +01:00
Sergio De la torre	0263d880ca	refs #6028 add:email in ByWorker	2023-12-07 08:00:17 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Carlos Satorres	c75ee22345	Merge pull request 'refs #6318 quantity' (!1875) from 6318-negativeQuantity into dev ... Reviewed-on: #1875 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-07 06:59:24 +00:00
Sergio De la torre	c9bcd672c9	refs #6028 add:email in ByWorker	2023-12-07 07:59:21 +01:00
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00