Commit Graph

18853 Commits

Author SHA1 Message Date
Guillermo Bonet 0b5395af2b Merge branch 'dev' into 6692-viewClean9
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-02-01 07:11:44 +00:00
Guillermo Bonet 386204926f Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:11:42 +00:00
Alex Moreno 467879bdd6 Merge branch 'dev' into 6703-refactorSaleRefund 2024-02-01 06:46:25 +00:00
Guillermo Bonet 50b7f4350e Merge pull request 'feat: refs #6235 Added device in clockIn' (!1977) from 6235-addDeviceWorkerTimeControl into dev
Reviewed-on: #1977
2024-02-01 06:45:33 +00:00
Alex Moreno d338a04a27 Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 06:35:51 +00:00
Robert Ferrús d2748e5afa Merge pull request 'feat: refs #6691 delete view vn2008 part8' (!1982) from 6691-deleteView2008Part8 into dev
Reviewed-on: #1982
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-01 06:34:07 +00:00
Robert Ferrús 905c15dac7 Merge branch '6691-deleteView2008Part8' of https://gitea.verdnatura.es/verdnatura/salix into 6691-deleteView2008Part8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 07:29:52 +01:00
Robert Ferrús 183097de03 refs #6688 fix: puppeteer 2024-02-01 07:29:43 +01:00
Guillermo Bonet 0b6498e35f Merge branch 'dev' into 6692-viewClean9 2024-02-01 06:22:02 +00:00
Robert Ferrús d3af5d6664 feat: refs #6688 delete view vn2008 part5 2024-02-01 07:14:02 +01:00
Robert Ferrús 66d576f48e Merge branch '6371-limpiezaTablasVn2008Part1' of https://gitea.verdnatura.es/verdnatura/salix into 6371-limpiezaTablasVn2008Part1 2024-02-01 07:08:27 +01:00
Robert Ferrús 2db7b608ad feat: refs #6371 2024-02-01 07:08:25 +01:00
Guillermo Bonet 8d5f86b944 Merge branch 'dev' into 6690-viewClean7 2024-02-01 06:04:55 +00:00
Robert Ferrús 07f04acdd8 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1 2024-02-01 06:04:49 +00:00
Robert Ferrús f8cee0cf8d Merge branch 'dev' into 6691-deleteView2008Part8
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 06:04:08 +00:00
Guillermo Bonet a9fd1eafa8 Merge branch 'dev' into 6235-addDeviceWorkerTimeControl 2024-02-01 06:03:42 +00:00
Carlos Satorres 3a9c5c90d4 Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 15:46:07 +00:00
Carlos Satorres cbdb089562 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 15:44:57 +00:00
Carlos Satorres 40dd0d4e02 Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 14:50:05 +00:00
Juan Ferrer 1df4005067 build: refs #6706 hook test 2024-01-31 15:22:04 +01:00
Pablo Natek 650f85c737 Merge branch 'dev' into 4515-addBuyCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 13:57:44 +00:00
Pablo Natek 3182bfa46c refs #4515 2024-01-31 14:58:08 +01:00
Robert Ferrús 4b1d6c4762 Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1 2024-01-31 13:05:06 +00:00
Guillermo Bonet 15c22cdaa0 Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head Build queued... Details
2024-01-31 12:16:37 +00:00
Guillermo Bonet 851e5cc5af refactor: refs #6235 Fixed tests back 2024-01-31 13:16:56 +01:00
Jorge Penadés 7b14763f45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch 2024-01-31 13:12:47 +01:00
Jorge Penadés e88abe7b7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund 2024-01-31 13:11:37 +01:00
Robert Ferrús 21766a6152 Merge branch 'dev' into 6691-deleteView2008Part8 2024-01-31 11:44:30 +00:00
Guillermo Bonet 5f52b4a07e Merge branch 'dev' into 6690-viewClean7 2024-01-31 11:35:53 +00:00
Sergio De la torre 65a30224f5 Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 11:33:09 +00:00
Guillermo Bonet 40d26bc8a0 Merge branch 'dev' into 6692-viewClean9 2024-01-31 11:14:41 +00:00
Guillermo Bonet 6ebf5f135a refactor: refs #6235 Deleted views and dependences 2024-01-31 12:14:24 +01:00
Pablo Natek b8b2e1c507 Merge branch 'dev' into 6752-edi.ekt_scan-improved
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 11:07:45 +00:00
Juan Ferrer d7a5ec1e5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 12:02:09 +01:00
Juan Ferrer 59d45ab85c build: refs #6706 hook test 2024-01-31 12:02:08 +01:00
Carlos Satorres bbf50995c7 Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:21:06 +00:00
Guillermo Bonet e0d15e572c Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:13:57 +00:00
Robert Ferrús 8616b33c33 feat: refs #6691 delete view vn2008 part8
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 11:12:16 +01:00
Robert Ferrús 57c5c510ff Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:05:46 +00:00
Guillermo Bonet 2677bf953d Merge branch 'dev' into 6690-viewClean7
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:39:49 +00:00
Guillermo Bonet a42e20bd5f refactor: refs #6690 Deleted views and dependences 2024-01-31 10:35:50 +01:00
Jorge Penadés be3e7bb8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:01:21 +01:00
Jorge Penadés 6f306ad18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:59:57 +01:00
Jorge Penadés e6eac54709 fix: refs #6703 tests & front 2024-01-31 09:59:32 +01:00
Sergio De la torre eb3d344957 Merge pull request '6186_deletePackingShelve' (!1975) from 6186_deletePackingShelve into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #1975
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-01-31 08:35:07 +00:00
Sergio De la torre 0d438e7f4c Merge branch 'dev' into 5802_setState
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:18:57 +00:00
Jorge Penadés c136395d1e fix: refs #6703 fix conflicts 2024-01-31 09:16:38 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Guillermo Bonet 7d045d6abe Merge branch 'dev' into 6235-addDeviceWorkerTimeControl 2024-01-31 08:05:22 +00:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00