26496 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	9f302fac24	Merge branch 'test' into dev	2025-02-06 13:47:36 +01:00
Guillermo Bonet	92ca3a2582	Merge branch 'master' into test	2025-02-06 13:47:17 +01:00
Carlos Andrés	2e8e2329ec	fix: refs #8535 deploy	2025-02-06 13:44:22 +01:00
Robert Ferrús	73a7a4cbd3	Merge pull request 'feat: refs #8487 delete appointment from travel view' (!3421) from 8487-modifyTravelView into test ... Reviewed-on: #3421 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-02-06 12:32:12 +00:00
Ivan Mas	f12a690bef	feat: refs #8487 delete appointment from travel view	2025-02-06 13:28:44 +01:00
Guillermo Bonet	beed658f61	fix: refs #8535 deploy	2025-02-06 13:21:32 +01:00
Guillermo Bonet	110a5212c0	fix: refs #8535 deploy	2025-02-06 12:55:01 +01:00
Guillermo Bonet	e9e3a5f128	Merge pull request 'feat: refs #8535 sistema de warnings' (!3418) from 8535-log-mandate into master ... Reviewed-on: #3418 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-06 11:18:57 +00:00
Carlos Andrés	fa5888f931	Merge branch 'master' of https: refs #8535//gitea.verdnatura.es/verdnatura/salix into 8535-log-mandate	2025-02-06 11:53:57 +01:00
Carlos Andrés	9b2c0f1c48	feat: refs #8535 log table mandate	2025-02-06 11:46:39 +01:00
Jorge Penadés	97be16b344	Merge pull request 'feat: refs #7119 add VehicleState model with data source configuration' (!3328) from 7119-createVehicle into dev ... Reviewed-on: #3328 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 09:24:09 +00:00
Jorge Penadés	9ba517b648	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-02-06 10:20:22 +01:00
Juanjo Breso	b0dd1d4fff	Merge pull request 'feat: refs #269518 isFragile item and itemType' (!3419) from 269518-ticket_getWarnings_isFragile into master ... Reviewed-on: #3419 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-06 08:18:27 +00:00
Juanjo Breso	8df36f296a	feat: refs #269518 isFragile item and itemType	2025-02-06 09:11:48 +01:00
Carlos Andrés	37b735b988	feat: refs #8535 sistema de warnings	2025-02-05 17:21:36 +01:00
Jose Antonio Tubau	abf73f5705	Merge pull request 'feat: refs #8304 add ACL entry for WorkerDms with high privileges' (!3353) from 8304-workerChangesAndFixes into dev ... Reviewed-on: #3353 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-05 12:23:04 +00:00
Jose Antonio Tubau	0a25595ed5	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-02-05 13:00:44 +01:00
Alex Moreno	1ee5af96a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-05 11:16:32 +01:00
Alex Moreno	e89c12f753	fix: refs #7943 better "relation": "business",	2025-02-05 10:52:20 +01:00
Alex Moreno	f216166806	fix: refs #7943 better "relation": "business",	2025-02-05 10:16:14 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... Reviewed-on: #2990 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-05 06:51:54 +00:00
Jon Elias	55063e488c	Merge pull request '#7127 modify days when adding lines to a claim' (!3195) from 7127-ModifyDaysToAddSales into dev ... Reviewed-on: #3195 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 13:45:20 +00:00
Alex Moreno	da36016f5b	build: init version	2025-02-04 14:43:31 +01:00
Alex Moreno	4b903c5bad	Merge pull request '8524-devToTest' (!3415) from 8524-devToTest into test ... Reviewed-on: #3415 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-04 13:42:14 +00:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Jon Elias	5258e5ba2a	refactor: refs #7127 modified checkAccessAcl instead of using VnRole	2025-02-04 13:55:01 +01:00
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Guillermo Bonet	3bb0d52dde	Merge pull request 'fix: refs #8515 Fix test optimizePriority' (!3414) from 8515-fixTestOptimizePriority into dev ... Reviewed-on: #3414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 11:39:41 +00:00
Guillermo Bonet	ee5a93ba81	Merge branch 'dev' into 8515-fixTestOptimizePriority	2025-02-04 10:54:06 +00:00
Guillermo Bonet	879d18dd73	Merge pull request 'feat: refs #8227 Roadmap changes' (!3372) from 8227-roadmap into dev ... Reviewed-on: #3372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 07:59:23 +00:00
Guillermo Bonet	eb9d3a7b21	refactor: refs #8227 Requested changes	2025-02-04 08:27:21 +01:00
Guillermo Bonet	49e5da5547	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:48:56 +01:00
Guillermo Bonet	fb8973a358	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:47:28 +01:00
Guillermo Bonet	d6bd60f181	Merge branch 'dev' into 8227-roadmap	2025-02-04 06:18:34 +00:00
Guillermo Bonet	9cecdab5a8	refactor: refs #8227 Fix tests	2025-02-04 07:17:11 +01:00
Sergio De la torre	8240dd655d	Merge pull request 'feat: refs #7412 notificationMisAllocation' (!3412) from 7412_misallocationNotification into dev ... Reviewed-on: #3412 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-03 15:23:37 +00:00
Sergio De la torre	9adb160f2d	feat: refs #7412 refs#7569 sendEmailNotificationChangeText	2025-02-03 16:14:48 +01:00
Sergio De la torre	ef5fb111b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification	2025-02-03 16:13:55 +01:00
Guillermo Bonet	f0e50943d2	Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap	2025-02-03 13:23:24 +01:00
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +01:00
Sergio De la torre	6b9c8300fb	feat: refs #7412 notificationMisAllocation	2025-02-03 12:41:56 +01:00
Guillermo Bonet	247bdc7295	Merge branch 'dev' into 8227-roadmap	2025-02-03 09:59:03 +00:00
Guillermo Bonet	c1dd0eeb32	refactor: refs #8512 Add 'master' branch check in description condition	2025-02-03 10:54:17 +01:00
Javi Gallego	55ec4aaba1	Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ... Reviewed-on: #2890 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-03 08:12:36 +00:00
Javi Gallego	adba4765ed	refactor: refs #7686 update alert level conditions to only check for 'FREE'	2025-02-03 09:07:08 +01:00
Jose Antonio Tubau	ae2a68423a	Merge pull request 'refactor: refs #7414 update Spanish translation for 'total' to 'importe'' (!3397) from 7414-ticketLogChanges into dev ... Reviewed-on: #3397 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 06:05:34 +00:00
Jose Antonio Tubau	b2e5ba14c6	Merge pull request 'refactor: refs #7537 address display all digits in black in driver route report' (!3408) from 7537-modifyDriverRoutePdf into dev ... Reviewed-on: #3408 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 05:59:22 +00:00
Jose Antonio Tubau	ca5668f941	Merge branch 'dev' into 7414-ticketLogChanges	2025-02-03 05:57:16 +00:00
Jose Antonio Tubau	9f8da1d64e	Merge branch 'dev' into 7537-modifyDriverRoutePdf	2025-02-03 05:52:58 +00:00
Guillermo Bonet	12604d0f67	Merge branch 'dev' into 8227-roadmap	2025-01-31 14:27:18 +01:00