0
0
Fork 0
Commit Graph

2217 Commits

Author SHA1 Message Date
William Buezas a397c6ed30 remove component import 2024-04-16 12:18:36 -03:00
William Buezas ba2499db9d resolve conflicts 2024-04-16 12:11:57 -03:00
William Buezas df2760ef60 Add dense attr to inputs 2024-04-16 11:49:59 -03:00
William Buezas 8e6538b369 Item request view 2024-04-16 11:47:15 -03: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 a808491c5e use the color of calendar background for the border of panel card 2024-04-16 09:37:31 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00:00
William Buezas 1577fb701b remove unused span 2024-04-16 09:30:17 -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
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Javier Segarra adb31497e5 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-16 10:20:25 +00: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
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations 2024-04-16 11:00:38 +02:00
Robert Ferrús 81f29d815d Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 09:33:58 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús 130869dcdb Merge branch 'dev' into 6679-addCreateIcon 2024-04-16 07:30:27 +00:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
Robert Ferrús d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 08:04:23 +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 d9d868a6af Waste breakdown 2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes 2024-04-15 08:51:48 -03: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
Robert Ferrús 058ddc8e9a feat: refs #6500 2024-04-15 13:18:39 +02:00
Javier Segarra e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-15 13:11:21 +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 92429295cd more translations 2024-04-12 10:44:25 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations 2024-04-12 10:32:19 -03:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones 2024-04-12 10:20:05 -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
William Buezas 73703dc778 Add translations 2024-04-11 18:07:02 -03:00
William Buezas 98f273cb93 WIP 2024-04-11 18:04:11 -03: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
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 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
Robert Ferrús de18b56cb2 feat: refs #6679 add icon 2024-04-10 14:47:20 +02:00
Robert Ferrús f59ecbf94e Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-10 14:42:48 +02:00
Robert Ferrús 7f2d8ee1e5 feat: refs #6679 add icon 2024-04-10 14:42:43 +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
Javier Segarra 478ebfd0ea Merge branch 'dev' into 6679-addCreateIcon 2024-04-10 12:22:19 +00: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 9ae79a5631 Add translation again 2024-04-10 08:43:57 -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
Robert Ferrús a350de9119 Merge branch 'dev' into 6679-addCreateIcon 2024-04-10 11:30:21 +00:00
William Buezas 39af4278a6 Add delete model to worker dms 2024-04-10 08:27:30 -03:00
Robert Ferrús 933e6b88b1 feat: refs #6679 add icon 2024-04-10 13:24:20 +02: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
Jon Elias e3e6c74afa Merge branch 'dev' into 7186-tabIndexVATExpenses 2024-04-10 07:36:17 +00: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 fc4a69b2c6 resolve conflicts in worker routes 2024-04-09 15:28:11 -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
Jorge Penadés 83bf8183f0 fix: refs #6992 warning console & formModel hook 2024-04-09 15:12:54 +02:00
Jorge Penadés 6349a3e790 feat: refs #6992 comments 2024-04-09 15:08:54 +02: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
Jorge Penadés 50bce40613 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 10:09:41 +02:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
Jorge Penadés fdfa99c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 09:55:44 +02:00
Robert Ferrús cd3024c0a1 feat: refs #6679 add icon 2024-04-09 09:17:49 +02:00
Jon Elias f988923b4b Merge branch 'dev' into 6973-UpdateVnLocationLabel 2024-04-09 06:48:06 +00:00
Jon Elias b7788512bc refactor: refs #6973 fix requested changes 2024-04-09 08:41:44 +02:00
Jon Elias 3bededcd94 refactor: refs #6973 updated label and updated cypress test 2024-04-09 07:47:40 +02:00
William Buezas 64ff5e4446 Add pagination and table actions 2024-04-08 11:40:44 -03:00
Jorge Penadés 16548dadef feat: refs #6992 add test 2024-04-08 16:38:36 +02:00
Jorge Penadés 8de3ea16a6 fix: refs #6992 add queryParams 2024-04-08 15:15:18 +02: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
Jorge Penadés 4fa311120d feat: refs #6480 hide if no content 2024-04-08 10:11:50 +02:00
Javier Segarra f2d513766e fix_merge_worker_submoduls 2024-04-08 07:03:42 +00:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup 2024-04-08 05:18:34 +00: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 4701714aa9 merge with dev 2024-04-05 08:42:13 -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 03be831ee5 remove package-lock.json 2024-04-05 08:24:55 -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
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Alex Moreno e14993c114 minor changes 2024-04-05 09:12:49 +02:00
Guillermo Bonet 9310d863aa fix: refs #6636 Icon save and reset 2024-04-05 07:39:05 +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 5ae54d557b Fix form model beforeRouteLeave 2024-04-04 13:27:50 -03:00
William Buezas cb55115cd2 Remove unused component 2024-04-04 12:02:43 -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
Jon Elias 59a631b19e Merge branch 'dev' into 6894-invoiceInChangeFilters 2024-04-04 12:32:40 +00: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
Guillermo Bonet b21c54f20d Merge branch 'test' into dev 2024-04-04 11:31:20 +02:00
Guillermo Bonet d98e5d78ff hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:17:13 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +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 95b19d35e7 Change form model popup buttons order 2024-04-03 13:50:25 -03:00
William Buezas 60b146196f add calendar short-weekday-label 2024-04-03 13:48:41 -03:00
Alex Moreno dec71dbf62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-03 16:29:40 +02: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
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 9a160d9248 refactor: refs #6425 merged changes 2024-04-03 12:57:23 +02: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
William Buezas fc87bb8293 Add page title name 2024-04-02 13:04:28 -03: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 94644de4fa VnSmsDialog adapt style and add tooltip 2024-04-02 10:44:02 -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
William Buezas 772959ff81 Improve getLocales code 2024-04-02 09:13:12 -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
Pablo Natek c66be3c2b5 feat #7128 fix styles 2024-04-02 14:04:09 +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