Commit Graph

491 Commits

Author SHA1 Message Date
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Guillermo Bonet ab446b54ed feat: refs #7644 Optimized entry labels report
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:29:35 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) 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: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
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
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
Javier Segarra 7254abea40 feat(salix): #7648 Add args to filter shipped value
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:49:23 +02:00
Javier Segarra de7b4dc9d6 fix: missing fields
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 10:08:01 +00:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Carlos Andrés d7b9a3ffd0 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 11:58:51 +02:00
Carlos Andrés 38d863aac6 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 18:44:24 +02:00
Javier Segarra d558e3d9f4 test(salix): refs #7648 #7648 test travels and entries
gitea/salix/pipeline/pr-master Build queued... Details
2024-07-16 12:45:51 +02:00
Javier Segarra 8fe94772f3 feat(salix): refs #7648 #7648 buyLabels 2024-07-16 12:45:31 +02:00
Javier Segarra 6856ab0501 feat(salix): refs #7648 #7648 myEntries 2024-07-16 12:45:14 +02:00
Javier Segarra a0be2edc41 feat(salix): #7648 remove white line
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 17:33:21 +00:00
Javier Segarra ddd6c799dc feat(salix): #7648 Add field for endpoint as buyLabel report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 17:32:14 +00:00
Javier Segarra 199d8e0034 Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 09:59:58 +02:00
Javier Segarra fb8b31b397 perf: refs #7648 #7648 clean fixtures and SQL filter 2024-07-15 09:59:52 +02:00
Javier Segarra 0ca4bffaf0 Perf: improve condition days filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-13 18:07:46 +00:00
Javier Segarra 1d23554508 perf(ssalix): refs #7648 remove default value
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 20:52:52 +02:00
Javier Segarra 47cff3f894 feat(ssalix): refs #7648 remove select field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:52:03 +02:00
Javier Segarra b28a8a34dc feat(salix): refs #7648 #7648 add new filter 2024-07-11 19:55:36 +02:00
Javier Segarra 5192bfd8ea fix(salix): refs #7648 #7648 entryFilter and getBuys by fi
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 14:58:34 +02:00
Jorge Penadés 900fa2de5e fix: refs #7648 add myOpts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 13:03:19 +02:00
Carlos Satorres fafebb4339 refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 12:13:40 +02:00
Carlos Satorres dd3a8d4b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 12:05:00 +02:00
Jon Elias d01820c751 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:54:55 +00:00
Javier Segarra 946d6f553a perf(salix): refs #7648 #7648 sql conventions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:16:55 +02:00
Javier Segarra adbbe4aef9 fix(salix): refs #7648 #7648 solve big bug
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 01:46:01 +02:00
Javier Segarra cc004a864a feat(salix): refs #7648 #7648 rename some travel fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 20:41:53 +02:00
Javier Segarra 3539b5a33e test(salix): refs #7648 #7648 remove fdescribe
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 10:08:51 +02:00
Javier Segarra 30520cbe48 test(salix): refs #7648 #7648 getBuys.filter 2024-07-02 10:06:26 +02:00
Javier Segarra 89a394a10d test(salix): refs #7648 #7648 entry.filter 2024-07-02 09:52:18 +02:00
Javier Segarra f27bdec758 feat(salix): refs #7648 #7648 changes requested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 21:14:27 +02:00
Javier Segarra f0326860ba feat(salix): refs #7648 #7648 add new fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:07:46 +02:00
Javier Segarra f47197cd80 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 14:06:28 +02:00
Jon Elias 0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 10:22:11 +00:00
Carlos Satorres 0240734a4b refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:50:37 +02:00
Guillermo Bonet 5c8d8ba280 refs #7644 Added locales and changed name of method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 09:07:36 +02:00
Guillermo Bonet 19bf606330 refs #7644 First commit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 12:57:27 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00
Jon Elias 0bf384b2ce Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 07:06:30 +00:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Carlos Satorres 3c1544ac9d refs #6897 fix es.yml 2024-06-13 09:20:43 +02:00
Carlos Satorres b72de3570a refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 14:41:35 +02:00
Carlos Satorres ba67acb72b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 14:33:11 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Jon Elias 2b45c2c61a feat: refs #6436 new test changes, rollback order/filter and /ticket/clone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 08:25:50 +02:00
Pablo Natek 13d1d0a61c feat: refs #7499 add printedStickers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 14:29:16 +02:00
Jon Elias 665d03f048 refactor: refs #6436 user-config and some sections tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:35:44 +02:00
Carlos Satorres 5d7a570c3f refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:28:49 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Carlos Satorres 48550bd986 refs #6897 fix remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:35:03 +02:00
Carlos Satorres cdc18ed84f refs #6897 fix entry Salix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 08:32:59 +02:00
Carlos Satorres e09a8f2eb7 refs #6897 remove code redirection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:41:38 +02:00
Sergio De la torre db1c352be3 feat: packaging refs #4021
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 18:06:35 +02:00
Guillermo Bonet 6f9826421d refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 09:39:09 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Guillermo Bonet 2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 11:06:47 +00:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Guillermo Bonet 7a557be09a feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:07:57 +02:00
Guillermo Bonet 339c349ed0 feat: refs #6724 Added admon acl to vn-check
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 14:00:54 +02:00
Guillermo Bonet 5c524ecc7d rollback: refs #6724 entry.js
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 13:13:40 +02:00
Guillermo Bonet 78bd561122 Merge branch 'dev' into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 11:11:55 +00:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 11:30:03 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Jorge Penadés a62e189e47 feat: refs #6724 hook added
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 16:10:52 +01:00
Carlos Satorres f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 16:50:03 +00:00
Javier Segarra 38c5209c33 refs #6930 fix more endpoints
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 15:01:28 +01:00
Carlos Satorres ca0d269ee2 refs #6074 remove isBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 15:02:09 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Alex Moreno 9f8e448562 refs #5509 fix(EntryDms): some issues
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 07:22:51 +01:00
Alex Moreno 4a2032b9cd refs #5509 fix(EntryDms): sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:39:56 +01:00
Alex Moreno b54827a2ad refs #5509 feat(EntryDms): add download & upload file 2024-02-08 07:23:42 +01:00
Alex Moreno f4dc596e97 refs 5509 feat: add triggers, downloadFile
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 15:13:56 +01:00
Alex Moreno 7ea1fbfb26 refs #5509 feat: entryDms funcionality
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 15:09:52 +01:00
Jorge Penadés 90b1e8d664 fix: refs #6276 backend tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:18:13 +01:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
Pablo Natek a854fff94f refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 10:59:48 +02:00
Carlos Andrés 0465c2ca54 Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 19:27:02 +00:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +02:00
Javi Gallego c2d8e1c002 fixes #6173 show just buyUltimate items
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 12:14:52 +02:00
Javi Gallego ed25bd93d6 fixes #6173 lastItemBuy muestra articulos sin podu
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:13:29 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Vicent Llopis 1d7f0e2135 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 11:42:49 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Vicent Llopis 7b4e8570aa refs #5244 refactor: se sustituyen los activeWithRole con where="{role: {inq: ['logistic', 'buyer']}}" por getItemTypeWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-30 12:03:26 +02:00
Carlos Satorres 757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-22 12:46:36 +00:00
Alex Moreno 38de19f044 Merge branch 'dev' into 5728-bugEntry/buy
gitea/salix/pipeline/head This commit looks good Details
2023-06-21 06:44:13 +00:00
Vicent Llopis 8a2cab0e62 Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-20 05:30:55 +00:00
Vicent Llopis 98b270b885 refs #5528 feat: add back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 13:05:46 +02:00
Vicent Llopis 65108943ab refs #5528 feat: back test
gitea/salix/pipeline/head This commit looks good Details
2023-06-14 12:48:14 +02:00
Vicent Llopis 72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro
gitea/salix/pipeline/head This commit looks good Details
2023-06-13 10:26:12 +02:00
Alexandre Riera f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:27:18 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email
gitea/salix/pipeline/head This commit looks good Details
2023-06-12 10:26:50 +02:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs
gitea/salix/pipeline/head This commit looks good Details
2023-06-09 09:03:23 +02:00
Carlos Satorres 0afc26e20c refs #5728 remove add, quit e2e
gitea/salix/pipeline/head This commit looks good Details
2023-06-08 10:30:03 +02:00
Juan Ferrer 9a63ce86aa refs #5667 filter by changes, align entity id to right, duplicated code remove from Log models
gitea/salix/pipeline/head This commit looks good Details
2023-06-07 23:54:27 +02:00