wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
5,045 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

648 Commits

Author SHA1 Message Date
Javier Segarra edd1b66110 fix: merge toDateHourMin 2024-04-21 16:09:21 +02:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Alex Moreno ae2737673d fix: hasMoreData 2024-04-19 14:43:38 +02:00
Alex Moreno c638209f0e fix: hasMoreData 2024-04-19 14:39:20 +02:00
Jorge Penadés 7a4f975cc9 fix: refs #6480 fix warning 2024-04-19 13:52:19 +02:00
Jorge Penadés bd539449a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-19 13:33:47 +02:00
Jorge Penadés c3db9e17a8 fix: refs #6480 reactive summary 2024-04-19 13:30:07 +02:00
Jorge Penadés e38b53ca25 fix: refs #6480 reactive descriptor 2024-04-19 13:12:14 +02:00
Jorge Penadés 3fb155e697 fix: refs #6480 reactivity 2024-04-19 11:57:04 +02:00
Jorge Penadés 2450d5bf7a reafacto: refs #6480 slots 2024-04-19 11:40:52 +02:00
Alex Moreno 6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-19 09:36:10 +02:00
Jon Elias 3f3b37fd4a refactor: refs #6767 fixed conflicts 2024-04-19 07:24:58 +02:00
Jorge Penadés 246944d2a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-18 14:10:41 +02:00
William Buezas b52b70041c resolve pnpm lock conflicts and change some colors 2024-04-18 08:33:23 -03:00
Javier Segarra 846c85ed1a Actualizar src/components/ui/VnPaginate.vue 2024-04-18 09:36:24 +00:00
Jorge Penadés 90ed6ad09a fix: refs #6480 drop secondary acroos 2024-04-18 10:49:17 +02:00
Jorge Penadés d6508f1930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-17 14:20:00 +02:00
Jon Elias 6839b5aac2 refactor: refs #6767 deleted <div class="col"> 2024-04-17 13:26:08 +02:00
Alex Moreno 52a0be449d feat: refs #6336 redesign 2024-04-17 10:58:07 +02:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-17 10:53:18 +02:00
Javier Segarra 248416b676 fix(lilium) #7180 SupplierList Scroll 2024-04-17 08:41:47 +02:00
William Buezas 813bab4e9d manage QCalendar customization classes from wrapper 2024-04-16 10:47:16 -03:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
William Buezas c82f4652f5 Move capitalize header week day to wrapper 2024-04-16 09:44:52 -03:00
William Buezas 256461a5bb Change current day colors 2024-04-16 09:41:03 -03:00
William Buezas 51eba2ea77 Add calendar wrapper 2024-04-16 09:28:48 -03:00
William Buezas 2ab7a45114 resolve conflicts 2024-04-16 08:49:34 -03:00
Jorge Penadés 68069ba9c6 feat: refs #6938 hide personal phone 2024-04-15 12:48:07 +02:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design 2024-04-15 12:28:43 +02:00
Alex Moreno 4efe09722f refs #6336 feat(claim): improvements 2024-04-15 08:40:15 +02: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
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar 2024-04-12 08:13:58 -03:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary 2024-04-11 11:37:11 +00:00
Alex Moreno 3f8d97e2a3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-11 12:32:51 +02:00
Alex Moreno d99d934dab fix: refs #7199 e2e 2024-04-11 12:29:30 +02:00
Jorge Penadés 170747371a fix: refs #6480 css 2024-04-11 12:27:58 +02:00
Jorge Penadés bfa9dc9634 feat: refs #6480 include drawer 2024-04-11 12:23:00 +02:00
Jorge Penadés edf75c8cdd feat: refs #6480 check if hasContent or slots 2024-04-11 09:22:15 +02:00
Jorge Penadés d7ab6e8a02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:41:52 +02:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 09:34:51 -03:00
William Buezas c881fe6577 Resolve conflicts 2024-04-10 09:19:54 -03:00
William Buezas e8486099fc Resolve conflicts 2024-04-10 08:37:52 -03:00
William Buezas c3835dfd7a resolve conflicts 2024-04-09 15:23:05 -03:00
William Buezas 9bffc9bb25 classes and size improvements 2024-04-09 15:20:29 -03:00
William Buezas 9ea0a62046 Add border and change background color 2024-04-09 14:03:18 -03:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id 2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes 2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view 2024-04-09 08:18:18 -03:00
Jorge Penadés 4fa311120d feat: refs #6480 hide if no content 2024-04-08 10:11:50 +02:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
Pablo Natek f18cefd999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles 2024-04-02 14:12:58 +02:00
Pablo Natek 148224344d feat(style): refs #7128 add style 2024-04-02 10:46:27 +02:00
Jorge Penadés 0d74c7f6c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:18:41 +01:00
Jorge Penadés 20102a89ab feat: refs #6893 improve VnSearchbar & create tests 2024-03-27 11:14:54 +01:00
Jorge Penadés a0dcd6aee1 feat: refs #6893 replace id & redirect to Card or list 2024-03-26 09:11:53 +01:00
Jorge Penadés b46760116f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-26 08:34:15 +01:00
Jorge Penadés f49c091461 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-25 08:50:18 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary 2024-03-22 14:57:36 +01:00
Javier Segarra b11462e244 refs #7124 perf: avoid focus in VnFilterPanel 2024-03-22 07:32:33 +01:00
Jorge Penadés f86c331afa feat: refs #5186 use arrayData in descriptor 2024-03-21 16:38:49 +01:00
Javier Segarra d7d83fd886 refs #7124 feat: autofocus without property 2024-03-21 14:56:39 +01:00
jcasado 2f27b8537c refactor: #6946 add table and floating button 2024-03-20 12:50:47 +01:00
Pablo Natek 2fa5b1303d remove(vnChip): refs #7001 remove component 2024-03-20 11:28:50 +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
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
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER 2024-03-15 03:12:46 +00: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
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
 2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER 2024-03-14 10:55:02 +00:00
William Buezas 4925bed845 resolve conflicts 2024-03-13 11:31:55 -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
Carlos Satorres 39009d055d fix px 2024-03-07 11:19:25 +01:00
Carlos Satorres cd8eb4ce5c refs #6892 fix checkbox 2024-03-07 09:24:17 +01:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/components/ui/VnPaginate.vue
 2024-03-06 23:19:47 -03:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
William Buezas 800b626c99 fire searchbar search on icon click 2024-03-06 08:21:26 -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
Pablo Natek 28b63831cc Merge branch 'dev' into 6486-salixColors 2024-03-06 08:41:49 +00:00
Carlos Satorres 207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact 2024-03-06 08:40:46 +00:00
Carlos Satorres ed44d96589 refs #6892 fix checkbox 2024-03-05 14:45:13 +01:00
Javier Segarra 8ad2aed994 refs #6935 perf: improve css class to handle content after 2024-03-05 13:10:29 +01: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
Carlos Satorres adc290da6d refs #6935 restyle card 2024-03-04 12:26:14 +01:00
Carlos Satorres f8872b81c5 refs #6892 rename color 2024-03-04 11:28:38 +01:00
Carlos Satorres bb17be2a8a refs #6892 remove label 2024-03-04 11:21:24 +01:00
Carlos Satorres 2ba9cc990d refs #6892 fix scss 2024-03-04 11:13:53 +01:00
Carlos Satorres c6f315d493 refs #6892 fix checkbox css 2024-03-04 10:32:51 +01:00
Carlos Satorres 8d4ba3d729 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact 2024-03-04 09:53:43 +01:00
Carlos Satorres fdf09710d8 refs #6892 fix checkbox 2024-03-04 09:51:51 +01:00
Carlos Satorres 04903928f5 refs #6892 fix css 2024-03-04 09:33:12 +01:00
Pablo Natek 3bfbcbe7d8 fix(searchBar): refs #6486 add contrast style on light theme searchBar 2024-03-01 13:53:35 +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
Carlos Satorres 0de5ad0648 refs #6892 refact summary 2024-03-01 08:36:04 +01:00
Alex Moreno 9119865ed6 Merge branch 'dev' into 6933-fetchedTagsRefact 2024-02-29 11:02:49 +00:00
Carlos Satorres 3804ec3e36 refs #6933 fetchedTags title fix 2024-02-29 09:22:44 +01:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module 
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
 2024-02-28 21:27:01 -03:00
William Buezas a0f9c811ff resolve conflicts 2024-02-28 12:56:13 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Jorge Penadés b1d8ce40bc fix: refs #6945 css vnRow 2024-02-28 15:13:43 +01:00
William Buezas fe5e448cf0 Change show summary icon condition 2024-02-28 10:13:49 -03:00
William Buezas f1961f07d1 CardSummary changes 2024-02-28 08:54:53 -03:00
Javier Segarra fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-02-28 10:58:22 +00:00
Pablo Natek fbd303f1f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-02-28 10:08:19 +01:00
William Buezas 5c8b3da33d Merge conflicts 2024-02-27 13:24:21 -03:00
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-27 08:23:02 +01:00
William Buezas f048a1c820 Add reactivity to supplier descriptor icons 2024-02-26 13:22:25 -03:00
Pablo Natek b092c5af6d refs 6486 commit 2024-02-26 15:00:14 +01:00
Jorge Penadés f90c3d7474 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6904-fixCustomerSection 2024-02-26 14:23:46 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList 2024-02-26 14:17:02 +01:00
Kevin Martinez 698a88e6f0 Fix infinite scroll in VnPaginate 2024-02-26 09:52:56 -03:00
Alex Moreno 6dd227769f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-26 12:43:45 +01:00
Javier Segarra e859fc29c8 refs #6935 feat: remove width, add text-align and label : 2024-02-26 08:33:17 +01:00
Javier Segarra 4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia 2024-02-26 07:11:33 +01: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
Alex Moreno c184851b26 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-21 08:49:40 +00:00
carlosfonseca 01d68734b6 Correccion de conflictos 2024-02-20 12:15:27 -05:00
carlosfonseca 86199d8197 Solucion a comentarios 14 2024-02-19 11:27:24 -05:00
William Buezas d5d8de08fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ExtraCommunityDragAndDrop 2024-02-19 09:24:10 -03:00
Carlos Satorres 5cc2384149 refs #6763 remove 2024-02-19 11:30:04 +01:00
Carlos Satorres 7397f07463 refs #6763 remove 2024-02-19 11:29:30 +01:00
Carlos Satorres 01850c6670 refs #6763 pointer 2024-02-19 11:24:49 +01:00
Carlos Satorres 4eb2f1f725 Merge branch '6763-vnTreeRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-19 10:26:08 +01:00
Carlos Satorres 3a48d09080 refs #6763 refactor node 2024-02-19 10:26:05 +01:00
Alex Moreno e8a4dd65e2 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-19 08:35:15 +00:00
Javier Segarra fddc669729 refs #6763 feat: fix features 2024-02-19 05:51:35 +01:00
Carlos Satorres 5f28296725 Merge branch 'dev' into 6795-claimRefact 2024-02-16 13:06:21 +00:00
Carlos Satorres deacf0feef Merge branch 'dev' into 6787-loadingDescriptor 2024-02-16 12:50:32 +00:00
William Buezas e29801a47e General improvements and handle params changes in VnFilterPanel 2024-02-14 22:14:44 -03:00
Carlos Satorres 926395a7e7 refs #6763 fix tree descriptor 2024-02-14 15:31:53 +01:00
Carlos Satorres 1e5638b487 refs #6787 fix descriptor skeleton 2024-02-13 12:44:20 +01:00
Carlos Satorres c2675bfe56 refs #6763 fix descriptor 2024-02-13 11:31:33 +01:00
Alex Moreno 1db827a7c8 refs #6795 fix: claim paddings and colors 2024-02-13 08:03:31 +01:00
Carlos Satorres e3e0439d7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-12 14:07:08 +01: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
Carlos Satorres d13bf60ea3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact 2024-02-09 09:08:56 +01:00
Carlos Satorres b3251967b8 refs #6795 fix descriptor 2024-02-09 09:07:54 +01:00
Carlos Satorres 2f081841f9 refs #6795 fix claims 2024-02-08 13:59:37 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +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
Carlos Satorres 7175c50bd6 refs #6763 popup fix click 2024-02-06 09:50:18 +01: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
Carlos Satorres 760b2d5574 refs #6787 isLoading CardDescriptor 2024-02-05 10:30:23 +01:00
William Buezas 6c8e736b17 changes in entry searchbar 2024-02-02 14:08:17 -03:00
Carlos Satorres c6a9ec5415 refs #6763 fix changes 2024-02-02 09:55:38 +01:00
Carlos Satorres 5450f948a3 refs #6763 fix tree 2024-02-01 12:35:20 +01:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
Carlos Satorres 78877556cf refs #6763 click 2024-01-31 12:52:50 +01:00
Jorge Penadés 3c67e1d51c Merge branch '6654-stickySubToolbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-30 10:30:09 +01:00
Jorge Penadés 66e119adc3 fix: refs #6654 btn responsive & replace toolbars 2024-01-30 10:30:07 +01:00
Javier Segarra 8200b19238 Merge branch 'dev' into 6654-stickySubToolbar 2024-01-30 08:25:24 +00:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard 2024-01-29 13:59:51 +00:00
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-29 14:10:58 +01:00
William Buezas 5e296869a1 More improvements 2024-01-29 08:59:20 -03:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css 2024-01-29 10:25:59 +01:00
Alex Moreno f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3 2024-01-29 08:15:25 +01:00
Jorge Penadés d86ac6f31b feat: refs #6654 sticky class 2024-01-26 16:08:49 +01:00
William Buezas 78f37f57c4 move QList element and classes inside VnFilterPanel 2024-01-23 11:42:26 -03:00
Alex Moreno 6bccd4b24f Merge branch 'dev' into 6339-cilpboard 2024-01-22 09:22:14 +00:00
Carlos Satorres 259902a7ea refs #6339 composable 2024-01-18 14:59:51 +01:00
Carlos Satorres 339d6609aa refs #6339 clipboard 2024-01-18 13:33:14 +01:00
William Buezas 3671a7b449 Entry descriptor 2024-01-17 10:45:58 -03:00
Javier Segarra a94fb6026a refs #6704: remove bad code 2024-01-16 12:14:48 +01:00
Javier Segarra b58f9bee2e refs #6704: fix bug 2024-01-16 11:24:28 +01:00
Javier Segarra 9daffdfa22 refs #6704: posible fix 2024-01-16 08:40:03 +01:00
Javier Segarra 972c340fad refs #6704: fix1 2024-01-15 14:44:38 +01:00
William Buezas 627226d3cd Entry list 2024-01-11 14:58:22 -03:00
Jorge Penadés ae94ff014d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6630-fixCssVnLog 2024-01-11 15:59:04 +01:00
Javier Segarra 0f1cfc0041 Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 12:37:35 +00:00
Alex Moreno 13d24e936e Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 11:22:14 +00:00
Alex Moreno bc46435299 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-11 12:09:16 +01:00
Jorge Penadés 1bc2abdab2 fix: refs #6630 drop unused imports 2024-01-11 11:44:53 +01:00
Jorge Penadés 3c8022ac45 feat: refs #6630 VnAvatar letter feature added 2024-01-10 16:49:09 +01:00
Jorge Penadés cdadb57af3 fix: refs #6630 resolve conficts 2024-01-10 15:41:00 +01:00
Jorge Penadés 0eb7d0f1b0 fix: refs #6630 resolve conficts 2024-01-10 15:35:01 +01:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01:00
Carlos Satorres b83a773278 refs #6420 fix pr 2024-01-09 14:55:52 +01:00
Jorge Penadés 3e8744c837 fix: refs #6630 fix css 2024-01-09 14:24:29 +01:00
Javier Segarra 8861ee038d refs #6384 fix: redirect to same path when id change 2024-01-09 10:35:39 +01:00
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-09 07:47:55 +01:00
Carlos Satorres 63b1c53ca9 refs #6420 scss fix 2024-01-08 14:17:40 +01:00
Carlos Satorres 651cc6b1ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary 2024-01-08 13:46:33 +01:00
Alex Moreno 94e4bb383a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-08 12:02:00 +01:00
Alex Moreno dcedc314f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-08 12:01:38 +01:00
Pablo Natek ad2844d88d fix(workerDescriptor): refs #6611 fix workerpopUp 2024-01-08 08:37:36 +01:00
Kevin Martinez 8a6e78a143 Merge branch 'dev' into feature/order-catalog-filter 
# Conflicts:
#	src/components/ui/VnFilterPanel.vue
#	src/pages/Order/Card/OrderCatalogFilter.vue
#	src/pages/Order/OrderCatalog.vue
 2024-01-05 13:13:03 -04:00
Kevin Martinez c997d19a5e Implement tag filter 2024-01-05 13:04:06 -04:00
Pablo Natek 11a37b7716 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-04 14:47:46 +00:00
Carlos Satorres 7ae05f23fc refs #6420 notes 2024-01-04 14:38:33 +01:00
William Buezas cfac9acbe8 Small corrections 2024-01-04 09:58:37 -03:00
William Buezas de8996d596 Fixes PR 2024-01-04 09:34:24 -03:00
Kevin Martinez 467f32d9e0 Merge remote-tracking branch 'origin/branch-PR-2' into branch-PR-2 2024-01-03 10:50:42 -04:00
Kevin Martinez 2af176a502 Fix catalog filter 2024-01-03 10:50:26 -04:00
William Buezas a66b88ba8e add delete department popup translation 2024-01-03 10:59:11 -03:00
Carlos Satorres 9cd20439a6 refs #6618 fix name 2024-01-03 14:09:29 +01:00
Carlos Satorres 3c98d099b3 refs #6618 component Cards 2024-01-03 13:00:45 +01:00
Carlos Satorres 92127b766b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar 2024-01-03 13:00:25 +01:00
Carlos Satorres 6b23c988b3 refs #6618 component vnSubToolBar 2024-01-03 11:06:03 +01:00
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord 2024-01-03 08:16:56 +00:00
Kevin Martinez 606f4f0892 Implement orders catalog tag filter 2024-01-02 11:40:07 -04:00
Carlos Satorres 191114cf85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6256-breakWord 2023-12-26 11:54:51 +01:00
Pablo Natek f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
William Buezas 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03:00
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms 2023-12-21 18:59:13 +01:00
Carlos Satorres 9a4a3e846e refs #6256 remove hypens 2023-12-20 13:28:58 +01:00
Kevin Martinez af5f87a6a1 Add catalog filter 2023-12-20 01:52:28 -04:00
Kevin Martinez ecad464366 Add search filter 2023-12-19 21:33:38 -04:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
Jorge Penadés 94278e2f53 refactor: refs #5835 2023-12-18 15:36:56 +01:00
William Buezas 433823c2ac Invoice out negative bases refactor 2023-12-15 10:23:57 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
 2023-12-14 07:08:58 -04:00
William Buezas b3e0f4979a add is-outlined prop to VnInputDate and merge with dev 2023-12-13 14:31:48 -03:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
Jorge Penadés 2c5dc276b2 refs #5835 2023-12-12 09:01:32 +01:00
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
William Buezas bd69d0cb34 merge with dev 2023-12-11 10:27:05 -03:00
carlosfonseca 1313c50e0f Se hace cambio de color usando la paleta 2023-12-11 07:42:19 -05:00
Jorge Penadés ea12508fff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 08:27:07 +01:00
Pablo Natek e7d22052a7 merge(dev): refs #6475 merge dev 2023-12-11 06:45:48 +01:00
carlosfonseca 02027d4392 Se corrige error por falta de importacion 2023-12-07 12:43:07 -05:00
carlosfonseca c2705ec603 Se hacen correcciones segun solicititud para aprobacion del PR 2023-12-07 12:36:29 -05:00
Jorge Penadés 97789f2cdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-12-07 15:51:58 +01:00
Pablo Natek fd1f46ffc6 feat(claimList): refs #6475 claimList add links 2023-12-07 12:51:47 +01:00
William Buezas baca1281bf Input text refactor 2023-12-06 13:23:32 -03:00
William Buezas f8031734fa resolve conflicts 2023-12-05 12:27:53 -03:00
William Buezas e64960d234 Extra community 2023-12-05 12:25:25 -03:00
Carlos Satorres d328951ac1 refs #6256 refactor line break 2023-12-05 14:26:11 +01:00
carlosfonseca 9f3fe3665b Se cambia visualmente el componente que controla las descargas 2023-12-04 12:02:47 -05:00
Jorge Penadés 3d046e4bf7 refs #5835 summary grid updated 2023-12-04 14:21:29 +01:00
Kevin Martinez f6067a6803 Merge branch 'dev' into feature/shelving 2023-12-01 08:25:47 -03:00
William Buezas 815231fec9 resolve conflict 2023-12-01 08:23:06 -03:00
Kevin Martinez 11a029289b Merge branch 'dev' into feature/shelving 2023-12-01 08:16:17 -03:00
Kevin Martinez b11253ba28 Implement shelving filter 2023-11-30 17:02:18 -03:00
carlosfonseca 820ebe00af Se cambia nombre y se implementa en todos los componentes 2023-11-30 11:37:42 -05:00
carlosfonseca 22cf914dc6 Correcciones post PR 2023-11-29 11:48:06 -05:00
Kevin Martinez ce4f7d79ed Fix MR 2023-11-28 12:08:33 -03:00
Kevin Martinez 008dfd1be8 Fix merge conflicts 2023-11-28 11:58:42 -03:00
carlosfonseca f002fd2a98 Se agrega condicional para mostrar checkbox 2023-11-28 08:51:55 -05:00
carlosfonseca 2d08e55c85 Se mejora logica de descarga csv 2023-11-28 08:11:32 -05:00
Jorge Penadés f75b81db71 refs #5835 fix conflicts 2023-11-28 12:08:20 +01:00
Jorge Penadés 0282f8dde8 refs #5835 rate fixed & options descriptor created 2023-11-28 12:05:39 +01:00
Alex Moreno 54379b3e65 typo 2023-11-24 13:32:20 +01:00
Alex Moreno 023cfc6ac7 refs #6062 feat(arrayData): support exprBuilder 2023-11-24 13:31:08 +01:00
Pablo Natek 0114de4db5 feat(preview): refs #6475 add preview icon on descriptor 2023-11-24 09:41:57 +01:00
Jorge Penadés bc2256a021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 09:25:29 +01:00
Carlos Satorres c3d9085a57 refs #6157 minorFix 2023-11-24 08:10:44 +01:00
carlosfonseca 8a47fa0d0b Se hace corrección en el desplegable 2023-11-23 12:28:51 -05:00
Carlos Satorres d03092f41d refs #6157 arrayData 2023-11-23 15:50:42 +01:00
Kevin Martinez 8e0ee45901 Create Shelving list module 
Adds shelving list, preview and update
 2023-11-23 01:17:23 -03:00
William Buezas d0cb96ce23 merge with dev 2023-11-22 15:26:59 -03:00
William Buezas 14788b7f7c Suppliers list and suppliers create view 2023-11-22 15:05:12 -03:00
carlosfonseca 737d3020fe Se hacen las mejoras en las tarjetas y menu lateral 2023-11-22 09:33:47 -05:00
carlosfonseca bcd3b2be93 Se agrega un desplegable en el detalle de las tarjetas 2023-11-21 07:11:00 -05:00
Carlos Satorres ce4fe44b03 refs #6157 refactor 2023-11-17 14:06:43 +01:00
carlosfonseca 01eb68aed8 Se crea actualizacion de tarjeta en invoices out 2023-11-16 13:40:05 -05:00
Jorge Penadés 112e057cfa ref #5835 invoiceIn created 2023-10-31 08:56:51 +01:00
Jorge Penadés 1d9663637c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-30 13:52:10 +01:00
Jorge Penadés 27bddff445 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-30 09:32:36 +01:00
Pablo Natek 157a2b854e fix(vnRow): refs #6118 remove script label 2023-10-25 18:49:44 +02:00
Pablo Natek 36cf762857 feat(VnRow): add new conponenet VnRow refs #6118 2023-10-25 18:45:29 +02:00
Carlos Satorres 7c9322d52c refs #6256 lv breakword 2023-10-24 12:49:36 +02:00
Alex Moreno eb3f9aa4b0 Merge branch 'dev' into 6067-vverifyEmailSection 2023-10-19 08:50:09 +00:00
Jorge Penadés eed1c68819 ref #6248 merge and fix conflicts 2023-10-19 08:37:40 +02:00
Jorge Penadés ff9bd2e1e6 ref #5417 filter fixed 2023-10-18 12:29:56 +02:00
Alex Moreno 4193876917 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6067-vverifyEmailSection 2023-10-18 07:47:25 +02:00
Jorge Penadés 71701aaa40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-10-13 12:29:49 +02:00
Jorge Penadés e60a7e28bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-13 12:29:25 +02:00
Alex Moreno ff347db37a refs #5673 fix crudModel, claimDevelopment and VnSelect 2023-10-11 15:59:41 +02:00
Jorge Penadés e5ffd2faad ref #5417 params fixed 2023-10-11 12:32:33 +02:00
Jorge Penadés 6d116b9798 ref #5417 search and refresh fixed 2023-10-11 10:54:11 +02:00
Jorge Penadés 0aefe13935 ref #5417 fix autoload and filters 2023-10-11 10:40:13 +02:00
Jorge Penadés 318e2f2277 ref #6248 breadcrumbs created 2023-10-06 09:11:29 +02:00
Alex Moreno 91de6eb56e refs #6067 feat: outLayout verifyEmail 2023-10-02 14:54:00 +02:00
Jorge Penadés 98b76b2f53 ref #5417 autoload and filters reload fixed 2023-09-29 13:59:06 +02:00
Jorge Penadés 462be6584a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-09-29 12:55:58 +02:00
Jorge Penadés dd09683802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-29 08:30:42 +02:00
Jorge Penadés 7ae098d779 ref #5417 fix filters and view 2023-09-27 13:41:50 +02:00
Alex Moreno 1637921fab refs #5673 fix: VnSelect update model, feat(claimDevelopment) add reload function 2023-09-25 12:06:49 +02:00
Alex Moreno 3a5002b3a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-09-18 10:41:31 +02:00
Jorge Penadés a4a62c8e3b ref #6175 match linkPhone 2023-09-07 09:27:23 +02:00
Jorge Penadés e4efffb336 ref #6175 simplify the component 2023-09-07 08:23:55 +02:00
Jorge Penadés 48b4fd96e5 ref #6175 scheme url removed 2023-09-06 14:40:26 +02:00
Jorge Penadés 5bcd5a8e85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-06 14:25:29 +02:00
Jorge Penadés 0882c3440d ref #6105 fix dialog 2023-09-01 13:09:30 +02:00
Jorge Penadés 3a3ae14dc5 ref #6175 VnLinkPhone and MicroSIP icon created 2023-08-31 09:05:21 +02:00
Alex Moreno edc55f2154 Merge branch 'dev' into 5673-claim-development 2023-08-25 10:52:13 +00:00
Jorge Penadés d4abba6170 refs #6105 VnAvatar description fixed 2023-08-25 11:48:04 +02:00
Jorge Penadés 3a55429668 refs #6105 fix notes dialog width 2023-08-25 11:09:23 +02:00
Alex Moreno a09b4ff548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 10:48:27 +02:00
Alex Moreno c365682e3c refs #5673 fix: crudModel and finish e2e 2023-08-24 15:05:31 +02:00