22993 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Guillermo Bonet	5ab8e79dde	Merge branch 'dev' into 6701-clientRate	2024-06-03 10:11:56 +00:00
Guillermo Bonet	85d68890b8	refactor: refs #6701 New table clientRate	2024-06-03 12:11:26 +02:00
Jorge Penadés	705a873d53	Merge pull request '#6889 drop addSaleByCode' (!2470) from 6889-dropAddSaleByCode into dev ... Reviewed-on: #2470 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-03 10:09:06 +00:00
Guillermo Bonet	b8e95c0284	refactor: refs #7519 Minor change	2024-06-03 11:46:52 +02:00
Guillermo Bonet	8cef8eace7	refactor: refs #7519 Minor change	2024-06-03 11:41:09 +02:00
Guillermo Bonet	fd237b6d35	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-03 11:40:50 +02:00
Guillermo Bonet	4703ebbdf3	refactor: refs #7519 Minor change	2024-06-03 11:38:09 +02:00
Alex Moreno	349914743c	build: increase version	2024-06-03 10:48:21 +02:00
Carlos Satorres	ed213da040	Merge pull request 'fix acls' (!2535) from hotfix-logisticRefundACL into master ... Reviewed-on: #2535 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-03 08:45:23 +00:00
Jorge Penadés	39dcb7d6a8	fix: refs #6889 check if has collection or sectorCollection	2024-06-03 10:30:20 +02:00
Pablo Natek	b1a4b42028	fix: refs #6404 change db language on local	2024-06-03 10:29:38 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jon Elias	8ce4b7c2e4	Merge branch 'dev' into 5447-TravelExtraCommunity	2024-06-03 08:15:23 +00:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	0448f7b039	Merge pull request '#6600 add column' (!2378) from 6600-createItemPhotoComment into dev ... Reviewed-on: #2378 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-03 08:06:57 +00:00
Jon Elias	594702121c	Merge branch '5447-TravelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-03 10:04:39 +02:00