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

1724 Commits

Author SHA1 Message Date
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests 2024-04-16 11:42:43 +02:00
Guillermo Bonet 7b29832966 feat: refs #6968 Changed groupingMode to enum 2024-04-16 11:12:23 +02:00
Pablo Natek c65c09c39c feat(agency): refs #4988 add agency router and sections 2024-04-16 07:45:33 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
William Buezas fcce2b5070 Add filter 2024-04-15 08:46:26 -03:00
Jorge Penadés b2211369ea fix: refs #6938 remove personal phone 2024-04-15 13:30:42 +02:00
Jorge Penadés 1e77e82784 fix: refs #6938 id filter 2024-04-15 13:28:10 +02: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 6e0510f0bd feat(supplierSummary): refs #6898 use VnTitle 2024-04-15 08:58:39 +02:00
Alex Moreno 4efe09722f refs #6336 feat(claim): improvements 2024-04-15 08:40:15 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -03:00
William Buezas 2699040f0e Item request view 2024-04-12 16:50:41 -03:00
William Buezas 5f46ad225e Fix genus and specie value 2024-04-12 10:44:56 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations 2024-04-12 10:32:19 -03:00
William Buezas d38c85a0ef resolve conflicts 2024-04-12 09:39:34 -03:00
William Buezas b4d92d4f97 Fix Options item labels 2024-04-12 09:35:57 -03:00
Carlos Satorres ee80b1d617 refs #6976 changes table 2024-04-12 14:34:11 +02:00
Jon Elias 5cd32ec2fe Merge branch 'dev' into 6425-translationProposal 2024-04-12 12:21:41 +00:00
William Buezas 6019c7f7b2 Add remove chip button only if is manual 2024-04-12 08:41:45 -03:00
William Buezas 9283b190b0 Differentiate manual chips 2024-04-12 08:35:39 -03: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 c4a8127a5b Add toggle right drawer button 2024-04-12 08:24:56 -03:00
William Buezas 0006761201 Use black background on WorkerDateLabel 2024-04-12 08:22:17 -03: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
William Buezas 3d9d444bb4 remove filter field 2024-04-12 08:11:58 -03:00
William Buezas c12fd77218 Remove businessFk from FetchData 2024-04-12 08:10:14 -03:00
William Buezas f72ea07b09 WIP 2024-04-12 08:07:33 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts 2024-04-12 11:44:56 +02:00
Carlos Satorres b5aae63e15 refs #6976 supplier onUnmounted 2024-04-12 08:47:25 +02:00
Pablo Natek af9fd6ed73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-12 07:52:37 +02:00
William Buezas 98f273cb93 WIP 2024-04-11 18:04:11 -03:00
jcasado ad8007fe6b refs #6641 add checkbox 2024-04-11 13:42:37 +02:00
William Buezas c032c83e7f Item create view 2024-04-11 08:40:41 -03:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary 2024-04-11 11:37:11 +00: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 96d3073f67 Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" 
This reverts commit 984539b70f, reversing
changes made to d7ab6e8a02.
 2024-04-11 09:01:44 +02:00
Jorge Penadés 984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:42:17 +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 4a0ae8aa45 Item summary 2024-04-10 17:18:57 -03:00
Javier Segarra 5f502c2aad #6480: POC Claims 2024-04-10 20:52:45 +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 99c576b16e Add actions again 2024-04-10 09:32:15 -03:00
Carlos Satorres 0cc672d75a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-10 14:20:19 +02:00
William Buezas c881fe6577 Resolve conflicts 2024-04-10 09:19:54 -03:00
Carlos Satorres 904f647a5b refs #7172 fix vnSelectFilter 2024-04-10 14:16:20 +02:00
William Buezas e676933942 Update worker dms remove 2024-04-10 08:59:05 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 08:46:00 -03:00
William Buezas e8486099fc Resolve conflicts 2024-04-10 08:37:52 -03:00
William Buezas e4a8c45053 Change workweeks colod and capitalize 2024-04-10 08:32:04 -03:00
William Buezas 39af4278a6 Add delete model to worker dms 2024-04-10 08:27:30 -03:00
Jorge Penadés 14d9147cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-10 13:02:22 +02:00
Jon Elias 6a203f593f Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-04-10 12:53:45 +02:00
Jon Elias eb91c0b1c2 Merge branch 'dev' into 6425-translationProposal 2024-04-10 12:53:44 +02:00
jcasado c640ba1298 fix set 2024-04-10 09:31:38 +02:00
jcasado 70c9f1dea4 refs #7179 changes pr 2024-04-10 09:29:26 +02:00
Jon Elias 09ceefb7c5 style: refs #7186 fixed style 2024-04-10 08:49:54 +02:00
Jon Elias f9de26933a refactor: refs #7186 fill-icon change 2024-04-10 08:00:36 +02:00
William Buezas e88194eb88 Update worker dms model prop 2024-04-09 16:00:12 -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 faa8d05313 Change saturday and sunday days color 2024-04-09 14:48:51 -03:00
William Buezas c573019038 Sizes and spacings 2024-04-09 14:13:40 -03:00
William Buezas 9ea0a62046 Add border and change background color 2024-04-09 14:03:18 -03:00
William Buezas dfcf6e35d5 Change WorkerEventLabels separations 2024-04-09 11:06:07 -03:00
William Buezas 3e5a5dfe1c remove import 2024-04-09 10:53:07 -03:00
William Buezas 9c3407846b Fix translation 2024-04-09 10:30:40 -03:00
jcasado d8ef199b14 refs #7179 remove code 2024-04-09 14:55:27 +02:00
William Buezas 881c6e2f7f Improve translations 2024-04-09 09:54:23 -03:00
William Buezas fb4f35a378 Rename WorkerDateLabel and change colors 2024-04-09 09:21:35 -03:00
William Buezas 0941d74d52 Move default value assignment 2024-04-09 09:14:41 -03:00
William Buezas 196679b9e9 Change v-if variable 2024-04-09 09:07:46 -03:00
William Buezas e4166c85fa Move add absences text to a i18n variable 2024-04-09 09:05:15 -03:00
William Buezas b05c28f571 Add chaining to holiday detail and holiday type 2024-04-09 08:57:39 -03:00
William Buezas 0144aab7a5 Mini fix 2024-04-09 08:51:00 -03:00
Jon Elias 15d4b54dda refactor: refs #7186 fixed changes 2024-04-09 13:34:45 +02: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
Jon Elias 65626446fd refactor: refs #7186 fixed style and tab 2024-04-09 13:01:29 +02:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
William Buezas 64ff5e4446 Add pagination and table actions 2024-04-08 11:40:44 -03:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Carlos Satorres f60670cb87 refs #7172 change vnselectfilter 2024-04-08 10:49:53 +02:00
Jorge Penadés dfac40adb3 feat: refs #6480 vnCard 2024-04-08 10:27:37 +02:00
William Buezas 4b6038d1d2 Last changes 2024-04-06 14:10:08 -03:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-04-05 09:11:23 -03:00
William Buezas 52611beaf1 Changes in isHimSelf computed and FormPopup buttons order 2024-04-05 08:57:25 -03:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
William Buezas dae08c322d visual adjustments 2024-04-05 08:04:34 -03:00
Guillermo Bonet 1a15ccec2c fix: refs #6636 Call getEnumValues method 2024-04-05 11:01:48 +02:00
Guillermo Bonet 58b9eb1c78 feat: refs #6636 Requested changes 2024-04-05 07:29:25 +02:00
Guillermo Bonet 8d7670cc85 Merge branch 'dev' into 6636-pickup 2024-04-05 05:24:31 +00:00
William Buezas ec2604b9ab Fix customer samples create preview 2024-04-04 14:28:51 -03:00
William Buezas 87f376464b Wait to render teleport until subtoolbar is shown 2024-04-04 13:48:57 -03:00
William Buezas 1cff622898 Fix customer balance calculation 2024-04-04 11:55:43 -03:00
William Buezas 82f259be32 Add focus to amount input in customer unpaid 2024-04-04 11:30:09 -03:00
William Buezas 78dc3c1c9a Move data fetching to main component 2024-04-04 11:20:30 -03:00
William Buezas fd5ea8f6f5 WIP 2024-04-04 09:27:17 -03:00
Jon Elias 97b7c2469a refactor: refs #6894 changed filter fields and checked functionality 2024-04-04 14:13:34 +02:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim 2024-04-04 14:12:16 +02:00
William Buezas 580af396d1 Change buttons group 2024-04-04 08:45:03 -03:00
William Buezas 503efb79c9 WIP 2024-04-04 08:39:52 -03:00
Javier Segarra 0ad722381e #6425 fix quotes in yml file 2024-04-04 13:38:25 +02:00
William Buezas 0f6c6cde91 Improve visually WorkerDateLabel 2024-04-03 17:32:22 -03:00
Pablo Natek be42593368 Merge branch 'dev' into 7128-copyStyles 2024-04-03 19:10:38 +00:00
William Buezas 60b146196f add calendar short-weekday-label 2024-04-03 13:48:41 -03:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Pablo Natek c0ed8da0b7 remove space 2024-04-03 15:02:31 +02:00
Pablo Natek fb6a2c8097 feat: refs #4988 add agencyList and searchBar 2024-04-03 14:59:51 +02:00
Jon Elias 94b177c9a2 fix: refs #6425 fix yml format 2024-04-03 14:33:47 +02:00
William Buezas 64b1083619 Add today date 2024-04-03 09:28:38 -03:00
Jon Elias 3e423867e3 fix: refs #6425 fix yml format 2024-04-03 13:12:00 +02:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
Jon Elias cb31c2baa2 refs: #6425 merge conflicts 2024-04-03 12:56:56 +02:00
jcasado cd49ebe7a6 refs #6697 fix claimQuantity 2024-04-03 12:54:14 +02:00
Jon Elias fb795f65ee refactor: refs #6425 test changes 2024-04-03 09:49:15 +02:00
Pablo Natek 6c39c7da97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-03 08:40:15 +02:00
Pablo Natek f404243d63 feat(route): refs # agency add agencyList 2024-04-03 08:38:26 +02:00
William Buezas 507c979cc2 Remove unused reactive import 2024-04-02 12:48:14 -03:00
William Buezas 3569afdb85 Update fetch-data name 2024-04-02 12:46:50 -03:00
William Buezas 71b2f7c8dc Remove col divs 2024-04-02 12:43:32 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
William Buezas 835174612c Make value comparision not strict 2024-04-02 10:09:28 -03:00
William Buezas 026588c03d WorkerTimeForm set initial data 2024-04-02 09:30:59 -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
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Kevin Martinez 47a588fff4 Update WorkerCalendarItem 2024-04-02 09:00:15 -03:00
William Buezas 107eaea704 Remove unused variable in CustomerSummaryTableActions 2024-04-02 08:57:22 -03:00
William Buezas 3e124581c4 Remove route import in CustomerCard 2024-04-02 08:37:52 -03:00
Pablo Natek 148224344d feat(style): refs #7128 add style 2024-04-02 10:46:27 +02:00
Jon Elias 1316fe3896 Merge branch 'dev' into 7130-addFieldInRoutes 2024-04-02 05:14:15 +00:00
William Buezas 6bb0d30284 Move Worker Time control componente to Card folder 2024-04-01 21:19:55 -03:00
William Buezas 3cb045936b Replace Customer File management dateTime formatting with new utils 2024-03-28 16:25:02 -03:00
William Buezas 73ea49df63 Replace Customer Greuges dateTime formatting with new utils 2024-03-28 16:21:49 -03:00
William Buezas 093c367d7e Replace Customer Mandates dateTime formatting with new utils 2024-03-28 16:18:36 -03:00
William Buezas fb59ac1f2f Remove single quotes and colon 2024-03-28 16:15:44 -03:00
William Buezas f6b8a73ae2 Improve Customer Notes classes definition 2024-03-28 16:13:39 -03:00
William Buezas e1f8b7217a Replace Customer Notes dateTime formatting with new utils 2024-03-28 16:11:01 -03:00
William Buezas c856adc8d0 Replace customer samples dateTime formatting with new utils 2024-03-28 16:07:20 -03:00
William Buezas 998561badd Change customer unpaid initial date 2024-03-28 15:58:07 -03:00
William Buezas 239daceca6 Apply changes in Worker PBX 2024-03-28 13:45:35 -03:00
William Buezas cb238476e7 Components reubication and change calendar selected date color 2024-03-28 09:47:39 -03:00
William Buezas 1fc6eed1d5 Clean props when switching between edit and create mode in WorkerTimeForm 2024-03-28 08:31:55 -03:00
Jon Elias 37d869d1d5 refactor: refs #7130 requested changes 2024-03-28 12:19:55 +01:00
Jorge Penadés 7020fab851 fix: refs #6951 drop hook & change selector 2024-03-28 09:46:18 +01:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier 2024-03-28 07:17:28 +00:00
Javier Segarra da93b9cca8 updates 2024-03-28 07:20:54 +01:00
William Buezas 0d6d18b8c8 Apply VnDmsList component and add docuware action 2024-03-27 20:33:35 -03:00
Kevin Martinez 0dee7e8cc9 Create worker calendar submodule 2024-03-27 16:51:44 -03:00
William Buezas 37465ffa4a resolve conflicts 2024-03-27 11:23:54 -03:00
carlosfonseca 8cf14929e3 Se implementa nuevo componente para la gestion de notas 2024-03-27 08:52:31 -05:00
William Buezas b546b63352 resolve conflicts 2024-03-27 10:11:20 -03:00
William Buezas 112112b069 Small change 2024-03-27 09:13:53 -03:00
William Buezas de912b266c Finish calendar integration 2024-03-27 08:26:28 -03:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor 2024-03-27 10:02:18 +00:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 08:30:37 +01:00
Jon Elias 6df1d0cf99 feat: #7130 added "served" field to RouteList table and added to the filter too. 2024-03-27 07:55:50 +01:00
carlosfonseca 081d4bf5fc Solucion a comentarios 4 2024-03-26 23:11:41 -05:00
carlosfonseca 1d37b91e09 Solucion a comentarios 3 2024-03-26 17:17:40 -05:00
William Buezas 0a74b2a96e QCalendar implementation WIP 2024-03-26 15:38:06 -03:00
Jon Elias 9f24f1f97c refactor: refs #6993 merged conflicts 2024-03-26 09:44:54 +01: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 50b116627b Merge branch '6993-HideAllPagination' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:10:00 +01:00
Jon Elias 4a7cb8fe8d refactor: refs #6993 fixed conflict 2024-03-26 09:09:58 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium 2024-03-26 08:55:01 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor 2024-03-26 06:41:39 +00:00
carlosfonseca 627d3bbe85 Se implementan las correcciones a los comentarios 2024-03-25 16:00:47 -05:00
William Buezas 5964189a83 Implement WorkerDateLabel 2024-03-25 10:41:10 -03:00
Kevin Martinez 5e089e616e Merge branch 'dev' into feature/worker-log 2024-03-25 12:00:06 +00:00
Alex Moreno fc5dbdfbb3 Merge branch 'dev' into 6971-MoveBtnToSubtoolbar 2024-03-25 10:48:12 +00:00
Jon Elias 84a25acf22 refactor: refs #6988 used global translations 2024-03-25 11:42:29 +01:00
Jon Elias b7b6d55d1c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor 2024-03-25 10:06:54 +01:00
Jon Elias bf0e2d3bf6 refactor: refs #6971 fixed request changes 2024-03-25 09:52:04 +01:00
Alex Moreno bd51306fd9 Merge branch 'dev' into 6837-moveSearchById 2024-03-25 08:40:28 +00:00
Jon Elias a530e44179 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar 2024-03-25 09:26:45 +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
Kevin Martinez 3d1e34a5b0 Create worker date label 2024-03-24 16:05:04 -03:00
William Buezas 71a4a20f20 Disable text area when is not himself 2024-03-22 18:38:18 -03:00
William Buezas 6f97ee1aeb improvements 2024-03-22 18:33:25 -03:00
William Buezas f1faf18523 General improvements 2024-03-22 14:10:00 -03:00
Jorge Penadés 2bb95fa568 rafactor: refs #6951 actions descriptor & update changelog 2024-03-22 16:31:10 +01:00
Jorge Penadés c911dc5cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6951-cloneTicket 2024-03-22 15:39:10 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary 2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker 2024-03-22 08:30:54 -05:00
Jon Elias 4678085575 Merge branch 'dev' into 6837-moveSearchById 2024-03-22 12:48:30 +00:00
Jon Elias 17145b7fe8 fix: refs #6988 fix style 2024-03-22 13:36:31 +01:00
Jon Elias 0a2e8a7995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor 2024-03-22 13:29:17 +01:00
William Buezas bdd0e657ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-03-22 08:36:41 -03:00
Jon Elias 0c8f5f4888 refactor: refs #6971 moved correct button + unmade previous changes 2024-03-22 08:15:00 +01:00
William Buezas d20828ac7c remove console.logs 2024-03-21 13:15:11 -03:00
Jorge Penadés f86c331afa feat: refs #5186 use arrayData in descriptor 2024-03-21 16:38:49 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-21 15:31:15 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Jon Elias 61e7a77882 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar 2024-03-21 12:25:04 +01:00
Jon Elias 7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-03-21 12:23:45 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal 2024-03-21 12:14:54 +01:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log 2024-03-21 08:01:57 -03:00
Pablo Natek eb799c6321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-21 10:37:48 +01:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker 2024-03-20 16:55:09 +00:00
carlosfonseca c06d810fe9 Soluciones a comentarios 1 2024-03-20 11:53:03 -05:00
William Buezas 522b01b293 WIP 2024-03-20 10:31:42 -03:00
jcasado 2f27b8537c refactor: #6946 add table and floating button 2024-03-20 12:50:47 +01:00
Pablo Natek 1da314e425 fix(claimLines): refs #7001 add style to clear qchip 2024-03-20 11:41:16 +01:00
Pablo Natek 5580d15606 remove: refs #7001 custom chip 2024-03-20 11:30:43 +01:00
Pablo Natek 2fa5b1303d remove(vnChip): refs #7001 remove component 2024-03-20 11:28:50 +01:00
William Buezas 2ea6fd2ea6 Change vnconfirm export name 2024-03-19 13:50:15 -03:00
William Buezas 7ff8bc642e WIP 2024-03-19 13:39:46 -03:00
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Kevin Martinez cf25476a5d Create worker log 2024-03-18 21:04:52 -03:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx 2024-03-18 08:39:10 -05: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
Alex Moreno e99b727b77 Merge branch 'dev' into 6993-HideAllPagination 2024-03-18 11:01:23 +00:00
Jon Elias d365a36c7e fixed useless variable 2024-03-18 09:51:30 +01:00
Jon Elias fe7d370a0a refactor: refs #6837 move travel search like other sections 2024-03-18 09:48:27 +01:00
Jorge Penadés f0e414e160 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-18 09:47:06 +01:00
Jorge Penadés 5803b8392b feat: refs #6951 clone ticket 2024-03-15 16:30:12 +01:00
William Buezas dce974eba4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-15 10:20:46 -03:00
William Buezas d12fa85d73 WIP 2024-03-15 10:20:07 -03:00
Alex Moreno 79b242f3a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-15 14:08:30 +01:00
Jon Elias 6ff8b7be34 refs #6993 fix conflicts 2024-03-15 12:57:16 +01:00
Jon Elias 4c63e2f5c1 merge 2024-03-15 12:54:14 +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
Jon Elias 07cd07427e refs #6993 remove depen 2024-03-15 12:50:05 +01:00
Jon Elias ff5e09d315 refs #6993 fixed QTable behaviour 2024-03-15 12:45:15 +01:00
William Buezas c7b60346e9 WIP 2024-03-15 08:20:48 -03: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 a76d6dc781 Merge branch 'dev' into 6988-SummaryRefactor 2024-03-15 06:53:59 +00:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER 2024-03-15 03:12:46 +00:00
carlosfonseca da23ff7ca2 Correcciones generales 2024-03-14 22:11:38 -05:00
carlosfonseca 4a2a855f58 Correcciones generales customers 37 2024-03-14 11:54:22 -05: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
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
William Buezas 6baaebf6bd WIP 2024-03-14 09:48:04 -03:00
Jon Elias 667359ed92 Merge branch 'dev' into 6993-HideAllPagination 2024-03-14 12:09:18 +00: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
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 08:54:21 +01:00
Jon Elias 37a2c33f9f refactor: #6993 set default QTable pagination 2024-03-14 08:51:26 +01:00
Alex Moreno c39afd0b75 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-14 08:18:53 +01:00
Alex Moreno 1d401ed537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-14 08:18:36 +01:00
Alex Moreno 7a75238695 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-14 08:16:15 +01:00