Commit Graph

23351 Commits

Author SHA1 Message Date
Carlos Andrés 5b0dcee62d hotfix: getBuys add field comment Ticket 207748
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:41:18 +02:00
Sergio De la torre 70b931553b hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-31 18:14:09 +02:00
Sergio De la torre 65e9ed301f hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:11:03 +02:00
Carlos Andrés ce8eba9b85 Merge pull request 'fix: refs #7213 componentLack y setRisk' (!2820) from 7213-Hotfix-calculo-problemas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2820
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-31 14:05:31 +00:00
Carlos Andrés 6c0aae04c0 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:59:12 +02:00
Carlos Andrés 77fa4dd497 fix: refs #7213 componentLack y setRisk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 14:38:12 +02:00
Robert Ferrús 892a0ef960 Merge pull request 'fix: refs #7818 entry_splitByShelving' (!2818) from 7818-entry_splitByShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2818
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-31 09:43:38 +00:00
Robert Ferrús dca7900ab2 fix: refs #7818 entry_splitByShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 11:31:02 +02:00
Pablo Natek a286c5dde5 Merge pull request 'hotFix model itemShelving refs #7805' (!2816) from 7805_model_itemShelving into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2816
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-31 08:46:53 +00:00
Guillermo Bonet cc78355aad fix: refs #7821 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 09:26:55 +02:00
Guillermo Bonet 09da9129a6 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 09:00:12 +02:00
Guillermo Bonet cfebee86f3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:59:36 +02:00
Guillermo Bonet 07b6d2aca9 feat: refs #7644 Added comment if has itemOriginalFk 2024-07-31 08:59:33 +02:00
Alex Moreno eb135fc7f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 08:11:03 +02:00
Alex Moreno 707b45f9a6 Merge pull request '7679-postCode_town_addRequireds' (!2804) from 7679-postCode_town_addRequireds into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2804
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-31 05:43:50 +00:00
Sergio De la torre 952b7a5054 hotFix model itemShelving refs #7805
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 07:10:38 +02:00
Sergio De la torre 57b87d527a Merge pull request 'master' (!2813) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2813
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 16:07:18 +00:00
Sergio De la torre 5bda4c86c7 Merge pull request 'hotFix getTickets refs #6861' (!2812) from 6861_getTickets_reservas into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2812
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 15:46:36 +00:00
Sergio De la torre d97aba8e10 hotFix getTickets refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 17:28:55 +02:00
Carlos Andrés a61f68cbc9 Merge pull request 'master' (!2811) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2811
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-30 14:49:38 +00:00
Guillermo Bonet 961d05ab35 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:19:04 +02:00
Guillermo Bonet 4ef57e6869 fix: refs #7821 Added orders in item_getMinacum
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 14:17:41 +02:00
Guillermo Bonet 80ad1f30af fix: refs #7811 Variables pm2
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 13:50:47 +02:00
Carlos Andrés d9151bdf6a Merge pull request 'hotFix reallocate iss refs #6861' (!2809) from 6861_reallocate_itemShelving into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2809
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 11:06:50 +00:00
Sergio De la torre 9e486e4aff hotFix reallocate iss refs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 13:04:33 +02:00
Carlos Andrés 186fa90ef0 Merge pull request 'hotFix reallocate resfs #6861' (!2808) from 6861_imteShelving_reallocate into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2808
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-30 10:41:18 +00:00
Sergio De la torre 2015256f5d hotFix reallocate resfs #6861
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 12:38:13 +02:00
Carlos Andrés 01562420d4 Actualizar db/routines/vn/procedures/itemShelvingSale_reallocate.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:14:15 +00:00
Carlos Andrés 4cda233424 Merge pull request '7736-Añadir-parámetro-itemFk-a-buyUltimate' (!2805) from 7736-Añadir-parámetro-itemFk-a-buyUltimate into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2805
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-30 09:13:08 +00:00
Carlos Andrés 495bb7e36e Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-30 10:46:00 +02:00
Guillermo Bonet e2c3539dfc Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-30 10:26:17 +02:00
Guillermo Bonet 1f80117ff7 fix: refs #6861 Column
gitea/salix/pipeline/head This commit looks good Details
2024-07-30 10:24:50 +02:00
Alex Moreno f1628f26b9 Merge branch 'master' into 7679-postCode_town_addRequireds
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 08:18:23 +00:00
Alex Moreno b17b5a1b21 test: fix postcode filter back test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 10:15:09 +02:00
Alex Moreno 2ac8760061 test: fix postcode filter back test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-30 10:13:32 +02:00
Alex Moreno dbe0f4497c fix(postcode_filter): add limit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-30 08:59:03 +02:00
Carlos Satorres d26bc307ed Merge pull request 'refs #7801 frenchGoLabel' (!2800) from 7801-franceGoLabel into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2800
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-30 06:47:49 +00:00
Carlos Satorres 90f7cc0583 Merge branch 'master' into 7801-franceGoLabel
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 06:44:17 +00:00
Alex Moreno 79c8ef7d11 Merge pull request '7806_devToTest_2332' (!2801) from 7806_devToTest_2330 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2801
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-07-30 06:14:08 +00:00
Carlos Satorres 6c1de1d6bd refs #7801 frenchGoLabel
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-30 07:55:14 +02:00
Carlos Andrés 9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 19:12:48 +02:00
Alex Moreno 434dfe4ae4 fix: refs #7679 postcode filter 2024-07-29 15:03:40 +02:00
Alex Moreno 5264d6c973 feat(postcode_town): refs #7679 add requireds 2024-07-29 10:35:01 +02:00
Jorge Penadés a95475ef61 Merge pull request '#7197 filter by correcting & supplierActivity' (!2641) from 7197-fixInvoiceIn into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2641
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-29 07:43:55 +00:00
Jorge Penadés 4f385f16e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 09:40:34 +02:00
Guillermo Bonet f9c58e63e1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:24:57 +02:00
Guillermo Bonet b013842750 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:24:20 +02:00
Guillermo Bonet c713c3a5c0 fix: refs #6861 Unhandled error
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:21:35 +02:00
Jorge Penadés ffd8e5e282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 08:05:55 +02:00
Guillermo Bonet 403252ac39 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 14:07:15 +02:00