Commit Graph

26496 Commits

Author SHA1 Message Date
Guillermo Bonet 75b0589561 feat: refs #8227 Undo vehicle_checkNumberPlate change and triggers checks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 12:34:08 +01:00
Robert Ferrús ad05641520 Merge pull request 'feat: refs #8077 sumDefaulter' (!3367) from 8077-sumDefaulterBackFix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3367
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-24 10:55:32 +00:00
Robert Ferrús b09e3398ff Merge branch 'dev' into 8077-sumDefaulterBackFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 10:46:16 +00:00
Guillermo Bonet 57ed161d27 Merge branch 'dev' into 8205-geoFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 10:31:02 +00:00
Guillermo Bonet e9f1e28ac0 feat: refs #8227 Added roadmap_cloneDay
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 11:20:16 +01:00
Jorge Penadés 3fba81b41e feat: refs #7119 add 'id' filter option and enhance bank policy model with dmsFk field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 10:46:35 +01:00
Jorge Penadés f8e4561a59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 09:37:10 +01:00
Jon Elias 6da004e7cf fix: fixed shipped date when it is null
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-24 09:29:58 +01:00
Sergio De la torre bb35cbece0 Merge pull request '6861-itemShelvingSaleWithUser' (!3381) from 6861-itemShelvingSaleWithUser into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3381
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-01-24 08:23:13 +00:00
Jon Elias f3cb2bd200 Merge pull request 'Fix[priceDifference]: Fixed shipped field' (!3380) from Fix-priceDifferenceError into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3380
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-01-24 07:33:30 +00:00
Sergio De la torre 5dd60bd912 fix: refs #6861 refs#6861 showUsername
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-24 08:28:15 +01:00
Sergio De la torre df97534882 fix: refs #6861 refs#6861 showUsername 2025-01-24 08:25:44 +01:00
Jon Elias 603e3e32c4 fix: shipped field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 07:39:18 +01:00
Guillermo Bonet 306eb6a059 feat: refs #8227 Roadmap fix version
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-24 07:26:25 +01:00
Guillermo Bonet a6908aa8c0 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 06:00:37 +00:00
Jorge Penadés 3a449896cd feat: refs #7119 update vehicle permissions and enhance vehicle model with new fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 18:02:53 +01:00
Javi Gallego e4733b5102 Merge pull request 'hotFix: address isEqualizated can be null for trigger' (!3379) from hotFix_addressIsEqualizated into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3379
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-01-23 14:18:04 +00:00
Jose Antonio Tubau e22a472e97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
Jose Antonio Tubau 95329b7ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 14:43:17 +01:00
Jose Antonio Tubau f165d17869 feat: refs #7322 add addressFk parameter to transferClient method and update tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-23 14:26:02 +01:00
Alex Moreno 518a91cff2 fix: address isEqualizated can be null for trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-23 13:56:36 +01:00
Robert Ferrús 0038fabcc6 Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 12:00:13 +00:00
Robert Ferrús d8847d3d09 feat: refs #6822 change request
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 10:09:47 +01:00
Robert Ferrús 2124a50dc2 Merge branch 'dev' into 6629-addressObservationBack2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:37:03 +00:00
Robert Ferrús 1816ff6cf4 Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:22:51 +00:00
Robert Ferrús 14e69c1c64 Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:21:32 +00:00
Guillermo Bonet 0177353b30 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:19:08 +00:00
Jon Elias 64c697da6c Merge pull request '#7184: Created myTeam filter' (!3378) from 7184-MyTeamFilter into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
2025-01-23 08:34:08 +01:00
Alex Moreno 200a7cf995 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-01-23 08:33:58 +01:00
Jon Elias 602e822599 refactor: refs #7184 deleted .value
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-23 08:21:19 +01:00
Jon Elias 6d5a329b49 fix: refs #7184 fixed filter and test
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 17:09:01 +01:00
Jon Elias 0eff155daf refactor: refs #7184 created myteam filter and modified filters where it is used
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 13:24:06 +01:00
Robert Ferrús e92e1d3a46 feat: refs #6822 refs #688 change request
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 13:20:24 +01:00
Ivan Mas 43528a0a53 feat: refs #8342 deprecate sorter and splitLine tables
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 13:04:16 +01:00
Jose Antonio Tubau 171296f2db Merge branch 'dev' into 8304-workerChangesAndFixes
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-22 12:40:58 +01:00
Carlos Satorres b47f175b67 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 09:07:36 +00:00