Commit Graph

1673 Commits

Author SHA1 Message Date
Javi Gallego be56313706 feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data
gitea/salix/pipeline/pr-dev Build queued... Details
2025-01-08 11:58:50 +01:00
Javi Gallego 1816b6de67 feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables 2025-01-08 10:24:18 +01:00
Guillermo Bonet c83e6a8bbd Merge branch 'dev' into 8357-workerManaExcludedTriggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 12:28:23 +00:00
Ivan Mas 23fb04876c Merge branch 'dev' into 8073-newTableProductionCountryVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 12:16:20 +00:00
Guillermo Bonet 065f13557b feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-07 11:58:36 +01:00
Jon Elias 5221b9254a Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn 2025-01-02 08:39:57 +01:00
Carlos Satorres 81d3bce12a 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-02 06:23:35 +01:00
Ivan Mas 1cc6e37697 Merge branch 'dev' into 8073-newTableProductionCountryVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-31 07:36:21 +00:00
Javi Gallego 8ca5808554 fix: add isCustomInspectionRequired column to item table for customs inspection indication
gitea/salix/pipeline/head This commit looks good Details
2024-12-29 10:16:38 +01:00
Carlos Satorres 419815ff87 fix: refs #7917 fix back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 11:59:40 +01:00
Carlos Satorres afb01ed021 fix: refs #7917 fix route filter freeLancer
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-23 11:55:48 +01:00
Ivan Mas c59cae9f74 feat: refs #8073 new comment message
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 14:38:28 +01:00
Ivan Mas da4968f8b1 Merge branch 'dev' into 8073-newTableProductionCountryVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 12:55:23 +00:00
Javi Gallego a99d7adfe8 feat: refs #7924 add isCustomInspectionRequired field to item and update related logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-19 10:11:33 +01:00
Carlos Andrés 83d46d0a28 feat: refs #8324 country unique
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 17:58:30 +01:00
Ivan Mas 148ab57b1a feat: refs #8073 change names and primary key
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 15:06:49 +01:00
Ivan Mas 5620242d7e Merge branch 'dev' into 8073-newTableProductionCountryVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 12:30:16 +00:00
Ivan Mas 1ba23ad450 feat: refs #8073 #refs 8073 create vn.productionCountryVolume
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 13:27:43 +01:00
Ivan Mas ab5cf0f497 Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-18 11:17:14 +00:00
Ivan Mas af86bb24c4 Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-17 15:06:00 +00:00
Jorge Penadés 6476eb28e6 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-17 10:51:52 +01:00
Guillermo Bonet db2a102a88 Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3311
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-17 06:17:19 +00:00
Guillermo Bonet 4f4eb389c9 Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3310
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-17 06:15:29 +00:00
Juanjo Breso 6a3cbed3dd fix: refs #8174 fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 13:47:36 +01:00
Juanjo Breso 5a7ac8dcb3 fix: refs #8174 fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 13:44:58 +01:00
Juanjo Breso 48064d6393 fix: refs #8174 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-16 13:35:50 +01:00
Juanjo Breso de69a8db1d fix: refs#8174 fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 13:01:00 +01:00
Juanjo Breso 11db90c67c fix: refs#8174 fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 12:48:43 +01:00
Juanjo Breso deb1b68c49 fix: refs#8174 fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-16 12:47:47 +01:00
Juanjo Breso 7232bfb7a6 fix: 8174 pasar PIN a CHAR
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-16 12:42:08 +01:00
Juanjo Breso d03a2ced04 fix: refs8174 pasar a char el PIN
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 12:30:35 +01:00
Guillermo Bonet fda2c5725a refactor: refs #8262 Deprecated inventoryFailure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 12:23:02 +01:00
Guillermo Bonet 5346dd845e feat: refs #8218 Added time and code in mistakeType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 11:40:57 +01:00
Guillermo Bonet 71fb3996cd refactor: refs #7882 Added ACL's
gitea/salix/pipeline/head This commit looks good Details
2024-12-16 09:40:55 +01:00
Jorge Penadés 4612bf2e9b Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-16 09:35:23 +01:00
Guillermo Bonet d9a6e8a1c9 refactor: refs #7882 Added ACL's
gitea/salix/pipeline/head This commit looks good Details
2024-12-16 09:34:45 +01:00
Guillermo Bonet d42ff07547 feat: refs #8174 Changed datatype incompatibility access
gitea/salix/pipeline/head This commit looks good Details
2024-12-16 09:20:27 +01:00
Guillermo Bonet 57c3cc8546 feat: refs #8174 Created table sim
gitea/salix/pipeline/head This commit looks good Details
2024-12-16 09:01:10 +01:00
Guillermo Bonet e1db7a86f6 Merge branch 'dev' into 7882-locationiq
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-16 06:16:03 +00:00
Carlos Andrés ec2b6dd0c2 Actualizar db/versions/11327-maroonOak/00-firstScript.sql
gitea/salix/pipeline/head This commit looks good Details
2024-12-13 14:55:03 +00:00
Carlos Andrés 11827207ba Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3158
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-12-13 13:43:46 +00:00
Guillermo Bonet 781a8a4d10 refactor: refs #8205 Added geoFk Fk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-13 13:49:35 +01:00
Guillermo Bonet bfad016ec4 Merge branch 'dev' into 7882-osrm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-13 07:01:42 +01:00
Guillermo Bonet 95d7c7f227 Merge branch 'dev' into 7882-osrm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-12 14:06:44 +01:00
Jorge Penadés 8b37d99287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-12 09:58:42 +01:00
Pablo Natek 33287938ec Merge branch 'dev' into 7301-itemLastEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-12 08:34:54 +00:00
Carlos Satorres 2885facc01 Merge branch 'dev' into 7031-zonePrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-12 08:32:07 +00:00
Pablo Natek b5d4d31abb fix: refs #7301 update ACL insertion to use INSERT IGNORE and refine property value
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-12 09:25:51 +01:00
Guillermo Bonet bc072208d7 Merge branch 'dev' into 7882-osrm
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-11 11:44:23 +01:00
Juanjo Breso 0d26c52d5d Merge branch 'dev' into 8174-crearTablaSim
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-11 10:23:44 +00:00
Juanjo Breso 193e628118 Merge branch '8174-crearTablaSim' of https://gitea.verdnatura.es/verdnatura/salix into 8174-crearTablaSim
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-11 11:20:19 +01:00
Juanjo Breso 28ab6b2266 feat: refs #8174 fix 2024-12-11 11:20:15 +01:00
Jorge Penadés 2a2b4b139b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-11 09:13:50 +01:00
Guillermo Bonet c8ec94bed9 feat: refs #7882 Osrm service
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-11 09:03:14 +01:00
Alex Moreno bc3afa81e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-11 07:18:59 +01:00
Sergio De la torre 31692ddd3b fix: refs #8188 refs#8188 add IfNotExists
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-11 07:15:40 +01:00
Juanjo Breso ce58a9ab2c Merge branch 'dev' into 8174-crearTablaSim
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-10 12:49:44 +00:00
Juanjo Breso 8797635101 feat: refs #8174 fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-10 13:46:03 +01:00
Juanjo Breso 10558853a2 feat: refs #8174 create table simsupplier
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-10 13:41:45 +01:00
Carlos Satorres 535b04e1df Merge branch 'dev' of https: refs #7031//gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice 2024-12-10 12:44:52 +01:00
Juan Ferrer 06230d6b2a Merge pull request 'refs #8257 test into dev' (!3287) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3287
2024-12-10 10:22:54 +00:00
Sergio De la torre 699e56a64c Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #3279
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-10 06:05:11 +00:00
Jorge Penadés fcb842d948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-09 16:44:08 +01:00
Alex Moreno 94bc1241e5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-09 14:31:37 +01:00
Alex Moreno 9403588d7b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-09 14:30:03 +01:00
Jorge Penadés f69dfbd5aa refactor: refs #7936 remove schema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-09 14:03:45 +01:00
Jorge Penadés 7c2c56ed9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-09 13:50:01 +01:00
Carlos Satorres cb516d2022 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-09 13:22:10 +01:00
Guillermo Bonet e279cc4b47 feat: refs #7882 Added osrm service
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-09 10:01:59 +01:00
Guillermo Bonet 0bb9282953 feat: refs #7882 Added locationiq service
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-09 09:11:55 +01:00
Guillermo Bonet 8960b54664 feat: refs #7882 Added locationiq service
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-08 14:30:05 +01:00
Guillermo Bonet 04a96e87d6 refactor: refs #7882 Deleted quadminds files
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-08 07:28:29 +01:00
Sergio De la torre f8e5b76a6f feat: refs #8188 refs#8188 orderPicking
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-05 13:56:06 +01:00
Sergio De la torre 5db8ae53ac feat: refs #8188 refs#8188 orderPicking
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-12-05 12:39:20 +01:00
Carlos Satorres 483966501a fix: refs #7031 fix vnPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-05 08:31:09 +01:00
Jorge Penadés ea5bf85b55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-04 13:31:54 +01:00
Carlos Satorres fad6f33b7c fix: refs #7031 remove check 2024-12-04 12:33:17 +01:00
Alex Moreno fb13a9ff38 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-03 13:11:09 +01:00
Guillermo Bonet 6ae2853c4d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 12:09:16 +01:00
Guillermo Bonet c52e03c677 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 12:09:05 +01:00
Carlos Satorres e95b2a4496 Merge branch 'master' into hotfix-8222DeleteZoneSQL
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-03 07:50:08 +00:00
Carlos Satorres 0f0c8250a1 fix: fix sql
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-03 08:44:00 +01:00
Alex Moreno 6fcfb0208d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 08:29:21 +01:00
Alex Moreno 1ee6254976 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 08:24:49 +01:00
Jorge Penadés 9d26a9df7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-02 17:11:21 +01:00
Jorge Penadés 66a87f1997 feat: refs #6818 add current country prefix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:33:39 +01:00
Jorge Penadés fc4f5b55f7 fix: refs #6818 update country & channel 2024-12-02 12:59:37 +01:00
Ivan Mas bf0daf90db Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-02 11:56:58 +00:00
Carlos Satorres 4e6b83809b fix: workerHoliday hr
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 10:29:12 +01:00
Carlos Satorres cf862202ff fix: hotfix 7323 createAbsence
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-12-02 10:12:56 +01:00
Jorge Penadés c270ec3723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-29 09:41:08 +01:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 17:29:39 +01:00
Jorge Penadés ba51052d88 feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 17:52:45 +01:00
Carlos Andrés 15c755087c fix: refs #8221 duaInvoiceIn unique
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 14:28:50 +01:00
Jorge Penadés 4234e614fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 09:41:19 +01:00
Jorge Penadés 60a90bb090 fix: add IF NOT EXISTS to isRaid column in travel table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-27 09:38:33 +01:00
Guillermo Bonet 05671be60e Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3249
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-27 05:50:44 +00:00
Jorge Penadés 6ab25c2ff5 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 17:06:45 +01:00
Jorge Penadés a68e287b23 refactor: refs #7936 remove old trigger and add isRaid column to travel table
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-26 17:01:50 +01:00
Jorge Penadés 9a645c3288 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 16:56:39 +01:00