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

3097 Commits

Author SHA1 Message Date
Jorge Penadés 97dc299cfe fix: refs #6942 fix emit on data saved 2024-06-06 09:53:48 +02:00
Javier Segarra 26c7b09b8a perf: improve handleKeyUp method 2024-06-06 07:50:24 +00:00
Alex Moreno 454527b0a7 remove console.log 2024-06-06 09:34:42 +02:00
Alex Moreno aee3c67ee0 clean code 2024-06-06 09:33:01 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles 2024-06-06 07:32:15 +00:00
Jon Elias 516b905305 feat: refs #7502 new icons v1.73 2024-06-06 08:38:19 +02:00
Javier Segarra fe9adb7a3c perf: minor changes 2024-06-06 08:09:05 +02:00
Javier Segarra f3ec9ea58d fix: VnPaginate order 2024-06-06 08:03:57 +02:00
William Buezas 9ed297207b Make create form work 2024-06-05 14:52:45 -03:00
Javier Segarra f453f42b06 feat: New and edit ACL from Popup 2024-06-05 19:37:53 +02:00
Javier Segarra 807460dfad fix: info icon 2024-06-05 18:14:41 +02:00
Jorge Penadés 382591fb11 fix: refs #6273 set paymethodFk to 0 if it is external 2024-06-05 17:13:52 +02:00
Javier Segarra de488169b7 feat: AccountDescriptor 2024-06-05 15:09:43 +02:00
Javier Segarra 30c912fa62 reset changes 2024-06-05 11:38:10 +02:00
Javier Segarra c87629f2ec fix: accountBasicData after update 2024-06-05 11:35:48 +02:00
Javier Segarra 3227d299e9 updates 2024-06-05 10:57:12 +02:00
Carlos Satorres b852faf91f refs #6905 fix userPanel 2024-06-05 08:58:12 +02:00
Javier Segarra 0bb6498061 fix: minor i18n 2024-06-04 20:33:24 +02:00
William Buezas 9f6d0b4dc9 Remove roles 2024-06-04 15:15:12 -03:00
William Buezas 946aa6b24d Small changes 2024-06-04 15:10:00 -03:00
Jorge Penadés 7e0ceca623 feat: refs #6273 freelance form & vnRadio 2024-06-04 17:38:04 +02:00
William Buezas c71877cdb1 Account connections 2024-06-04 12:23:28 -03:00
Carlos Satorres 06ddcc5030 refs #7366 fix travel 2024-06-04 15:55:30 +02:00
William Buezas ddc149b6fc adapt account privileges to new formModel changes 2024-06-04 09:25:03 -03:00
William Buezas c574af9e9b resolve conflicts 2024-06-04 09:15:55 -03:00
William Buezas 253b54379c Add submodules routes again 2024-06-04 09:14:48 -03:00
William Buezas 37a8956f86 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList 2024-06-04 09:11:37 -03:00
William Buezas 84ad1745e2 several changes 2024-06-04 09:10:40 -03:00
Javi Gallego 857aca49dd feat: refs #4560 sin DeliveryMan 2024-06-04 14:06:04 +02:00
William Buezas c96e6482f9 remove mail alias content 2024-06-04 08:42:32 -03:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Jon Elias 535798af25 feat: refs #7502 new Lilium icons 2024-06-04 11:53:24 +02:00
Javi Gallego f1df969fa6 feat: refs #560 refactor descriptor 2024-06-04 10:52:00 +02:00
Jon Elias 93744fce65 Merge branch '6896-EndOrderMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-04 09:54:47 +02:00
Jon Elias adf7c3a139 feat: refs #6896 new filters 2024-06-04 09:54:45 +02:00
Javi Gallego 5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto 2024-06-04 09:42:44 +02:00
Jorge Penadés 0b0754f76e refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection 2024-06-04 09:33:51 +02:00
Jorge Penadés de4ea6271b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-04 09:00:57 +02:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse 2024-06-03 16:30:59 +02:00
Jorge Penadés b93b630c6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-03 15:21:44 +02:00
Jorge Penadés 0b92e98511 fix: refs #6891 show cross 2024-06-03 15:19:33 +02:00
Javier Segarra ef47b34569 Merge branch 'dev' into feature/MailAliases 2024-06-03 13:09:54 +00:00
Javier Segarra 0d1453ddeb feat: isPublic checkbox 2024-06-03 15:09:34 +02:00
Javier Segarra 668dc5fd53 fix: List without limit 2024-06-03 15:09:21 +02:00
Jorge Penadés f55e9d7c32 fix: refs #6891 Optimize RightMenu component rendering 2024-06-03 14:20:46 +02:00
Jorge Penadés e6f0e6b089 refactor: refs #6891 Remove unused i18n 2024-06-03 14:12:49 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition 2024-06-03 14:11:40 +02:00
William Buezas 8320a75e61 make searchbar work 2024-06-03 09:03:37 -03:00
William Buezas 02d8254df9 rest of submodules 2024-06-03 08:47:32 -03:00
Jorge Penadés 36ff4e9312 refactor: refs #6891 searchbar teleport 2024-06-03 12:58:26 +02:00
Jorge Penadés c78828d6a6 refactor: refs #6891 Move filter panel rendering to RightMenu component 2024-06-03 12:29:44 +02:00
Javi Gallego 56a46cd130 4560 2024-06-03 11:52:19 +02:00
Jon Elias f4f8dcfd71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-06-03 11:43:56 +02:00
Javi Gallego ca4193e11a Merge branch 'dev' into 4560-gastos-reparto 2024-06-03 11:31:33 +02:00
Carlos Satorres 0d25c1b66b refs #7366 fix travel 2024-06-03 11:27:44 +02:00
Jorge Penadés 217f9bd86c fix: refs #6891 rollback 2024-06-03 11:25:21 +02:00
Jorge Penadés 3a0f99ac22 feat: refs #6891 Add collapse menu button to filter panel 2024-06-03 11:10:46 +02:00
Jorge Penadés d2180c67f7 refactor: refs #6600 replace QInput to VnInput 2024-06-03 09:35:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation 2024-06-03 09:30:37 +02:00
Jon Elias aabf5420b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7003-fixedPriceOrder 2024-06-03 08:47:34 +02:00
William Buezas 8e1f7c24a4 submodules WIP 2024-06-02 13:26:46 -03:00
William Buezas 1c14841233 Several changes 2024-05-31 14:02:50 -03:00
Javier Segarra 0ad839dfc6 src/pages/Order/Card/OrderCatalogItemDialog.vue 2024-05-31 14:40:16 +02:00
Javier Segarra e6a1c31119 fix: src/pages/InvoiceOut/InvoiceOutGlobalForm.vue 2024-05-31 14:31:41 +02:00
Alex Moreno 221ed7c534 feat(TravelSummary): isConfirmed checkbox 2024-05-31 14:02:32 +02:00
Javier Segarra 59f9cf4111 fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue 2024-05-31 13:56:46 +02:00
Javier Segarra 25d5887a57 fix: src/pages/Entry/Card/EntryBuysImport.vue 2024-05-31 13:42:49 +02:00
Javier Segarra 492e333d2f fix: i18n VnNotes 2024-05-31 13:40:19 +02:00
Javier Segarra d8bf95008a fix: src/components/EditPictureForm.vue 2024-05-31 13:33:03 +02:00
Carlos Satorres a39c827579 refs #7366 fix url 2024-05-31 13:23:16 +02:00
Javier Segarra d5dc9d974c fix: ClaimBasicData form 2024-05-31 13:20:55 +02:00
Carlos Satorres c499cc8f09 refs #6897 remove code fix section 2024-05-31 12:40:27 +02:00
Javier Segarra 5139bba5a0 fix: handle VnNotes keyup 2024-05-31 12:37:30 +02:00
Javier Segarra 0450986025 fix InvoiceInBasicdata 2024-05-31 12:01:18 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
Javier Segarra 4268f15d30 perf: remove unnecessary submodules 2024-05-31 10:23:03 +02:00
Javier Segarra c2dd7831d1 perf: remove unnecessary components 2024-05-31 10:17:44 +02:00
Javier Segarra 67b3888f8c feat: AccountForm as dialog 2024-05-31 10:10:15 +02:00
Javier Segarra 5b9d64128b fix: AccountFilter 2024-05-31 09:45:01 +02:00
Javier Segarra 2c9ff60399 Merge branch 'dev' into feature/ZoneCalendar 2024-05-31 09:28:48 +02:00
William Buezas 4bd78922af remove unnecesary files 2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
William Buezas ed2ba5458d Avoif filter panel from redirecting 2024-05-30 08:34:53 -03:00
Alex Moreno 5799a1121b fix: searchbar redirect 2024-05-30 10:22:13 +02:00
William Buezas 56dd5e0a76 change fn name 2024-05-29 16:27:44 -03:00
William Buezas d82de6da58 Account roles 2024-05-29 16:14:29 -03:00
William Buezas 1414b93633 Account create 2024-05-29 11:53:11 -03:00
William Buezas e47bda0afc small changes 2024-05-29 08:47:33 -03:00
William Buezas 6c34a250db Remove more unnecesary files 2024-05-29 08:28:17 -03:00
William Buezas 5c9f62bd59 Remove unnecesary files 2024-05-29 08:26:07 -03:00
William Buezas b5e72aec7c Wip 2024-05-29 08:01:37 -03:00
Alex Moreno 15223971f1 fix: defaulter icon 2024-05-29 12:53:12 +02:00
Javier Segarra 3f76aea680 fix: dashOrCurrency filter 2024-05-29 12:17:45 +02:00
Javier Segarra ed566e6ece style: increase height 2024-05-29 12:13:11 +02:00
Javier Segarra b7bc82aa3c feat: use new filter 2024-05-29 12:12:50 +02:00
Javier Segarra c5e2a40d3e feat: add router.meta.moduleName as default param 2024-05-29 12:12:40 +02:00
Javier Segarra f9fa68b0b1 feat: dashOrCurrency filter 2024-05-29 12:12:07 +02:00
Javier Segarra 532d60130d Merge branch 'dev' into feature/ZoneCalendar 2024-05-29 11:28:53 +02:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00
William Buezas fd7f46cbe2 several changes 2024-05-28 18:33:18 -03:00
William Buezas 21879b54ab remove console.log 2024-05-28 17:41:17 -03:00
William Buezas 062de82bca Account list 2024-05-28 17:30:39 -03:00
William Buezas 4292804922 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList 2024-05-28 11:30:10 -03:00
William Buezas e80b9a71c6 Hide panel when ZoneEvent view unmounts 2024-05-28 11:24:52 -03:00
William Buezas d4600a1181 resolve conflicts and adapt tree 2024-05-28 11:20:43 -03:00
William Buezas b783adfc31 several changes 2024-05-28 09:30:13 -03:00
Jorge Penadés 0de575bb6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-28 13:14:11 +02:00
Jorge Penadés 3b3e7e7e03 fix: refs #6942 tests & summary table spacing 2024-05-28 13:11:38 +02:00
Javier Segarra 909c545106 Merge branch 'dev' into feature/ZoneLocations 2024-05-28 10:46:53 +00:00
Alex Moreno 93fb3096e0 feat: refs #7494 new icons 2024-05-28 12:17:51 +02:00
Jorge Penadés 5aa3b14014 refactor: refs #6942 WIP summary layout 2024-05-28 11:39:49 +02:00
Jorge Penadés 3c0936b2ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-28 09:01:24 +02:00
Alex Moreno 9f18c12c33 feat: refs #7494 new icons 2024-05-28 08:56:59 +02:00
Alex Moreno 8304dcb0a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-28 07:48:51 +02:00
William Buezas 7cd2bf2319 watch fix 2024-05-27 14:44:44 -03:00
William Buezas 8d7568d9a2 Search childs fix 2024-05-27 14:40:33 -03:00
William Buezas c4b88fae41 adapt tree 2024-05-27 14:30:36 -03:00
William Buezas cff434c1a6 Add sticky form button 2024-05-27 13:20:42 -03:00
William Buezas fcaca42b1f resolve conflicts 2024-05-27 12:35:59 -03:00
William Buezas a2df7b5cf7 small fix 2024-05-27 12:32:13 -03:00
Jorge Penadés 4c3a64bfa6 refactor: refs #6942 new summary layout 2024-05-27 17:14:37 +02:00
Alex Moreno 3ae523ef04 test(WorkerList): refs #7589 fix e2e 2024-05-27 16:52:53 +02:00
William Buezas f2df252a94 improvement 2024-05-27 10:32:10 -03:00
Jorge Penadés df6e6c66a9 fix: refs #6942 import 2024-05-27 14:53:50 +02:00
Jorge Penadés 90cebb85fe reafactor: refs #6942 use meta moduleName 2024-05-27 14:51:23 +02:00
Jorge Penadés 332e96f184 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 14:36:57 +02:00
Carlos Satorres 4162e040cc Merge branch 'dev' into 7391-defaulterMods 2024-05-27 11:58:11 +00:00
Jorge Penadés ef9f8b8705 refactor: refs #6942 store key & actions 2024-05-27 13:36:16 +02:00
William Buezas b408e0daaf remove on selected 2024-05-27 08:29:52 -03:00
William Buezas c304c68c9e Zone tree abstraction 2024-05-27 08:29:24 -03:00
Jorge Penadés b6f11096f3 feat: refs #6942 url update 2024-05-27 09:07:22 +02:00
Jorge Penadés 3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 08:57:34 +02:00
Jorge Penadés 66c6c857db fix: refs #6942 drop console.log 2024-05-27 08:57:21 +02:00
William Buezas d9e6baf7e3 Move container card to parent view 2024-05-26 20:57:45 -03:00
William Buezas 62443ff44b Abstract ZoneCalendarGrid in a component and reuse it 2024-05-26 20:52:46 -03:00
William Buezas f52f5df78b Make searchbar work 2024-05-26 19:35:12 -03:00
William Buezas dbcd701725 Change Zone Calendar name 2024-05-26 18:59:16 -03:00
William Buezas 3cb17eeb66 remove console.logs 2024-05-26 18:55:35 -03:00
William Buezas bfba4875cc Minor change in exclusion form 2024-05-26 18:54:59 -03:00
William Buezas 097197b8dc Zone exclude form and tree implementation 2024-05-26 17:17:58 -03:00
Javier Segarra d46b906020 feat: bolierplate layout samba and ldap 2024-05-25 10:37:52 +02:00
William Buezas a1fde3f645 WIP 2024-05-24 15:25:00 -03:00
William Buezas 68bb4251a4 WIP 2024-05-24 14:12:17 -03:00
William Buezas b4331ab2d2 remove import 2024-05-24 13:02:28 -03:00
William Buezas 66955dbc90 mini fix 2024-05-24 12:33:29 -03:00
William Buezas 9e264e6f1f Improvement 2024-05-24 12:27:15 -03:00
Javier Segarra 5c711c1bcb perf: 6957 add color as new shared variable 2024-05-24 14:34:57 +02:00
Javier Segarra f25385961b perf: 6957 change fetchedTags color 2024-05-24 14:34:44 +02:00
Carlos Satorres ba5407310f refs #7396 fix summary 2024-05-24 13:40:00 +02:00
William Buezas 9b3135fd97 WIP 2024-05-24 08:18:38 -03:00
Jorge Penadés 933e0be028 fix: refs #6942 e2e tests 2024-05-24 12:10:27 +02:00
Jorge Penadés d460b198a4 fix: refs #6942 skip e2e tests 2024-05-24 11:43:54 +02:00
Carlos Satorres f1c688af89 refs #7391 fix textarea 2024-05-24 10:08:10 +02:00
Jorge Penadés 12016f8653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-24 09:02:24 +02:00
Alex Moreno b531370e2c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-24 08:33:27 +02:00
Carlos Satorres 4bacc8d836 Merge branch 'dev' into 6095-add-refFk-null-on-search 2024-05-24 06:28:34 +00:00
Javier Segarra d015a2e217 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-24 08:15:11 +02:00
Javier Segarra cabee09052 Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries 2024-05-24 08:13:40 +02:00
Javier Segarra 286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-24 08:13:37 +02:00
Alex Moreno f12c9d5a9e refactor: add flat 2024-05-24 07:55:54 +02:00
Jorge Penadés 75c2800e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-23 16:49:18 +02:00
Jorge Penadés b6638e3545 refactor: refs #6942 use router hook 2024-05-23 16:48:50 +02:00
Carlos Satorres a603f37144 refs #7391 fix textarea 2024-05-23 15:54:57 +02:00
Carlos Satorres 6388f08ffb Merge branch 'dev' into 6111-modsRouteList 2024-05-23 12:47:38 +00:00
Pablo Natek 0896ae24d2 Merge branch 'test' into 7187-fix-workerPda 2024-05-23 12:42:54 +00:00
Carlos Satorres bfdd319366 Merge branch 'dev' into 6332-calendarMods 2024-05-23 12:36:36 +00:00
Pablo Natek 410012df55 fix: refs #7187 fix div 2024-05-23 14:24:58 +02:00
Jon Elias 6e59f3ae12 refactor: refs #6896 fix qdrawer 2024-05-23 14:05:58 +02:00
Jorge Penadés 4a6d09ae2c feat: refs #6942 use correct currency in InvoiceIn components 2024-05-23 14:04:35 +02:00
Jon Elias 8967abf1c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6896-EndOrderMigration 2024-05-23 13:59:08 +02:00
Jon Elias 98159de257 refactor: refs #6896 end migration orders 2024-05-23 13:55:06 +02:00
Javier Segarra 889263bfb8 feat: roleCreate as dialog 2024-05-23 13:47:14 +02:00
Carlos Satorres 8b8033cb3d refs #6095 remove limit 2024-05-23 13:21:54 +02:00
Jon Elias 68213721a7 feat: refs #7003 new data order in section 2024-05-23 13:09:11 +02:00
Jorge Penadés e8fed46dd1 fix: refs #6942 cardDescriptor use store if its popup or different source data 2024-05-23 12:33:13 +02:00
Carlos Satorres 74f25f54ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search 2024-05-23 11:55:49 +02:00
Jorge Penadés af32c4b79c fix: refs #6942 drop console 2024-05-23 11:24:29 +02:00
Carlos Satorres 2432a37211 refs #6111 fix sticky 2024-05-23 10:26:54 +02:00
Javier Casado 103e3fe08a Merge branch 'dev' into 6911-saveOnEnter 2024-05-23 07:31:08 +00:00
Jorge Penadés c6477af493 fix: refs #6942 formModel watch changes & invoiceInCreate 2024-05-23 09:29:50 +02:00
Carlos Satorres 6ea942bf31 refs #6111 fix merge, fix column 2024-05-23 09:24:50 +02:00
Carlos Satorres 66c841114b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList 2024-05-23 09:23:11 +02:00
Jorge Penadés c73599692b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-23 09:00:45 +02:00
Javier Segarra 433564507e Merge branch 'dev' into 7311_boilerplate_users 2024-05-23 08:53:10 +02:00
Javier Segarra 06664cc2d0 feat: newRole 2024-05-23 08:52:57 +02:00
Jon Elias 566ef90cbe Merge branch 'dev' into 6652-improveCustomerDefaulter 2024-05-23 06:34:10 +00:00
Jorge Penadés 7685c38fb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-22 16:45:58 +02:00
Javier Segarra 722f1e8a03 Merge branch 'dev' into feature/ZoneLocations 2024-05-22 14:00:06 +00:00
William Buezas e43485f19c resolve conflict 2024-05-22 10:57:33 -03:00
William Buezas 1347e4ec40 Handle params search on mounted 2024-05-22 10:56:37 -03:00
Javier Segarra e2b72f132c Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations 2024-05-22 15:49:23 +02:00
Javier Segarra 3fded533a6 perf: remove local tree variable 2024-05-22 15:49:11 +02:00
William Buezas f4807d887f Improve node management when using search bar 2024-05-22 10:20:36 -03:00
Carlos Satorres 6b474bfd06 Merge branch 'dev' into 6820-changeKmroute 2024-05-22 12:53:40 +00:00
Jorge Penadés 3db3d04bc9 fix: refs #6942 formModel & CardDescriptor 2024-05-22 13:57:12 +02:00
Carlos Satorres e4ebf4c4db refs #6820 fix traduction 2024-05-22 13:44:53 +02:00
William Buezas 790e69f659 WIP 2024-05-22 08:08:43 -03:00