25803 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	dfbe1ef556	fix: refs #8285 Fix pipeline version	2024-12-10 11:05:57 +01:00
Carlos Satorres	f6ac55d9d7	fix: fix back	2024-12-10 11:01:52 +01:00
Alex Moreno	b258de4252	test: refs #8282 fix workerActivity add fixtures	2024-12-10 10:38:53 +01:00
Alex Moreno	2f47d7d76e	build: refs #8282 dump db	2024-12-10 10:30:43 +01:00
Jorge Penadés	46448d5fc2	fix: refs #7936 change type	2024-12-10 10:27:35 +01:00
Alex Moreno	d3fe509827	Merge pull request '8282-testToMaster' (!3284) from 8282-testToMaster into master ... Reviewed-on: #3284 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-10 06:18:50 +00:00
Sergio De la torre	699e56a64c	Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test ... Reviewed-on: #3279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-10 06:05:11 +00:00
Jorge Penadés	fcb842d948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 16:44:08 +01:00
Guillermo Bonet	cba5d88c5e	feat: refs #7882 Osrm service	2024-12-09 14:45:31 +01:00
Alex Moreno	94bc1241e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-09 14:31:37 +01:00
Alex Moreno	eaa62909ff	chore: simplify	2024-12-09 14:30:45 +01:00
Alex Moreno	9403588d7b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-09 14:30:03 +01:00
Jorge Penadés	f69dfbd5aa	refactor: refs #7936 remove schema	2024-12-09 14:03:45 +01:00
Jorge Penadés	7c2c56ed9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 13:50:01 +01:00
Jon Elias	87577d0982	Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ... Reviewed-on: #3278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-09 12:30:53 +00:00
Carlos Satorres	d1bf0195f0	Merge pull request 'fix: hotfix 7323 createAbsence' (!3265) from hotfix-7323workerHoliday into master ... Reviewed-on: #3265 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-09 12:28:52 +00:00
Carlos Satorres	cb516d2022	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday	2024-12-09 13:22:10 +01:00
Sergio De la torre	22e9a9104a	feat: refs #8188 refs#8188 orderPicking	2024-12-09 13:20:55 +01:00
Jorge Penadés	5cfcb85443	Merge pull request 'refactor: refs #7366 rename ref to reference' (!3283) from 7366-fixFilter into master ... Reviewed-on: #3283 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-09 11:51:00 +00:00
Jorge Penadés	4a7712779b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium	2024-12-09 12:40:08 +01:00
Jorge Penadés	f63d850ea3	refactor: refs #7366 rename ref to reference	2024-12-09 11:37:01 +01:00
Guillermo Bonet	85baf151d9	feat: refs #7882 Fixed problems osrm service	2024-12-09 10:21:23 +01:00
Guillermo Bonet	e279cc4b47	feat: refs #7882 Added osrm service	2024-12-09 10:01:59 +01:00
Carlos Satorres	d6abcdbca8	Merge branch 'dev' into 7031-zonePrice	2024-12-09 08:11:58 +00:00
Guillermo Bonet	0bb9282953	feat: refs #7882 Added locationiq service	2024-12-09 09:11:55 +01:00
Carlos Satorres	0dc1b9c80b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-09 06:56:48 +01:00
Guillermo Bonet	8960b54664	feat: refs #7882 Added locationiq service	2024-12-08 14:30:05 +01:00
Guillermo Bonet	185956b2c3	Merge pull request 'refactor: refs #7882 Deleted quadminds files' (!3280) from 7882-byeQuadminds into dev ... Reviewed-on: #3280 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-08 09:34:47 +00:00
Guillermo Bonet	04a96e87d6	refactor: refs #7882 Deleted quadminds files	2024-12-08 07:28:29 +01:00
Sergio De la torre	f8e5b76a6f	feat: refs #8188 refs#8188 orderPicking	2024-12-05 13:56:06 +01:00
Sergio De la torre	d17566107e	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:42:17 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +01:00
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +01:00
Jorge Penadés	db8ab307ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-05 10:10:40 +01:00
Guillermo Bonet	85fe8e5575	Merge branch 'test' into dev	2024-12-05 09:22:48 +01:00
Guillermo Bonet	eb997429bb	Merge branch 'master' into test	2024-12-05 09:22:37 +01:00
Carlos Satorres	34f9f9b29f	Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor	2024-12-05 09:19:42 +01:00
Guillermo Bonet	004780c67b	Merge pull request 'feat: refs #8248 Added beta in jenkinsfile' (!3277) from 8248-addBetaJenskinsfile into beta ... Reviewed-on: #3277 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-05 07:55:39 +00:00
Guillermo Bonet	7b2439cb39	feat: refs #8248 Added beta in jenkinsfile	2024-12-05 08:47:28 +01:00
Carlos Satorres	1c51516aeb	Merge branch 'dev' into 7031-zonePrice	2024-12-05 07:32:08 +00:00
Carlos Satorres	483966501a	fix: refs #7031 fix vnPrice	2024-12-05 08:31:09 +01:00
Guillermo Bonet	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +01:00
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +01:00
Ivan Mas	86a36732f0	Merge pull request 'refactor: refs #8272 delete bi.rotacion' (!3275) from 8272-deleteBi.rotacion into dev ... Reviewed-on: #3275 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-04 13:35:59 +00:00
Jorge Penadés	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +01:00
Ivan Mas	41a3f9ae94	refactor: refs #8272 delete bi.rotacion	2024-12-04 13:19:14 +01:00
Carlos Satorres	fad6f33b7c	fix: refs #7031 remove check	2024-12-04 12:33:17 +01:00
Jon Elias	123c0db126	feat: modified data to be equal as the updated back	2024-12-04 11:58:17 +01:00
Carlos Satorres	ed79aa488d	Merge pull request 'fix: fix invoiceOut filter' (!3272) from hotfix-6899invoiceOut into master ... Reviewed-on: #3272 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 08:19:58 +00:00