0
0
Fork 0
Commit Graph

389 Commits

Author SHA1 Message Date
Jon Elias 452d1000bc refactor: refs #7543 requested changes 2024-06-26 14:28:21 +02:00
Jon Elias 677e71d1a7 refactor: refs #7543 standarized descriptors 2024-06-26 08:26:04 +02:00
Jon Elias 42df3894ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-06-26 07:16:42 +02:00
Javier Segarra 603cbde09f Merge branch 'dev' into feature/TicketSale 2024-06-25 12:19:17 +00:00
Alex Moreno d7cc983f29 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 13:33:19 +02:00
Jorge Penadés ff33923b7a feat: refs #7578 add data-key attribute to CardSummary components 2024-06-25 12:49:54 +02:00
Javier Segarra 98510c1d38 Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale 2024-06-25 12:38:53 +02:00
Jon Elias e8111502c0 refactor: refs #7014 deleted main files and changed route files 2024-06-25 10:28:48 +02:00
Jon Elias 9207b37419 refactor: refs #7014 refactor <module>Main.vue 2024-06-24 13:46:06 +02:00
Alex Moreno d23dbca7bf fix(EntryBuys): fix VnSubtoolbar 2024-06-21 08:12:03 +02:00
Jon Elias f41161a28e refactor: refs #6977 use VnImg 2024-06-21 07:24:23 +02:00
Carlos Satorres 0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-18 07:18:47 +02:00
Carlos Satorres bc30531d42 refs #6897 fix trad 2024-06-18 07:18:44 +02:00
Carlos Satorres 8c5ea42be2 Merge branch 'dev' into 6897-EntryMigration 2024-06-13 06:51:02 +00:00
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors 2024-06-11 16:38:12 +02:00
Pablo Natek 6789f3d1cb fix: refs #7499 fix style 2024-06-11 14:32:01 +02:00
Pablo Natek be919f97b1 Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys 2024-06-11 14:28:20 +02:00
Pablo Natek 80adeede81 fix: refs #7499 fix item reference 2024-06-11 14:28:19 +02:00
Carlos Satorres ba0364e799 refs #6897 fix BasicData 2024-06-11 10:30:42 +02:00
Carlos Satorres 31afa22de8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-11 09:20:23 +02:00
Jorge Penadés a64cd6fa73 refactor: refs #6273 update locale 2024-06-10 15:21:28 +02:00
Jorge Penadés 5869ad220c feat: refs #6273 wip: add locale 2024-06-10 14:17:22 +02:00
Pablo Natek 5197211cf0 Merge branch 'dev' into 7499-refactorEntrys 2024-06-07 09:38:51 +00:00
Pablo Natek d0dccddcf3 fix: refs #7499 id article 2024-06-07 11:37:11 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition 2024-06-03 14:11:40 +02:00
Javier Segarra 25d5887a57 fix: src/pages/Entry/Card/EntryBuysImport.vue 2024-05-31 13:42:49 +02:00
Carlos Satorres c499cc8f09 refs #6897 remove code fix section 2024-05-31 12:40:27 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +02:00
jcasado 96719884fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-05-22 12:46:56 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
Jorge Penadés d4cbdb469a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 09:06:48 +02:00
Jorge Penadés 288f776c9c Merge branch 'dev' into 7274-fixCustomer 2024-05-16 07:01:08 +00:00
Jorge Penadés 3cb02d5e5f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-15 15:42:13 +02:00
Jorge Penadés 628fc888ba fix: refs #7281 fix warnings 2024-05-15 14:31:51 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-14 13:42:38 +02:00
Jorge Penadés d55dc638d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-13 15:23:37 +02:00
Jon Elias 2183385e58 Merge branch 'dev' into 6767-deleteDivCol 2024-05-10 09:39:31 +00:00
Javier Casado b1f25266aa Merge branch 'dev' into 6911-saveOnEnter 2024-05-09 06:04:26 +00:00
Jorge Penadés 29e567d405 fix: refs #6891 use new props 2024-05-07 16:42:09 +02:00
Jorge Penadés 64f41cf8dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-07 13:47:39 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 2024-05-07 07:05:25 +00:00
Jorge Penadés 036ef72593 fix: refs #6891 showFilterPanel 2024-05-06 17:27:30 +02:00
William Buezas d15a92ce7d Resolve conflicts 2024-05-03 08:57:39 -03:00
Jon Elias 8f0af24f50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol 2024-05-03 08:56:38 +02:00
Javier Casado bdfcba5c3e Merge branch 'dev' into 6911-saveOnEnter 2024-05-03 05:22:00 +00:00
William Buezas 554b9e814b WIP 2024-05-02 09:08:03 -03:00
Javier Segarra f46b78131c perf: remove onMounted and reload 2024-05-02 10:24:07 +02:00
jcasado d8d805a0ca refs #6911 changesSaveOnEnter 2024-04-30 08:16:31 +02:00
Javier Segarra 71f60b82e4 fix: minor bugs use VnSubToolbar 2024-04-26 12:30:17 +02:00
Jon Elias e6dc7b9862 refactor: refs #6767 fix all conflicts 2024-04-26 09:47:44 +02:00
jcasado 13d38c8b02 refactor: refs #6764 fix conflicts 2024-04-25 09:02:24 +02:00
jcasado c6c925a105 refs: #6764 fixConflicts 2024-04-25 08:50:12 +02:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
jcasado 716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter 2024-04-24 08:02:19 +02:00
jcasado 7f07b9780c refs: #6764 rename VnSelectFilter 2024-04-23 13:03:32 +02:00
William Buezas 9212e53905 resolve conflicts 2024-04-19 12:48:07 -03:00
Jorge Penadés da6e121137 refactor: refs #6480 use VnCard 2024-04-19 13:33:29 +02:00
Jon Elias 3f3b37fd4a refactor: refs #6767 fixed conflicts 2024-04-19 07:24:58 +02:00
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys 2024-04-18 13:14:23 -03:00
Guillermo Bonet 7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:06:30 +00:00
Jon Elias c60558420f fix: refs #6425 fixed vitest config to avoid testing problems 2024-04-18 12:38:43 +02:00
Jon Elias 6839b5aac2 refactor: refs #6767 deleted <div class="col"> 2024-04-17 13:26:08 +02:00
Guillermo Bonet 7b29832966 feat: refs #6968 Changed groupingMode to enum 2024-04-16 11:12:23 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
Jon Elias 5cd32ec2fe Merge branch 'dev' into 6425-translationProposal 2024-04-12 12:21:41 +00:00
Jorge Penadés a27bdc37d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes 2024-04-12 13:27:14 +02:00
Jon Elias cb31c2baa2 refs: #6425 merge conflicts 2024-04-03 12:56:56 +02:00
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Jon Elias 2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:35:23 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal 2024-03-21 12:14:54 +01:00
jcasado 2f27b8537c refactor: #6946 add table and floating button 2024-03-20 12:50:47 +01:00
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Pablo Natek 2386090c15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-18 13:56:18 +01:00
Jon Elias 2321ca6605 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-15 12:54:05 +01:00
Javier Segarra efb3ae6e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia 2024-03-15 09:47:13 +01:00
Pablo Natek 077fa7e2a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-14 15:10:41 +01:00
Pablo Natek 00a47cd5b2 refactor(style): refs #7001 add style font vnTitle vnChip 2024-03-14 15:06:06 +01:00
Jon Elias 667359ed92 Merge branch 'dev' into 6993-HideAllPagination 2024-03-14 12:09:18 +00:00
Jon Elias 37a2c33f9f refactor: #6993 set default QTable pagination 2024-03-14 08:51:26 +01:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -03:00
Pablo Natek 0c3dc30b8c fix(styles): refs #7001 create VnTitle and correct background-page color 2024-03-12 09:49:58 +01:00
William Buezas 44d7f98cdc Add item descriptor 2024-03-06 18:22:15 -03:00
William Buezas a828ac5954 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-06 18:08:02 -03:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary 2024-03-06 09:48:34 +01:00
Pablo Natek 1aedb3c7da Merge branch 'dev' into 6486-salixColors 2024-03-06 08:43:21 +00:00
Javier Segarra 4637053ab2 refs #6336 feat: useCardSize 2024-03-06 09:35:01 +01:00
Carlos Satorres 65f1d56d5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact 2024-03-05 14:47:42 +01:00
William Buezas 0274a696f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-03-05 08:28:42 -03:00
Pablo Natek 23cfe35d94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-05 12:04:13 +01:00
William Buezas 6eee05249d Entry latest buys side filter panel 2024-03-04 22:08:44 -03:00
William Buezas 432280884f Resolve conflicts 2024-03-04 10:46:11 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres 8f9048a786 refs #6892 fix scss class 2024-03-04 13:51:14 +01:00
William Buezas 2774c68f19 Right filter panel WIP 2024-03-04 09:06:29 -03:00
Carlos Satorres e3cf34fcda Merge branch 'dev' into 6980-redirection 2024-03-04 10:25:21 +00:00
Carlos Satorres c6f315d493 refs #6892 fix checkbox css 2024-03-04 10:32:51 +01:00
Pablo Natek c18a974ff8 Merge branch 'dev' into 6486-salixColors 2024-03-01 09:51:12 +00:00
Pablo Natek bc4e081bee fix(light): refs #6486 add light theme colors 2024-03-01 10:33:23 +01:00
Pablo Natek 02959ca8a5 feat(colors): refs #6486 add salix-colors 2024-03-01 09:45:17 +01:00
Carlos Satorres a1b377c844 warmFix remove div col 2024-03-01 08:59:50 +01:00
Carlos Satorres 91a137b072 warmFix row 2024-03-01 08:53:53 +01:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Jorge Penadés 26184328f9 fix: refs #6945 entryNotes 2024-02-28 15:21:44 +01:00
Javier Segarra fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-02-28 10:58:22 +00:00
Carlos Satorres 478f0e17b1 refs #6890 change redirect 2024-02-27 14:19:53 +01:00
William Buezas 59dc1a4e38 Entry summary icon redirection condition 2024-02-27 08:17:55 -03:00
William Buezas 50218d6ddf WIP 2024-02-27 07:32:51 -03:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
William Buezas 84a0be0a5c Add new card to entry summary and fix links redirections 2024-02-26 10:52:24 -03:00
William Buezas 740eedbe44 Improve reactivity of card descriptor 2024-02-26 09:54:59 -03:00
William Buezas 90bfba0290 Create global variable for table separation row 2024-02-26 08:45:02 -03:00
Javier Segarra 4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia 2024-02-26 07:11:33 +01:00
William Buezas bf66d4ec99 Table column filters 2024-02-25 22:02:52 -03:00
William Buezas 4d2dacff6f add no results label 2024-02-23 20:36:26 -03:00
William Buezas 3e04c86000 reduce EntrySummary distance between table rows 2024-02-23 11:53:59 -03:00
William Buezas 6605eea044 remove character added by accident 2024-02-23 11:52:39 -03:00
William Buezas 913bc7d870 Refetch descriptor data when exit EntryBasicData view 2024-02-23 11:50:38 -03:00
William Buezas 46e5503a79 save descriptor data in state 2024-02-23 10:43:30 -03:00
William Buezas ed2a7c5ee6 Add fill to lock icon 2024-02-23 08:58:32 -03:00
William Buezas e2d29f08b4 remove unnused class 2024-02-23 08:35:56 -03:00
William Buezas 2657034360 Corrections 2024-02-22 15:07:11 -03:00
William Buezas 196d8dde20 Change isRaid icon 2024-02-22 11:05:40 -03:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-22 09:11:36 +01:00
William Buezas 433444c869 Improvements and corrections 2024-02-19 09:23:44 -03:00
Alex Moreno 4315408452 refs #5509 feat: VnDms description 2024-02-13 15:01:24 +01:00
Alex Moreno aa4d5bffc3 refs #5509 feat: VnDms & VnDmsList 2024-02-12 15:06:20 +01:00
Alex Moreno cb6ba483d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 14:43:50 +01:00
William Buezas 399f47b17c merge with salix-front dev branch and resolve conflicts 2024-02-09 08:59:46 -03:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Alex Moreno 18b76e5e12 refs #5509 feat: VnDmsList 2024-02-08 07:25:23 +01:00
William Buezas f59c2409f1 travels corrections and improvements 2024-02-07 15:01:51 -03:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00
William Buezas 6773a9a696 Entry buys import open file explorer when clicking clip icon 2024-02-06 10:14:48 -03:00
William Buezas f6b0404cb4 multiple changes 2024-02-06 08:33:06 -03:00
William Buezas 02c163c5e0 small change 2024-02-05 12:50:05 -03:00
William Buezas 86bbc7cfd6 label input changes 2024-02-05 12:47:58 -03:00
William Buezas 5da5bb2047 get input events improvement 2024-02-05 12:31:57 -03:00
William Buezas 0525f5fdd8 Add ItemDescriptor to EntryBuys table 2024-02-05 12:13:21 -03:00
William Buezas 28790705ea Sort entry observation options 2024-02-05 12:04:28 -03:00
William Buezas cde41ab337 Entry notes validation 2024-02-05 11:55:22 -03:00
William Buezas 67e2130374 Adjust spacing in entry create form 2024-02-05 11:36:56 -03:00
Alex Moreno 64b7a07d41 refs #5509 feat: VnDms FormModel 2024-02-05 15:04:13 +01:00
William Buezas ddcbc5d8d7 make EditTableCellForm componente reusable 2024-02-05 09:37:29 -03:00
William Buezas 2de02723ba Abstract repetitive returns in a function 2024-02-05 09:31:12 -03:00
Alex Moreno 7b68f15781 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-05 12:54:58 +01:00
William Buezas 5280a4fa2d Remove '' in click.stop handle 2024-02-05 08:36:54 -03:00
William Buezas 7089202fe1 remove comment 2024-02-05 08:35:26 -03:00
William Buezas 584511bc62 Change EntryBuys table image proportions 2024-02-05 08:32:56 -03:00
William Buezas 6c8e736b17 changes in entry searchbar 2024-02-02 14:08:17 -03:00
William Buezas 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
William Buezas ba45f71a42 Entries several changes 2024-02-02 12:45:29 -03:00
William Buezas bb1ddf5900 add table rows selection 2024-01-31 21:22:32 -03:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
William Buezas 21050362c8 Add .json filter to ImportBuys QFile 2024-01-26 16:45:45 -03:00
William Buezas 93a4409c26 More entries corrections 2024-01-25 16:24:32 -03:00
William Buezas c43e7011a4 WIP 2024-01-25 08:53:24 -03:00
William Buezas 41605db454 Make card-list a global class 2024-01-23 11:45:25 -03:00
William Buezas 78f37f57c4 move QList element and classes inside VnFilterPanel 2024-01-23 11:42:26 -03:00
William Buezas bc2d58afaf Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-3 2024-01-23 10:15:35 -03:00
William Buezas f1ff128f4a Create supplier consumption filter and fix search bar bug 2024-01-23 10:15:08 -03:00
William Buezas 4731bdbabd Make card-list a global class 2024-01-22 12:25:59 -03:00
William Buezas def175bee2 move QList element and classes inside VnFilterPanel 2024-01-22 12:11:51 -03:00
William Buezas 5d0290f585 Fix QFile label translation in entry buys 2024-01-19 11:29:43 -03:00
William Buezas cae42486c8 apply nowrap to QTooltip 2024-01-19 11:25:19 -03:00
William Buezas c7b9f4ce5b Change entry buys plural translation logic 2024-01-19 11:16:35 -03:00
William Buezas 553dfceca8 Merge pull request 'feature/ApplyFilterSectionToEntryList' (#76) from feature/ApplyFilterSectionToEntryList into dev
Reviewed-on: hyervoni/salix-front-mindshore#76
2024-01-18 12:22:47 +00:00
William Buezas 161bfab443 Add subfilter to entry list view and entry descriptor improvements 2024-01-18 08:58:04 -03:00
William Buezas d818dd745a merge with dev and resolve conflicts 2024-01-17 17:37:12 -03:00
William Buezas 9cd1f542aa WIP 2024-01-17 13:02:44 -03:00
William Buezas 3671a7b449 Entry descriptor 2024-01-17 10:45:58 -03:00
William Buezas e6c59866d1 Entry notes submodule 2024-01-17 08:15:55 -03:00
William Buezas 64a4a800f7 Entry buys import 2024-01-16 16:11:23 -03:00
William Buezas 596904c4f8 Entry submodules: Log, Basic data, Buys (WIP) 2024-01-16 13:26:12 -03:00
William Buezas 91f675ec99 small table visual change in entry summary 2024-01-14 21:12:39 -03:00
William Buezas f64ac5c70d Entry summary 2024-01-12 17:02:52 -03:00
William Buezas 627226d3cd Entry list 2024-01-11 14:58:22 -03:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
William Buezas e8fa564bc2 Agregar * a inputs de campos required via css 2024-01-04 18:13:31 -03:00
William Buezas de8996d596 Fixes PR 2024-01-04 09:34:24 -03:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00