Commit Graph

7255 Commits

Author SHA1 Message Date
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
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
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
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
Carlos Satorres 10a6626a65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness 2025-01-23 10:26:15 +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
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
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
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
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
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
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
Robert Ferrús cb065f42cd feat: refs #8401 change request
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 11:19:24 +01:00
Guillermo Bonet aa62f1d483 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-20 08:10:38 +01:00
Guillermo Bonet 9584ffcf5b feat: refs #7531 Added landed index
gitea/salix/pipeline/head This commit looks good Details
2025-01-20 08:10:12 +01:00
Guillermo Bonet 04180bf8da Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-20 07:52:04 +01:00
Guillermo Bonet 934507569e feat: refs #7531 Added comment
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 07:48:43 +01:00
Guillermo Bonet e6abb1d759 feat: refs #7531 Minor change
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 07:41:41 +01:00
Guillermo Bonet 044a22bc3e feat: refs #7531 Deleted address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-20 07:13:04 +01:00
Robert Ferrús ce96b0a819 Merge branch 'dev' into 6822-entryTransfer 2025-01-19 07:58:16 +00:00
Robert Ferrús 6c2071742c Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-19 07:38:25 +00:00
Robert Ferrús 5fe032ac75 feat: refs #8401 create triggers to itemTaxCountry
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-19 08:30:14 +01:00
Javi Gallego 4f68a7d262 feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-17 15:36:11 +01:00
Guillermo Bonet e636d43f04 feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-17 09:42:15 +01:00
Guillermo Bonet a666cfa4cd feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-17 09:40:07 +01:00
Javi Gallego d4b7d54052 Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3345
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-17 08:30:44 +00:00
Guillermo Bonet 1aa1fbda6c feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-17 08:10:26 +01:00
Guillermo Bonet 69b78b6bf1 feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2025-01-16 15:04:21 +01:00
Javi Gallego 125b7730e7 feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-16 12:56:04 +01:00
Robert Ferrús 81ab9fe0ba Merge branch 'dev' into 6822-entryTransfer 2025-01-16 09:06:42 +00:00
Robert Ferrús df3f4c3d2e Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev Build queued... Details
2025-01-16 08:59:15 +00:00
Javi Gallego b8dbaec46c Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3340
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-01-16 08:10:09 +00:00
Javi Gallego 69f1e76307 Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry model and queries' (!3354) from 8381-entryTemperature into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3354
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-16 06:56:42 +00:00
Robert Ferrús 4853e45051 feat: refs #8398 change merge.spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-16 07:29:40 +01:00
Ivan Mas 416e6c81f1 refactor: refs #8378 deprecate bi.f_tvc
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-15 15:22:48 +01:00
Carlos Satorres 516147b8bb fix: refs #7917 fix acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-15 13:04:49 +01:00
Guillermo Bonet c2ca9cfbe5 feat: refs #7531 Added address_hasDelivery
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-15 12:26:16 +01:00
Jon Elias d0df1c1f42 Merge pull request '#8247: Added new acl for VnUser model' (!3358) from 8247-CreateNewAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3358
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-01-15 10:51:25 +00:00
Carlos Satorres 6ef0d2625d 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-15 08:40:16 +01:00
Carlos Satorres d39c063786 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-15 06:31:00 +01:00
Javi Gallego 44765b5a64 feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-14 09:07:00 +01:00
Robert Ferrús 277cd80f50 Merge branch 'dev' into 6822-entryTransfer 2025-01-14 07:13:52 +00:00
Alex Moreno 48ad72ac98 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-14 08:00:08 +01:00
Alex Moreno 6aa898ee59 build: refs #8389 dump db
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-14 07:39:52 +01:00
Jon Elias 29e6a99983 feat: refs #8247 added new acl for VnUser model
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-14 07:36:23 +01:00
Carlos Satorres 07b07611be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2 2025-01-14 07:21:13 +01:00
Carlos Satorres 60c1daa47c Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-14 07:18:09 +01:00
Carlos Satorres 86dde8dfb3 fix: refs #7917 fix pr 2025-01-14 07:18:05 +01:00
Javier Segarra 9bfc2a01c5 perf: refs #7134 sql style
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-13 23:09:13 +01:00
Javier Segarra f6c3893d00 feat: refs #7134 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-13 12:41:36 +01:00
Javier Segarra f207222b47 Merge branch 'dev' into 7134-supplierBalance 2025-01-13 11:56:25 +01:00
Javi Gallego c15a3bfe50 feat: refs #8381 add initial and final temperature fields to entry model and queries
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-13 11:28:30 +01:00
Alex Moreno 951376af2f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-01-13 09:19:03 +01:00
Carlos Satorres 978914aa71 Merge branch 'dev' into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-13 07:50:12 +00:00
Carlos Satorres d547456d22 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-13 07:14:59 +00:00
Robert Ferrús 1c30de5eee Merge branch 'dev' into 7584-workerTimeControl_afterDelete
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-10 09:36:09 +00:00
Robert Ferrús bdaaffbbd7 feat: refs #7584 changes request
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-10 10:33:19 +01:00