Commit Graph

668 Commits

Author SHA1 Message Date
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 10:30:32 +02:00
Jon Elias 5d78f564dd refactor: refs #7889 deleted subtitle attr and use keyBinding instead
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 10:00:07 +02:00
Jon Elias 585919a4d9 feat: refs #7889 added shortcuts to modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 09:19:38 +02:00
Jorge Penadés 763cf2e345 refactor: refs #6900 create setRectificative composable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 10:30:14 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 07:49:14 +00:00
Jorge Penadés a5887114ef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:35 +02:00
Pablo Natek 2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 08:01:19 +02:00
Jon Elias a2eb298733 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-03 04:36:22 +00:00
Carlos Satorres 7bd3c0802e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7407-MedicalWorker2 2024-09-02 15:05:51 +02:00
Javier Segarra 5d511c7b1b Merge branch 'dev' into 7889_main_shortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 13:02:07 +00:00
Carlos Satorres 0475083a2b refs #7407 Medical Section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 14:57:01 +02:00
Javier Segarra c51af96ca7 fix: module icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 12:56:44 +00:00
Jorge Penadés f24daa4ebd feat: refs #6900 hide menu item
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-02 13:15:06 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 10:50:22 +00:00
Jorge Penadés 90b2cf09b9 feat: refs #7353 add right icons
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-29 16:54:09 +02:00
Javier Segarra d8e3f9dfd9 feat: apply mixin
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-28 16:11:25 +02:00
Jorge Penadés 25be0df2e3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 09:55:52 +02:00
Javier Segarra 2ae482ff8c Merge branch 'test' into dev 2024-08-27 09:38:12 +02:00
Javier Segarra 461b764f0e Merge branch 'test' into dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 07:11:20 +02:00
Jorge Penadés fdacdf1a12 feat: refs #7353 add filter & fix customTags
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-23 12:43:27 +02:00
Jon Elias a31931f8cf Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:19 +02:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 16:03:23 +02:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 09:20:31 +00:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 10:45:13 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 10:14:02 +02:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 08:45:37 +00:00
Javier Segarra 55b9cd9ff4 feat: handle same multiple CP 2024-08-14 09:18:24 +02:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 14:41:23 +00:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-12 13:46:56 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-09 14:55:49 +02:00
Alex Moreno d3f50ec9b2 Merge branch 'dev' into 7717_fixOrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-09 06:52:13 +00:00
Alex Moreno 3ee7692bbc fix(zone): zoneLocation and the others searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-09 08:45:48 +02:00
Carlos Satorres 3eaa5c864d refs #7355 account fixes 2024-08-08 13:57:01 +02:00
Pablo Natek f2be2b4300 fea: stockBought add form and formDetail 2024-08-05 15:42:57 +02:00
Alex Moreno 810e579ea9 refactor(customer_recovery): to vnTable 2024-08-05 12:10:15 +02:00
Jorge Penadés 53aec24790 chore: refs #4074 drop workerCreate 2024-08-02 09:04:16 +02:00
Jon Elias cf90007023 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 14:33:28 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Jon Elias 8ceee6f182 fix: fix conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-25 07:06:27 +02:00
Jon Elias 3a9116987c Merge branch 'dev' into 7717_fixOrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-24 08:35:24 +00:00
Jon Elias a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-23 13:25:58 +02:00
Jon Elias 12370b6437 feat: refs #6346 new wagon type section
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-23 13:22:54 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Jon Elias 33ad8fcb9d refactor: refs #7014 improved route.js & deleted RouteMain 2024-07-23 09:12:00 +02:00
Jon Elias eb2df02ad6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 14:55:09 +02:00
Jon Elias 7f376c8ea4 fix: refs #7717 fix catalog filter, searchbar redirect and search
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 14:53:44 +02:00
Jon Elias 94aa3bc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 12:47:59 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 11:53:10 +02:00
Javier Segarra 8ea1fb6793 Merge branch 'dev' into feature/TicketDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 09:30:10 +00:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 11:29:27 +02:00
Pablo Natek 35a165b9f3 Merge branch 'dev' into 7129-finishMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 09:25:52 +00:00
Pablo Natek 9098e63793 refactor: refs #7129 refactor with vnTable 2024-07-12 10:41:18 +02:00
Jon Elias a4a9572c96 feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-12 09:16:32 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-09 09:41:45 +02:00
Javier Segarra 3f2b675d07 feat: change ticketDms leftMenuItem position
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-09 09:15:20 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 13:01:34 +00:00
Jon Elias 7d90b536b0 Merge branch 'dev' into 6899_InvoiceOut_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 09:32:32 +00:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:55:14 +02:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:14:13 +02:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:10:24 +02:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 08:05:33 +00:00
Jon Elias 0436dbae51 fix: refs #6896 fixed OrderList path
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 10:21:02 +02:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
William Buezas decf33c0b7 small changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-04 09:46:10 -03:00
Jon Elias 1b839a89f7 refactor: refs #6896 Order migration
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-04 13:35:27 +02:00
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02:00
Jon Elias fcc8d59cb3 Merge branch 'dev' into 6899_InvoiceOut_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-04 06:28:17 +00:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Jon Elias 7914387735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 09:46:54 +02:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 08:26:27 +02:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jon Elias 06f8121ede Merge branch 'dev' into 6899_InvoiceOut_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-02 15:24:52 +02:00
Jon Elias cdbbd576e3 refactor: refs #6899 end invoiceOut migration with VnTable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 14:54:14 +02:00
William Buezas 9179dc7432 Ticket package 2024-07-02 09:35:18 -03:00
Pablo Natek 2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-02 09:58:46 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
William Buezas dfed211578 Fix bad git pull merge
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 11:10:50 -03:00
Javier Segarra 3f5f918684 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 15:12:40 +02:00
Javier Segarra 7896e3d7f9 Merge branch 'dev' into feature/TicketDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:59:09 +02:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:53:08 +02:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:50:23 +02:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 14:48:12 +02:00
Javier Segarra eeab4ed915 updates 2024-07-01 13:18:19 +02:00
Javier Segarra 0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 12:27:07 +02:00
Javier Segarra 71900b15a6 feat: newsection and i18n
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-07-01 12:18:58 +02:00
Alex Moreno 128303939b fix(ticket router): typo
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 07:41:58 +02:00
Pablo Natek a69235e4d4 fix: refs #7404 add e2e and fix route 2024-07-01 07:39:35 +02:00
William Buezas 768b619904 Sale tracking 2024-06-30 17:43:21 -03:00
Javier Segarra 9f68c380da Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-29 00:32:33 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-28 13:24:24 +02:00
William Buezas db4c3a6799 Changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-06-27 11:46:31 -03:00
William Buezas 0e8106af17 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-26 17:21:31 -03:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas ad950f33c6 WIP 2024-06-26 08:27:36 -03:00