Commit Graph

23990 Commits

Author SHA1 Message Date
Alex Moreno 70ebe7ea47 fix: refs #5926 typo
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 10:30:39 +02:00
Alex Moreno 321f90b8e9 Merge branch 'dev' of https: refs #5926//gitea.verdnatura.es/verdnatura/salix into 5926_pda_worker_docuware
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:50:34 +02:00
Javier Segarra 0aadb6d70f Merge pull request '#5938 - fine_ticketAdvance' (!2940) from 5938_fine_ticketAdvance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2940
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-11 06:29:34 +00:00
Javier Segarra f487aed336 Merge branch 'dev' into 5938_fine_ticketAdvance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 14:16:56 +00:00
Jorge Penadés ff61a7d88f Merge pull request '#4074 useAcls' (!2827) from 4074-useAcls into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2827
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-10 11:50:34 +00:00
Jorge Penadés 85c50db19e Merge branch 'dev' into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-10 11:45:09 +00:00
Guillermo Bonet 68063fdc52 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 12:58:38 +02:00
Guillermo Bonet 01d591af53 fix: refs #7564 Deleted query
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 12:58:16 +02:00
Alex Moreno bb27f0f1f5 build: init version 2440
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 10:34:28 +02:00
Alex Moreno 8e5d088797 Merge pull request '7953-devToTest_2438' (!2942) from 7953-devToTest_2438 into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2942
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-09-10 07:22:29 +00:00
Javi Gallego 1c0e148233 fix: cau #217599
gitea/salix/pipeline/head This commit looks good Details
2024-09-10 09:08:43 +02:00
Alex Moreno e74da7cbab feat: refs #7953 pullinfo
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-10 08:17:47 +02:00
Jorge Penadés eadff638f9 chore: refs #4074 drop focus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 15:59:40 +02:00
Jorge Penadés 45649359be chore: refs #4074 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 15:59:17 +02:00
Jorge Penadés 579ac481f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 15:13:52 +02:00
Javier Segarra a5f6fe95ea feat(salix): refs #5938 #5938 add futureAlertLevel
gitea/salix/pipeline/pr-dev Build queued... Details
2024-09-09 14:58:02 +02:00
Guillermo Bonet f8b3db7023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 14:25:53 +02:00
Guillermo Bonet 946806c98e Merge branch 'test' into dev 2024-09-09 14:25:51 +02:00
Guillermo Bonet 331ac05a17 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 14:25:15 +02:00
Guillermo Bonet 52f368e4f7 fix: refs #7346 Global invoice 2024-09-09 14:25:13 +02:00
Javier Segarra 89c2d2705c feat(salix): refs #5938 #5938 change value-field 2024-09-09 14:21:59 +02:00
Javier Segarra f15b33778c feat(salix): refs #5938 #5938 replace variables 2024-09-09 14:21:42 +02:00
Jorge Penadés 26be5b292b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 14:18:01 +02:00
Javier Segarra 1a0fb2fecd Merge pull request 'feat(salix): #7671 define isDestiny field in model' (!2681) from 7671_dense_itemFixedPrices into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2681
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 12:17:56 +00:00
Javier Segarra 03d4427bcd Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:16:15 +00:00
Jorge Penadés 6e511f00c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 13:58:46 +02:00
Alex Moreno 5a04083d31 Merge pull request 'feat(AccessToken&ACL): refs #7547 upgrade security' (!2630) from 7547-accessToken-security into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2630
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-09-09 11:02:06 +00:00
Carlos Andrés 804d10894b Merge pull request 'fix: ticket 218504 ticket_close' (!2938) from Hotfix-Ticket-218504-ticket_Close into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2938
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-09 10:53:19 +00:00
Guillermo Bonet 689315bab8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 12:42:21 +02:00
Guillermo Bonet d9a4b3e6fb fix: refs #7346 Global invoice 2024-09-09 12:42:19 +02:00
Alex Moreno 0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 12:42:13 +02:00
Carlos Andrés 88a8b4975b fix: ticket 218504 ticket_close
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-09 12:37:49 +02:00
Juan Ferrer d2ead9d936 Merge pull request 'fix: refs #7931 Merge available fix into master' (!2936) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2936
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-09 10:20:42 +00:00
Carlos Satorres a25dac140e Merge pull request 'refs #6898 fix supplier remove' (!2605) from 6998-supplierMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2605
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-09 09:56:41 +00:00
Carlos Satorres 01690ed081 Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:39:15 +00:00
Guillermo Bonet daf3dfd2ee Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:28 +02:00
Guillermo Bonet 3c6b7cd224 Merge branch 'master' into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:08 +02:00
Guillermo Bonet 723ec2b453 fix: refs #7844 Filter monitor
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:34:42 +02:00
Carlos Satorres 44a183785e Merge branch 'dev' into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 09:32:43 +00:00
Javier Segarra 7710b87f4a test(salix): refs #7671 #7671 improve and revert where changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:07:05 +02:00
Jorge Penadés 18ec76d156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4074-useAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:22 +02:00
Javier Segarra 57dbdc6f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 09:58:07 +02:00
Javier Segarra 6012604946 perf(salix): refs #7671 #7671 imrpove and revert where changes 2024-09-09 09:57:38 +02:00
Alex Moreno d7613767fb Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2934
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-09-09 07:46:12 +00:00
Guillermo Bonet 0c4b9dcdae Merge pull request 'feat: refs #4515 New throw buy_checkItem' (!2935) from 4515-throwBuyCheck into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2935
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 07:07:53 +00:00
Jorge Penadés af1cab44eb Merge pull request 'fix: refs #7323 fetch from right source' (!2933) from 7323-replaceWorkerDataSource into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2933
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 07:05:01 +00:00
Guillermo Bonet c4527cc5c5 feat: refs #4515 New throw buy_checkItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 08:28:27 +02:00
Alex Moreno 632d3190b1 feat: refs #7938 remove unnecessary insert in clientLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-09 07:49:22 +02:00
Javier Segarra 5c4a30f2f9 perf: refs #7671 improve showBadDates
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-08 12:50:32 +02:00
Javier Segarra dbd8f94555 perf: refs #7671 improve showBadDates 2024-09-08 12:49:55 +02:00