Commit Graph

4294 Commits

Author SHA1 Message Date
Pablo Natek ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-04-09 15:04:04 +02:00
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +02:00
Ivan Mas 521033edd2 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:54:41 +00:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Guillermo Bonet 0e2e68488d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:08:54 +02:00
Jorge Penadés 9a28a59d00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:11:30 +02:00
Alex Moreno c69a4e1c98 Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-09 08:21:20 +00:00
Guillermo Bonet f8be6be7a3 feat: refs #6636 Minor change
gitea/salix/pipeline/head This commit looks good Details
2024-04-09 10:10:11 +02:00
Guillermo Bonet c42e00f11e Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 07:43:51 +00:00
Pablo Natek 7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:42:39 +02:00
Robert Ferrús 4a31fe29b8 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 05:40:01 +00:00
Sergio De la torre 75293fbb9a refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-09 07:38:28 +02:00
Pablo Natek 1c064c7bfc Merge branch 'dev' into 6021-floranet_RedMoon
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 05:23:34 +00:00
Alex Moreno 0ecc09fcc4 Merge branch 'dev' into 6551-workerDms_refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 12:50:05 +00:00
Alex Moreno 9134216332 refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-08 14:46:35 +02:00
Pako Natek 2eb229adf7 catalogue fixed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 14:30:46 +02:00
Robert Ferrús 6ba43a3c6d Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 11:29:09 +00:00
Juan Ferrer 75bed03ab7 Merge pull request 'test' (!2266) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2266
2024-04-08 11:09:05 +00:00
Juan Ferrer ccc644c298 fix: refs #6021 dump, floranet schema added
gitea/salix/pipeline/pr-test Build started... Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-08 13:07:04 +02:00
Carlos Andrés 5558e92b1e Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2163
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-08 10:36:21 +00:00
Robert Ferrús 0c5b9e3544 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 10:28:02 +00:00
Guillermo Bonet 0b96471c7d feat: refs #6714 Added businessType zone_getAddresses
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 09:27:07 +02:00
Robert Ferrús 657150a9a7 feat: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 08:57:56 +02:00
Robert Ferrús 1e8e6a67a3 Merge branch 'dev' into 7150-greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 06:39:22 +00:00
Robert Ferrús 5517c29c1c fet: refs #7150 greuge_dif_porte_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 08:37:37 +02:00
Guillermo Bonet e27279e20e Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 05:18:36 +00:00
Alex Moreno 93000aaecf Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:20:09 +00:00
Carlos Andrés cedfdbb421 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 13:22:54 +02:00
Robert Ferrús cf5113c5a6 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 10:23:55 +00:00
Guillermo Bonet 6c1e44638e feat: refs #6636 Added getEnumValue method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 11:01:00 +02:00
Alex Moreno 0af3713a07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 10:33:47 +02:00
Alex Moreno 2f4cd2bc7b refs #7167 fix: acl mailAlias
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-05 10:05:51 +02:00
Alex Moreno ed95545de6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump 2024-04-05 10:00:34 +02:00
Javier Casado 6f2b3ea059 Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:55:46 +00:00
Guillermo Bonet 0cd4013f5e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:51:19 +02:00
Guillermo Bonet 7ea917dc4d hotfix: #6875 packing DEFAULT 1
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:49:37 +02:00
Guillermo Bonet ac658fb6af Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 05:29:26 +00:00
Carlos Andrés fe0afe30bf fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 17:50:39 +02:00
Sergio De la torre 2ed5237568 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:45:20 +00:00
Alex Moreno a6e4bdd7ac refs #7167 deploy: dump
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-04 15:02:41 +02:00
jcasado 84e6e7f7bf refs #6641 test fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 14:53:26 +02:00
Guillermo Bonet fcb4fe92e8 Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 12:14:23 +00:00
Guillermo Bonet f44e19cae3 feat: refs #6636 Modified updateClaim, model and tests
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-04 14:15:20 +02:00
jcasado f9ef45f1d9 refs #6324 remove doc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 14:01:30 +02:00
jcasado f5943e4445 refs #6324 remove column and dependencies
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:57:23 +02:00
Robert Ferrús 9801279370 refs #169673 item_getSimilar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:28:29 +02:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 11:30:03 +02:00
Guillermo Bonet 8702a6808c hotfix: #7024 Modified duaInvoiceInBooking 2024-04-04 11:25:03 +02:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-03 16:24:45 +02:00
Guillermo Bonet 064d6dbb64 feat: refs #6829 Added two indexes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 11:57:28 +02:00
Ivan Mas b9520b53ab hotfix_clientsDisable
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 10:03:59 +02:00
Robert Ferrús 448b8e6ea3 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 07:50:06 +00:00
Pako Natek cb745b0f4d release_lock
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-01 14:21:34 +02:00
Pako Natek bfa59bdcea release_lock 2024-04-01 14:20:25 +02:00
Pako Natek 3a1f5109d9 lines and volume
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-01 11:58:16 +02:00
Pako Natek 7c4fc31b50 version productionConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:55:21 +02:00
Pako Natek df911b9b75 fora comentaris
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:47 +02:00
Pako Natek 547df47049 delete old proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:47:16 +02:00
Pako Natek 98b1e933f7 prova
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:46:07 +02:00
Pako Natek 9aae9677e6 modificaciones
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-01 08:43:26 +02:00
Jorge Penadés df271a242d fix: refs #6492 procedure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 15:03:33 +01:00
Pako Natek c942786783 pruebas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:54:30 +01:00
Jorge Penadés e851c3b481 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 14:15:31 +01:00
Robert Ferrús 9a7bcdf104 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 13:26:09 +01:00
Pako Natek d031fef1a0 Merge branch 'dev' into 6358-boxPicking_blueMammut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 11:47:40 +00:00
Pako Natek 1d906c993b portes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 12:43:13 +01:00
Pako Natek b445d745a5 cambios 2024-03-28 11:40:18 +01:00
Sergio De la torre b62905c5ef Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 10:08:56 +00:00
Robert Ferrús 1c18b09531 fix: company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:47:47 +01:00
Robert Ferrús 063745167e fix: modificar company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-28 10:30:41 +01:00
Carlos Satorres 9f438751d3 Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 08:13:37 +00:00
Javi Gallego 585dd70a60 Merge pull request 'feat: #7117 company_getSuppliersDebt devolver el pais del banco' (!2211) from 7117 into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2211
2024-03-28 08:02:30 +00:00
Javi Gallego 699883182c Merge pull request '7120-specialPrice' (!2213) from 7120-specialPrice into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #2213
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-28 08:01:45 +00:00
Javi Gallego 6596efdc91 Merge pull request '7013-solunionRiskRequest' (!2190) from 7013-solunionRiskRequest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2190
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-28 08:01:28 +00:00
Pako Natek 8396b8cd64 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:19:12 +00:00
Alex Moreno f1931fce69 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-28 08:19:26 +01:00
Alex Moreno 0b764ebc1b Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:12:51 +00:00
Robert Ferrús 1f819ab16a fix: riesgos
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 19:02:05 +01:00
Carlos Andrés 30e1acedf3 Merge pull request 'fix: TRIGGER incorrecto en travel refs #7148' (!2223) from 7148-TRIGGER-en-travel-incorrectos into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2223
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-27 17:59:51 +00:00
Carlos Satorres f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 16:50:03 +00:00
Robert Ferrús ed1bc06301 feat: refs #7150
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 17:30:52 +01:00
Robert Ferrús 9667d31441 feat: refs #7150
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 17:00:27 +01:00
Juan Ferrer f917a9895b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-03-27 16:18:22 +01:00
Juan Ferrer 2a8256319f fix: #6085 Old db/changes directory removed 2024-03-27 16:18:21 +01:00
Carlos Satorres 97b2500eea refs #6074 fix comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 14:24:58 +01:00
Carlos Andrés 4ac418111b fix: TRIGGER incorrecto en travel refs #7148
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 14:12:34 +01:00
Pako Natek 09c9a3d7ef vRest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 12:25:57 +01:00
Pako Natek 8f872b4bbb Merge branch '6358-boxPicking_YellowZebra' of https://gitea.verdnatura.es/verdnatura/salix into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 12:22:26 +01:00
Pako Natek c9431e605e second proposals 2024-03-27 12:22:22 +01:00
Robert Ferrús c3e3d72182 Merge branch 'master' into 7141-sale_replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 10:53:31 +00:00
Alex Moreno b532ce3f77 hotFix: recreate addressTaxArea
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 08:30:45 +01:00
Javi Gallego fe0a1ad7be feat: #7013 purge productionError
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 08:12:05 +01:00
Javi Gallego 4b41ac68aa feat: #7013 en mayusculas y con espacio en comentarios
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 08:05:33 +01:00
Pako Natek b1a91ab7d3 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:55:41 +00:00
Alex Moreno 5a19c1ebb1 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:30:00 +00:00
Javi Gallego c3aa4c9355 Merge branch 'dev' into 6782-productionError_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:22:48 +00:00
Javi Gallego 2881409b1e feat: #7120 con fecha por defecto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:19:51 +01:00
Sergio De la torre 43b042a616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:08:47 +01:00
Javier Segarra e22122e577 Merge branch 'dev' into #5858_fix_extension
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 05:52:52 +00:00
Javier Segarra fe042e4d86 refs #5858 fix: test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 06:50:22 +01:00