Commit Graph

10272 Commits

Author SHA1 Message Date
Carlos Satorres 27e6aacf15 Merge branch 'master' into hotfix-irpfDaysOnWard 2024-12-12 08:09:13 +00:00
Robert Ferrús 3e92aca6ff feat: refs #249272 message updateQuantity 2024-12-11 14:32:08 +01:00
Carlos Satorres f6ac55d9d7 fix: fix back 2024-12-10 11:01:52 +01:00
Sergio De la torre 699e56a64c Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test
Reviewed-on: #3279
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-10 06:05:11 +00:00
Alex Moreno eaa62909ff chore: simplify 2024-12-09 14:30:45 +01:00
Alex Moreno 9403588d7b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-12-09 14:30:03 +01:00
Carlos Satorres cb516d2022 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday 2024-12-09 13:22:10 +01:00
Sergio De la torre 22e9a9104a feat: refs #8188 refs#8188 orderPicking 2024-12-09 13:20:55 +01:00
Jorge Penadés f63d850ea3 refactor: refs #7366 rename ref to reference 2024-12-09 11:37:01 +01:00
Sergio De la torre d17566107e feat: refs #8188 refs#8188 orderPicking 2024-12-05 12:42:17 +01:00
Sergio De la torre 5db8ae53ac feat: refs #8188 refs#8188 orderPicking 2024-12-05 12:39:20 +01:00
Guillermo Bonet 078b559bea Merge branch 'master' into test 2024-12-05 06:56:48 +01:00
Guillermo Bonet 187cd226c4 feat: refs #7644 Added distinct total label count 2024-12-05 06:56:18 +01:00
Carlos Satorres 7d1e3b6751 Merge branch 'master' into hotfix-6899invoiceOut 2024-12-04 08:18:27 +00:00
Carlos Andrés d7af439787 Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js 2024-12-03 17:49:48 +00:00
Jorge Penadés 104bef43c1 feat: add country id filter to sales monitor 2024-12-03 14:03:08 +01:00
Carlos Satorres 2267942368 fix: fix invoiceOut filter 2024-12-03 10:25:40 +01:00
Alex Moreno 6fcfb0208d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-12-03 08:29:21 +01:00
Ivan Mas 1b2987494a Merge branch 'dev' into 7146-route.createdToDated 2024-12-02 14:04:36 +00:00
Alex Moreno bf9f7d45bf Merge branch 'master' into 8222-refactorDeleteZone2 2024-12-02 12:53:00 +00:00
Carlos Satorres fd05ce0915 fix: refs #8222 fix prDeleteZone 2024-12-02 13:45:04 +01:00
Guillermo Bonet 947812e9f1 Merge branch 'test' into dev 2024-12-02 13:07:08 +01:00
Ivan Mas bf0daf90db Merge branch 'dev' into 7146-route.createdToDated 2024-12-02 11:56:58 +00:00
Robert Ferrús d355b320b4 test: refs #244936 remove window.open called 2024-12-02 12:25:27 +01:00
Robert Ferrús 30da83a88c fix: refs #244936 sale redirect catalog to lilium 2024-12-02 11:52:05 +01:00
Carlos Satorres f50c20fb28 Merge branch 'master' into hotfix-7323workerHoliday 2024-12-02 09:49:55 +00:00
Carlos Satorres fb40e25c7c fix: remove ctx 2024-12-02 10:47:44 +01:00
Carlos Satorres 4e6b83809b fix: workerHoliday hr 2024-12-02 10:29:12 +01:00
Carlos Satorres cf862202ff fix: hotfix 7323 createAbsence 2024-12-02 10:12:56 +01:00
Guillermo Bonet 3453aa0f8c Merge branch 'test' into dev 2024-11-29 11:40:22 +01:00
Sergio De la torre 009b4ab7b9 fix: refs #7920 refs#7920 itemShelvingLogs 2024-11-29 11:31:31 +01:00
Alex Moreno 20b68b4b41 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-11-29 07:28:55 +01:00
Ivan Mas df51b93e5b Merge branch 'dev' into 7146-route.createdToDated 2024-11-28 16:32:03 +00:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated 2024-11-28 17:29:39 +01:00
Alex Moreno 5923916cda fix: change debugAdd to console.error 2024-11-28 11:31:38 +01:00
Alex Moreno 8ef78818db Merge branch 'master' into 7404-add-debug 2024-11-28 10:19:32 +00:00
Pablo Natek 00e5f86020 fix: refs #7404 add debug logging for cancelShipment and deleteExpeditions methods 2024-11-28 11:18:09 +01:00
Guillermo Bonet 699c6553a0 Merge branch 'test' into dev 2024-11-28 11:17:19 +01:00
Jorge Penadés 5ee4563ee7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-definePrefix 2024-11-28 09:38:28 +01:00
Guillermo Bonet 71bc1adcba Merge branch 'test' into dev 2024-11-28 09:00:38 +01:00
Guillermo Bonet 847692f103 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2024-11-28 08:59:11 +01:00
Guillermo Bonet 93388461d1 fix: refs #7266 Changed method name and corrections 2024-11-28 08:59:08 +01:00
Sergio De la torre 6f1bfd6787 Merge branch 'master' into 8213-itemShelvingSalePicker 2024-11-28 07:50:06 +00:00
Alex Moreno 65c994e9d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-11-28 08:42:36 +01:00
Alex Moreno 34348f50e8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-11-28 08:42:24 +01:00
Carlos Andrés 30cc7a49a0 Actualizar modules/entry/back/methods/entry/print.js 2024-11-27 15:38:50 +00:00
Carlos Andrés d872f164fd Actualizar modules/entry/back/models/entry.js 2024-11-27 14:55:30 +00:00
Jorge Penadés 8fd133c5e8 feat: refs #6818 define prefix model 2024-11-27 12:51:09 +01:00
Guillermo Bonet 10fe53b7f2 refactor: refs #8204 Deprecated itemShelvingLog 2024-11-26 14:01:44 +01:00
Ivan Mas f32d709b9d Merge branch 'dev' into 7899-deleteUnusedStates 2024-11-26 12:22:30 +00:00