22078 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
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
Carlos Andrés	9a7074d600	hotfix: ledger_next transacciones refs #7523	2024-06-03 20:16:27 +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
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
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
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
Jorge Penadés	1382b24c1d	refactor: refs #6600 add space	2024-06-03 09:38:35 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00