Commit Graph

7329 Commits

Author SHA1 Message Date
Jorge Penadés 2f364ebc76 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-29 16:40:37 +01:00
Javier Segarra efe0aa708f Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 15:13:49 +00:00
Ivan Mas 70d286df80 feat: refs #8487 deprecate travel.appointment
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 14:59:19 +01:00
Jorge Penadés a463a8f4d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-29 14:49:07 +01:00
Guillermo Bonet a14d6227a1 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-29 14:15:22 +01:00
Robert Ferrús 35e72c90d3 Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:46:23 +00:00
Robert Ferrús d536690197 feat: refs #6822 changes request
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 12:43:46 +01:00
Pako Natek af5b4981df Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:16:41 +00:00
Pako Natek 597615facb fix(agencyIncomingForeign): refs #8408 version changes rolled back
gitea/salix/pipeline/pr-dev This commit looks good Details
Refs: #8408
2025-01-29 12:15:04 +01:00
Pako Natek 4e2a6d275a fix(travel): refs #8408 trigger restriction for wrong availabled value
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:12:23 +01:00
Pako Natek 0de9c3c172 feat(available): refs #8408 available refreshing now includes time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:03:55 +01:00
Jorge Penadés 2b443266b2 Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-29 11:51:21 +01:00
Carlos Satorres 17a27060c3 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 10:11:50 +00:00
Juan Ferrer 9a6b89793c fix: refs #8494 Fix ZoneIncluded logs
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/pr-master Build started... Details
2025-01-29 10:35:06 +01:00
Javier Segarra f2be71be6c fix: refs #7134 replace value by util.VN_CURDATE() 2025-01-29 09:54:05 +01:00
Guillermo Bonet 56b0baebaa feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 07:53:41 +01:00
Javier Segarra a63ca1b3c5 Merge branch 'dev' into 7134-supplierBalance 2025-01-28 23:39:03 +01:00
Ivan Mas dfcc155ef9 Merge branch 'dev' into 8312-newPackagingColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 18:14:38 +00:00
Ivan Mas 821e2cbe4d feat: refs #8312 new column packaging.rejectCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 19:11:56 +01:00
Carlos Andrés 801629c8db fix: refs #8492 Sage invoiceInTax Check VAT
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 18:04:02 +01:00
Carlos Satorres b383725f9f fix: refs #7917 fix user tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 12:56:30 +01:00
Carlos Satorres 3c16914135 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 11:43:25 +00:00
Carlos Satorres b14beb83f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 11:55:27 +01:00
Jorge Penadés 2eabfaaa8f 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-28 11:44:59 +01:00
Robert Ferrús 8482743baf feat: refs #6822 ACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 11:26:48 +01:00
Javier Segarra 9419eada64 Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev Build queued... Details
2025-01-28 08:46:17 +01:00
Javi Gallego 0def25ad15 Merge branch 'dev' into 7686-onPrevious 2025-01-28 08:28:16 +01:00
Alex Moreno d75d4f82f2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-28 08:16:59 +01:00
Alex Moreno f4b7683609 build: refs #8452 dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-28 08:10:23 +01:00
Javi Gallego c73af0a44b fix: specify database context in agencyIncoming foreign key deletion SQL
gitea/salix/pipeline/head This commit looks good Details
2025-01-28 08:09:18 +01:00
Javi Gallego b8f9dc7ad7 fix: correct SQL syntax for deleting orphaned agencyIncoming records
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 16:37:17 +01:00
Javi Gallego 8cbe64eedd fix: remove orphaned agencyIncoming records with null agencyModeFk
gitea/salix/pipeline/head There was a failure building this commit Details
2025-01-27 16:34:28 +01:00
Javi Gallego 1261722943 Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-27 15:12:51 +00:00
Javi Gallego 857874c4c6 refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 15:43:26 +01:00
Javi Gallego ba2333f180 refactor: refs #7686 remove unused stored procedures for item shelving and ticket delay
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 15:05:27 +01:00
Alex Moreno 9ba9338f9d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 14:39:58 +01:00
Alex Moreno bbebff7ea9 fix: prevent slow update
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-27 14:37:39 +01:00
Carlos Satorres d9d80a0e43 Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 11:46:31 +01:00
Carlos Satorres d659e05ce8 fix: refs #7917 remove update 2025-01-27 11:46:29 +01:00
Robert Ferrús 5a449c66ce Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 10:26:48 +00:00
Guillermo Bonet a948442e13 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:24:05 +01:00
Carlos Satorres 06cd177d31 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 10:23:57 +00:00
Guillermo Bonet aecf529976 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:23:55 +01:00
Guillermo Bonet cd8e04d648 refactor: refs #7568 ticket_doCmr ignore alertLevel
gitea/salix/pipeline/head This commit looks good Details
2025-01-27 11:22:21 +01:00
Guillermo Bonet 75168eef91 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 11:04:34 +01:00
Carlos Satorres c4a7fbf6e8 fix: refs #7917 fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 10:57:54 +01:00
Robert Ferrús 6f8cbc1017 Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 08:51:03 +00:00
Carlos Satorres 62f26ec8c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2 2025-01-27 09:24:38 +01:00
Guillermo Bonet 609df98614 feat: refs #8227 Added grants
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-27 09:02:37 +01:00
Robert Ferrús b9206c44bb Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-27 06:17:49 +00:00
Jorge Penadés 2346205072 Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-24 16:14:09 +01:00
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
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 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
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
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
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 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
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 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
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
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
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 99b5433e62 fix: refs #7917 fix acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-22 10:02:20 +01:00
Javier Segarra 630d867787 fix: refs #7134 use vn_curdate
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 23:09:07 +01:00
Jorge Penadés 2ae0097fa8 feat: refs #7119 add vehicle type management and delivery role permissions
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 15:48:20 +01:00
Javier Segarra 294c2f832e Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
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
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 14:45:13 +01:00
Robert Ferrús 2e247c3ea5 Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 14:14:27 +01:00
Guillermo Bonet 482fe77159 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 14:03:50 +01:00
Carlos Satorres d66b8f4963 fix: refs #7917 acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 13:54:02 +01:00
Javier Segarra dfcfd34202 Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 13:42:36 +01:00
Jorge Penadés 55a0a5bc9a feat: refs #7119 add delivery role permissions
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 11:52:09 +01:00
Robert Ferrús c727586855 feat: refs #8387 add column validationRegex
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 11:25:03 +01:00
Robert Ferrús 77606468fd Merge branch 'master' into 8401-itemTaxCountryTrigger
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-21 10:07:28 +00:00
Robert Ferrús 7292ac48b2 Merge branch 'dev' into 6822-entryTransfer 2025-01-21 08:48:24 +00:00
Robert Ferrús 785a10a26a feat: refs #8447 create tables tag
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-21 09:34:56 +01:00
Javi Gallego a46ec1bc8d feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-21 08:13:56 +01:00
Javi Gallego 8e21ca5293 Merge branch 'dev' into 8381-thermographTravel 2025-01-21 07:53:38 +01:00
Jorge Penadés 3d2a7cfb66 feat: refs #7119 update ACLs for vehicle management and refine vehicle filter logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-20 18:05:33 +01:00
Jorge Penadés 946d08e543 feat: refs #7119 update ACLs and remove unused models for vehicle management
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-20 17:29:18 +01:00
Guillermo Bonet 477646ba31 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-20 14:43:14 +01:00
Jorge Penadés ecedc84164 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-20 14:28:30 +01:00
Carlos Satorres a98967bac1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2 2025-01-20 12:38:46 +01:00
Robert Ferrús 316a17304f feat: refs #8401 restriction itemFk
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 12:26:29 +01:00
Robert Ferrús 4b78c12ee4 Merge branch 'master' into 8401-itemTaxCountryTrigger
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 10:26:14 +00:00