26683 Commits

All Branches

Search

Author	SHA1	Message	Date
Jose Antonio Tubau	e22a472e97	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes	2025-01-23 15:06:03 +01:00
Guillermo Bonet	ce8b707400	Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap	2025-01-23 14:55:01 +01:00
Guillermo Bonet	162cd4d69e	feat: refs #8227 Roadmap major changes	2025-01-23 14:54:59 +01:00
Javier Segarra	c3361fd49b	Merge branch 'dev' into 6321_negative_tickets	2025-01-23 14:48:28 +01:00
Jose Antonio Tubau	95329b7ddb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer	2025-01-23 14:43:17 +01:00
Jose Antonio Tubau	f165d17869	feat: refs #7322 add addressFk parameter to transferClient method and update tests	2025-01-23 14:26:02 +01:00
Alex Moreno	518a91cff2	fix: address isEqualizated can be null for trigger	2025-01-23 13:56:36 +01:00
Robert Ferrús	0038fabcc6	Merge branch 'dev' into 6822-entryTransfer	2025-01-23 12:00:13 +00:00
Robert Ferrús	d8847d3d09	feat: refs #6822 change request	2025-01-23 12:59:32 +01:00
Ivan Mas	13821b86ea	Merge pull request 'feat: refs #8342 deprecate sorter and splitLine tables' (!3377) from 8342-deprecateSorterAndSplitLineTables into dev ... Reviewed-on: #3377 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-23 11:40:55 +00:00
Ivan Mas	d98a867e12	Merge branch 'dev' into 8342-deprecateSorterAndSplitLineTables	2025-01-23 11:38:38 +00:00
Jorge Penadés	3ea67675da	feat: refs #7119 add VehicleType model and update vehicle permissions for delivery roles	2025-01-23 10:53:53 +01:00
Robert Ferrús	89de87c280	Merge pull request 'feat: refs #8398 sendCheckingPresence' (!3362) from 8398-mergeSendCheckingPresenceBack into dev ... Reviewed-on: #3362 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:51:03 +00:00
Carlos Satorres	10a6626a65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-23 10:26:15 +01:00
Jorge Penadés	0440582e2b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-23 10:09:47 +01:00
Robert Ferrús	2124a50dc2	Merge branch 'dev' into 6629-addressObservationBack2	2025-01-23 08:37:03 +00:00
Robert Ferrús	1816ff6cf4	Merge branch 'dev' into 6822-entryTransfer	2025-01-23 08:22:51 +00:00
Robert Ferrús	14e69c1c64	Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack	2025-01-23 08:21:32 +00:00
Guillermo Bonet	0177353b30	Merge branch 'dev' into 8227-roadmap	2025-01-23 08:19:08 +00:00
Jon Elias	64c697da6c	Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev ... Reviewed-on: #3378 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:05 +00:00
Alex Moreno	8ebf68cc4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-23 08:34:08 +01:00
Alex Moreno	200a7cf995	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-23 08:33:58 +01:00
Jon Elias	602e822599	refactor: refs #7184 deleted .value	2025-01-23 08:21:19 +01:00
Jon Elias	6d5a329b49	fix: refs #7184 fixed filter and test	2025-01-22 17:09:01 +01:00
Jon Elias	0eff155daf	refactor: refs #7184 created myteam filter and modified filters where it is used	2025-01-22 16:34:14 +01:00
Jose Antonio Tubau	d3b22ce6c9	Merge branch '8304-workerChangesAndFixes' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes	2025-01-22 16:17:38 +01:00
Jose Antonio Tubau	e05f740c3d	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-01-22 16:17:35 +01:00
Robert Ferrús	0f531d4b74	feat: refs #6822 change request	2025-01-22 13:24:06 +01:00
Robert Ferrús	e92e1d3a46	feat: refs #6822 refs #688 change request	2025-01-22 13:20:24 +01:00
Ivan Mas	43528a0a53	feat: refs #8342 deprecate sorter and splitLine tables	2025-01-22 13:04:16 +01:00
Jose Antonio Tubau	171296f2db	Merge branch 'dev' into 8304-workerChangesAndFixes	2025-01-22 11:43:14 +00:00
Jorge Penadés	49e08fbf45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle	2025-01-22 12:42:25 +01:00
Guillermo Bonet	052630d268	feat: refs #8227 Roadmap changes	2025-01-22 12:40:58 +01:00
Carlos Satorres	b47f175b67	Merge branch 'dev' into 7917-freelancerRoute2	2025-01-22 09:07:36 +00:00
Carlos Satorres	99b5433e62	fix: refs #7917 fix acls	2025-01-22 10:02:20 +01:00
Robert Ferrús	4a2508716d	Merge branch 'dev' into 6822-entryTransfer	2025-01-22 07:37:26 +00:00
Robert Ferrús	5a12a01565	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix	2025-01-22 07:51:41 +01:00
Javier Segarra	2a4bad5034	Merge branch 'dev' into 6321_negative_tickets	2025-01-21 23:43:07 +01:00
Javier Segarra	630d867787	fix: refs #7134 use vn_curdate	2025-01-21 23:09:07 +01:00
Jorge Penadés	2ae0097fa8	feat: refs #7119 add vehicle type management and delivery role permissions	2025-01-21 15:48:20 +01:00
Javier Segarra	294c2f832e	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 14:53:19 +01:00
Jose Antonio Tubau	7f5224ebca	feat: refs #8304 add ACL entries for Business and Worker models and update worker model relationships	2025-01-21 14:45:13 +01:00
Robert Ferrús	2e247c3ea5	Merge branch 'dev' into 8387-itemTagCrudModel	2025-01-21 14:14:27 +01:00
Robert Ferrús	3c89ea0df8	fix: refs #8387 local/es.json	2025-01-21 14:12:14 +01:00
Guillermo Bonet	482fe77159	feat: refs #8227 Roadmap changes	2025-01-21 14:03:50 +01:00
Carlos Satorres	d66b8f4963	fix: refs #7917 acls	2025-01-21 13:54:02 +01:00
Javier Segarra	dfcfd34202	Merge branch 'dev' into 7134-supplierBalance	2025-01-21 13:42:36 +01:00
Robert Ferrús	5ff27de72c	feat: refs #8387	2025-01-21 13:42:12 +01:00
Robert Ferrús	a40e9a547b	feat: refs #8387	2025-01-21 13:40:24 +01:00
Robert Ferrús	b4ac80615b	feat: refs #8387 fix traductions	2025-01-21 13:13:30 +01:00