23369 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	5d857696b5	Merge pull request 'feat: refs #7039 deleteVirtualColumnCountry' (!2532) from 7039-deleteVirtualColumnCountry into dev ... Reviewed-on: #2532 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 07:00:06 +00:00
Robert Ferrús	fd011428d5	Merge branch 'dev' into 7039-deleteVirtualColumnCountry	2024-06-05 06:48:20 +00:00
Guillermo Bonet	3dab181bff	Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ... Reviewed-on: #2536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 06:17:10 +00:00
Javi Gallego	130d2b6b47	feat: refs #7203 remove numbres alertLevel	2024-06-05 08:05:46 +02:00
Javi Gallego	9b8fef2f20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-05 07:07:18 +02:00
Javi Gallego	143930bc86	fix: warmFix setDeleted checks ticketRequest not answered	2024-06-05 07:07:13 +02:00
Juan Ferrer	feaf5f8f5a	Merge pull request 'test' (!2545) from test into dev ... Reviewed-on: #2545	2024-06-04 21:05:47 +00:00
Juan Ferrer	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00:00
Juan Ferrer	3b4cbe9e6c	ci(Jenkinsfile): refs #7442 Remove ci from back tests	2024-06-04 22:59:33 +02:00
Carlos Andrés	3a68cfef77	Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master ... Reviewed-on: #2540 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-04 17:14:51 +00:00
Carlos Andrés	35b4255505	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:45:42 +02:00
Carlos Andrés	e4969f7061	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:43:09 +02:00
Sergio De la torre	f70605e565	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 16:03:37 +02:00
Carlos Andrés	a9eb5f7d1e	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:45:54 +02:00
Carlos Andrés	e2adadb8da	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:43:32 +02:00
Carlos Andrés	c57f4db623	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:41:53 +02:00
Carlos Andrés	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Javi Gallego	8f7b034aa7	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 14:24:55 +02:00
Javi Gallego	4089c7deb3	feat: refs #4560 minorChanges	2024-06-04 12:23:28 +02:00
Robert Ferrús	81e461d7b1	Merge pull request 'feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk' (!2510) from 7296-expeditionTruckToRoadmapStop into dev ... Reviewed-on: #2510 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-04 10:03:56 +00:00
Javi Gallego	da1b4649bb	feat: refs #4560 sin expeditionTruck	2024-06-04 11:58:39 +02:00
Robert Ferrús	6b9c1b7f54	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-06-04 09:58:07 +00:00
Alex Moreno	a997ca0c58	build: add new version	2024-06-04 10:08:17 +02:00
Alex Moreno	f354fe1b1f	Merge pull request '7525-devToTest' (!2542) from 7525-devToTest into test ... Reviewed-on: #2542 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-04 07:59:33 +00:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Alex Moreno	7a803cce37	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-04 09:38:50 +02:00
Alex Moreno	e2c7475ea8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-04 09:38:32 +02:00
Alex Moreno	963c2f68b7	Merge pull request 'fix(ticket): throw error if id is null' (!2541) from hotFix_ticket_request into master ... Reviewed-on: #2541 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-04 07:23:33 +00:00
Alex Moreno	03201e1e2c	fix(ticket): throw error if id is null	2024-06-04 09:10:47 +02:00
Robert Ferrús	3720f7acfe	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-06-04 06:57:29 +00:00
Sergio De la torre	94aef434a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 07:17:37 +02:00
Carlos Andrés	9a7074d600	hotfix: ledger_next transacciones refs #7523	2024-06-03 20:16:27 +02:00
Sergio De la torre	882d5bf036	feat: roadMap refs #7195	2024-06-03 18:39:11 +02:00
Pablo Natek	6b234f4664	Merge pull request 'fix: refs #6404 change db language on local' (!2534) from 6404-fixSaturdayDelivery into master ... Reviewed-on: #2534 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-03 15:40:27 +00:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Juan Ferrer	f78585f6ab	Merge branch 'master' into test	2024-06-03 17:37:47 +02:00
Pablo Natek	2ee41b17dc	Merge branch 'master' into 6404-fixSaturdayDelivery	2024-06-03 15:34:36 +00:00
Juan Ferrer	5dd2e3b7d3	ci(Jenkinsfile): refs #7442 Tag image with build id	2024-06-03 16:45:02 +02:00
Jorge Penadés	a13581ed97	feat: refs #6243 Add warehouseFk parameter	2024-06-03 16:31:38 +02:00
Jorge Penadés	58053d8286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-03 15:22:08 +02:00
Alex Moreno	0b885ab773	build: increase version	2024-06-03 15:06:29 +02:00
Alex Moreno	3875bdb98d	build(operator): remove console.log	2024-06-03 15:01:25 +02:00
Alex Moreno	bbf027ede5	fix(operator): neq error	2024-06-03 15:01:06 +02:00
Alex Moreno	c445bcb0ba	build(operator): remove console.log	2024-06-03 14:39:32 +02:00
Alex Moreno	9775e808a2	build(operator): remove console.log	2024-06-03 14:37:24 +02:00
Alex Moreno	35ae728e81	build(operator): console.log	2024-06-03 14:19:41 +02:00
Alex Moreno	a73c98eebe	build(operator): console.log	2024-06-03 13:04:09 +02:00
Pablo Natek	b9b0651069	fix: refs #6404 fix agency service selection	2024-06-03 12:38:57 +02:00
Guillermo Bonet	4abede62ab	Merge branch '6701-clientRate' of https://gitea.verdnatura.es/verdnatura/salix into 6701-clientRate	2024-06-03 12:16:34 +02:00
Guillermo Bonet	d3584691fa	refactor: refs #6701 Minor change	2024-06-03 12:16:33 +02:00