Commit Graph

582 Commits

Author SHA1 Message Date
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
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
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
Robert Ferrús 1f819ab16a fix: riesgos
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-27 19:02:05 +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
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
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
Juan Ferrer 2604fb28f8 Merge pull request 'test' (!2217) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2217
2024-03-26 16:04:28 +00:00
Juan Ferrer 9aa46c3a90 fix: HOTFIX PROC vn.collection_new release lock on error
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-03-26 16:50:15 +01:00
Robert Ferrús 8e2770aa56 feat: refs #7141
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-26 16:27:49 +01:00
Pako Natek 861d9b3135 javi's proposals
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:59:06 +01:00
Pako Natek 5d813784b4 Merge branch 'dev' into 6358-boxPicking_YellowZebra
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:17:34 +01:00
Javi Gallego 1472fc6fc2 feat: #6782 sin as
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 14:02:47 +01:00
Jorge Penadés 94f6d20bb1 feat: refs #6942 add Insert
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 13:41:53 +01:00
Jorge Penadés 634bfc5091 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008 2024-03-26 12:30:07 +01:00
Javi Gallego 57c42b6808 feat: #7117 añado NOT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 12:16:03 +01:00
Javi Gallego 587dd8f4d9 feat: #7013 sin tabular
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 12:12:27 +01:00
Javi Gallego c99de95b33 feat: #7120 con tabla temporal
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 12:07:23 +01:00
Javi Gallego 04117d2c27 fix: #7013 quito vn.
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 10:13:10 +01:00
Javi Gallego b978833a64 fix: #6782 with con esquema
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 09:46:53 +01:00
Javi Gallego 7f14211b80 feat: #7117 company_getSuppliersDebt devolver el pais del banco
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 09:27:30 +01:00
Javi Gallego e47b8c1056 fix: solo un trabajador por fallo
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 08:52:01 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-26 08:18:47 +01:00
Robert Ferrús dd977fab83 fix: refs #7141 catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-25 14:56:12 +01:00
Pako Natek 10a16fccd8 primer prototipo
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 13:03:11 +01:00
Guillermo Bonet bde8742147 fix: refs #7024 entry_checkBooked
gitea/salix/pipeline/head This commit looks good Details
2024-03-25 12:51:47 +01:00
Guillermo Bonet 092eaab851 Merge pull request 'feat: refs #7024 Added entry_checkBooked' (!2201) from 7024-entry_checkBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2201
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-25 11:11:51 +00:00
Guillermo Bonet df115ec58b refactor: refs #6880 vn.professionalCategory changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 09:41:05 +01:00
Guillermo Bonet 17e61b9caa feat: refs #7024 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 08:50:18 +01:00
Guillermo Bonet 4005fe9064 feat: refs #7024 Added entry_checkBooked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 08:47:06 +01:00
Jorge Penadés 256ae359ce Merge branch 'dev' into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 07:46:38 +00:00
Javi Gallego 8d258254d0 feat: #7013 change name procedure
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 07:52:40 +01:00
Javi Gallego 3f3ba3c612 Merge branch 'dev' into 7013-solunionRiskRequest 2024-03-25 07:52:01 +01:00
Jorge Penadés 0867f4d501 fix: refs #6951 var names & procedure name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 16:01:22 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 15:14:12 +01:00
Ivan Mas b9bcc5b2cf refs #6966 changes required
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 15:06:57 +01:00
Guillermo Bonet 5070d4d46f hotfix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-03-22 14:59:39 +01:00
Ivan Mas 3851d967f4 refs #6966 Modify name sale_replaceItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 13:56:46 +01:00
Ivan Mas 8a51df2fe5 refs #6498 Delete multipleInventoryHistory
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 12:28:23 +01:00
Guillermo Bonet bda80e03ee Hotfix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-03-22 11:36:26 +01:00
Pablo Natek 531bd9ef80 Merge branch 'dev' into 6021-floranet
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 10:17:49 +00:00
Guillermo Bonet 17f6327339 Merge pull request 'fix: refs #7018 Fix invoiceInTax_recalc' (!2192) from 7018-invoiceInTax_rec into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2192
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-22 06:38:50 +00:00
Guillermo Bonet 9e62db6d01 Merge pull request 'refactor: refs #6923 Deteted procs' (!2180) from 6923-migratedProcs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2180
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-22 06:12:48 +00:00
Guillermo Bonet 84056e3c2a Merge branch 'dev' into 7018-invoiceInTax_rec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 14:57:47 +01:00
Guillermo Bonet 122fe7eecd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-03-21 14:46:09 +01:00
Robert Ferrús 9795f449b9 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:23:06 +00:00
Guillermo Bonet 2b26153bfa refactor: refs #7018 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:52:04 +01:00
Guillermo Bonet ee67820c20 refactor: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:14:48 +01:00
Guillermo Bonet 535dd40625 fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:06:59 +01:00
Ivan Mas c33c90aefe Merge branch 'dev' into 6499-procRefactor6
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 10:39:05 +00:00
Guillermo Bonet d0067c8096 ticket #167473 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 11:30:10 +01:00
Javi Gallego a24d38128b feat: #7013 muestra solo clientes asegurados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-21 10:48:43 +01:00
Javi Gallego c46e7227e7 feat: #7013 solo muestra clientes asegurados 2024-03-21 10:40:30 +01:00
Javi Gallego 20a338f746 feat: #7120 specialPrice with new fiels 2024-03-21 10:25:08 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Guillermo Bonet 1cd495df06 fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 09:25:33 +01:00
Guillermo Bonet 844291fec9 Merge branch 'dev' into 6923-migratedProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 07:20:23 +00:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 15:01:17 +01:00
Carlos Satorres 5a45cf7ea2 refs #6842 remove sage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 13:39:26 +01:00
Guillermo Bonet d53a053ccb refactor: refs #6923 Deteted procs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 13:07:02 +01:00
Guillermo Bonet cdaa7999d1 Merge branch 'dev' into 6395-buyBuyerFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 07:55:05 +00:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 17:55:54 +01:00
Pako Natek 8f54a7f12d deliveryDate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 14:03:16 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Jorge Penadés 0fd6a6360c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-15 14:18:02 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Jorge Penadés c1018d465a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 11:01:59 +01:00
Guillermo Bonet ea054eafd5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 10:56:11 +01:00
Guillermo Bonet aa27eb1922 refs #6948 Fix error
gitea/salix/pipeline/head This commit looks good Details
2024-03-15 10:55:39 +01:00
Jorge Penadés a38f93b0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-15 10:44:37 +01:00