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

2604 Commits

Author SHA1 Message Date
Javier Segarra 5551077c92 fix: roles 2024-06-07 11:16:15 +02:00
Javier Segarra 6053d42442 fix: descriptor and i18n 2024-06-07 11:09:46 +02:00
Javier Segarra 567c9ad307 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:46:24 +02:00
Javier Segarra edad698f72 fix: update list when update record 2024-06-07 10:21:41 +02:00
Javier Segarra 6c608e86e6 Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls 2024-06-07 10:19:55 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
Alex Moreno a56df46678 fix(AccountAcls): fix and optimization 2024-06-07 09:07:58 +02:00
Pablo Natek 68e49e2ffa fix: refs #7129 fix some issues on load and tools 2024-06-07 07:52:50 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Javier Segarra 17c3a89264 fix: show exclusionEvent in Calendar 2024-06-07 00:01:35 +02:00
Javier Segarra a26401d8eb feat: hide ID 2024-06-06 23:51:45 +02:00
Javier Segarra e178778264 fix: styles 2024-06-06 23:46:26 +02:00
Javier Segarra fe3ad9dc08 fix: styles and i18n 2024-06-06 23:40:52 +02:00
Javier Segarra 17924dfeb3 fix: styles and i18n 2024-06-06 23:39:38 +02:00
William Buezas f305cee3ce Account view forms 2024-06-06 14:07:40 -03:00
Alex Moreno 985ce9a643 deploy: test to dev 2024-06-06 12:24:08 +02:00
Jorge Penadés b27ae621f3 Merge branch 'dev' into 6891-addToggleFilterPanel 2024-06-06 08:45:12 +00:00
Alex Moreno bd53805e7d Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-06 07:58:10 +00:00
Jorge Penadés 97dc299cfe fix: refs #6942 fix emit on data saved 2024-06-06 09:53:48 +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
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
Javier Segarra 0bb6498061 fix: minor i18n 2024-06-04 20:33:24 +02: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 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 3efca6242d Account ACLs 2024-06-04 08:41:41 -03: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
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 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
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
Jon Elias 0bcc9f5aeb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-03 10:27:37 +02:00
Jon Elias b047c2c5e3 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-03 08:16:50 +00:00
Jon Elias 45a6c49907 refactor: refs #5447 fix request 2024-06-03 10:15:51 +02:00
Jon Elias f41f312294 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity 2024-06-03 09:38:26 +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
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 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 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
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
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
Alex Moreno 2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 14:05:42 +02: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
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 532d60130d Merge branch 'dev' into feature/ZoneCalendar 2024-05-29 11:28:53 +02:00
Alex Moreno 5965e70740 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 07:50:15 +02:00
Alex Moreno 92244ad96b feat(VnTable): refs #6825 merge where's 2024-05-29 07:47:47 +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
Carlos Satorres 264d887fb4 refs #7406 fix Tb components create 2024-05-28 12:09:03 +02:00
Jorge Penadés 5aa3b14014 refactor: refs #6942 WIP summary layout 2024-05-28 11:39:49 +02:00
Carlos Satorres ffe15da7cf refs #7406 fix VnTable columns 2024-05-28 10:41:24 +02:00
Alex Moreno 0f1c91d36c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-28 07:42:15 +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
Carlos Satorres d8512e2033 refs #7406 fix trad 2024-05-27 18:23:33 +02: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
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
Carlos Satorres 947496e0a1 refs #7406 fix components 2024-05-27 14:43:03 +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
Alex Moreno a4baa88cb4 fix(VnTable): refs #6825 VnInputDate 2024-05-27 14:36:50 +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
Carlos Satorres d207482e3a refs #7406 fix url 2024-05-27 11:27:33 +02:00
Carlos Satorres e6ff13c09c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-27 10:07:49 +02:00
Carlos Satorres c865bc2ed4 refs #7406 fix props 2024-05-27 10:07:32 +02:00
Carlos Satorres d4fbd99473 refs #7406 table formation 2024-05-27 09:40:48 +02:00
Alex Moreno 88c2af555c fix(ArrayData): refs #6825 router.replace and use filter.where 2024-05-27 09:28:04 +02:00
Alex Moreno 696f6b4c05 feat(VnTable): refs #6825 addInWhere 2024-05-27 09:27:14 +02: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
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
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
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
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
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
Alex Moreno 89e1b3581a feat(VnTable): refs #6825 use checkbox if startsWith 'is' or 'has' 2024-05-23 13:50:44 +02:00
Javier Segarra 889263bfb8 feat: roleCreate as dialog 2024-05-23 13:47:14 +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
Jon Elias ace9959bff Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity 2024-05-23 10:39:34 +02:00
Jon Elias 8414f5c12e fix: refs #5447 deleted console.log 2024-05-23 10:39:32 +02:00
Alex Moreno 859cdd891a feat(VnTable): refs #6825 actions sticky 2024-05-23 10:39:17 +02:00
Carlos Satorres 2432a37211 refs #6111 fix sticky 2024-05-23 10:26:54 +02:00
Alex Moreno ac77fea3d7 feat(VnTable): refs #6825 remove field prop. Add actions in table 2024-05-23 10:09:17 +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
Jon Elias 1183908942 Merge branch 'dev' into 5447-travelExtraCommunity 2024-05-23 07:28:07 +00: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
Jon Elias 1558b600be refactor: refs #5447 changed warehouse filter 2024-05-23 09:20:16 +02:00
Alex Moreno 569df64d8d feat(VnTable): refs #6825 move to folder. fix checkboxs 2024-05-23 09:05:57 +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
Alex Moreno bcb800269e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-22 14:32:00 +02:00
Alex Moreno 4ae580543b feat(VnTable): refs #6825 execute function when create 2024-05-22 14:20:38 +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
Carlos Satorres 499e104daa Merge branch 'dev' into fix-CalendarTimeControlRightPanel 2024-05-22 10:49:43 +00: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
Carlos Satorres 506b5dd9c2 refs #6820 fix error front 2024-05-22 12:24:08 +02:00
jcasado 4de9895b38 refs: #6911-saveOnEnter 2024-05-22 12:07:27 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel 2024-05-22 11:22:46 +02:00
Carlos Satorres 98449b0c1e refs #6111 scroll horizontal 2024-05-22 10:23:10 +02:00
Javier Segarra d900ed3764 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 10:22:05 +02:00
Javier Segarra f6051472ef style: color transparent when is fetive 2024-05-22 10:21:06 +02:00
Jon Elias 2af4df8ded refactor: refs #6652 improved defaulter section 2024-05-22 10:07:58 +02:00
Carlos Satorres c1bcc0379d refs #6332 fix festive 2024-05-22 09:35:56 +02:00
Javier Segarra eaa0288f25 update 2024-05-22 09:27:48 +02:00
Javier Segarra a0ca26ad9b Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:56:10 +02:00
Javier Segarra 0e0f649ff9 fix: 9-12 2024-05-22 08:54:37 +02:00
Carlos Satorres 81f7e06143 refs #6332 fix calendar 2024-05-22 08:35:01 +02:00
Javier Segarra 3d6fac5338 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:28:51 +02:00
Javier Segarra 2094506baf fix: WorkerCalendarItem 2024-05-22 08:27:09 +02:00
Javier Segarra ad328d9c51 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-22 00:00:58 +02:00
Pablo Natek d2d80645d0 fix: refs #7187 fix responsive 2024-05-21 19:12:40 +02:00
Carlos Satorres 27c86288e1 refs #6332 color red button 2024-05-21 16:14:55 +02:00
William Buezas 84845b7958 WIP 2024-05-21 09:50:36 -03:00
Carlos Satorres bacc07a4ca remove right 2024-05-21 12:04:56 +02:00
Carlos Satorres 99d16d215f refs #6332 colors 2024-05-21 11:56:30 +02:00
Jorge Penadés 5f10d25630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-21 09:04:17 +02:00
Javier Segarra dc14116717 perf: RoleCard, BasicData, summary 2024-05-21 08:52:34 +02:00
Javier Segarra 2cae2168ac perf: AccountCard, BasicData, summary 2024-05-21 08:52:19 +02:00
Alex Moreno a715122a66 feat(VnTable): refs #6825 dinamic columns 2024-05-21 08:50:05 +02:00
Pablo Natek e32e922c45 Merge branch 'dev' into 7187-refactorWokerPda 2024-05-20 23:06:07 +00:00
Pablo Natek 45f56078d7 feat: refs #7187 add vnconfirm on delete 2024-05-21 01:04:52 +02:00
Pablo Natek 9468e409ea fix: refs #7187 fix reload 2024-05-21 00:34:03 +02:00
Javier Segarra 026997a369 role updates 2024-05-20 23:25:20 +02:00
William Buezas b26bf10e70 Apply searchbar logic 2024-05-20 15:53:38 -03:00
Alex Moreno 65c22a7103 feat(VnTable): refs #6825 VnTableChip component 2024-05-20 15:08:34 +02:00
Alex Moreno 478fe23cec fix(VnTable): refs #6825 fix events and css 2024-05-20 13:58:47 +02:00
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Carlos Satorres 9f517eb59d refs #6820 fix BasicData Tickets 2024-05-20 12:40:47 +02:00
Jorge Penadés c1a6bca508 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 09:31:58 +02:00
Jorge Penadés cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue 2024-05-20 09:31:31 +02:00
Carlos Satorres ce72b8099b Merge branch 'dev' into 7396-addBasicDataWorker 2024-05-20 07:20:29 +00:00
Carlos Satorres e5c445fc12 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-20 09:00:57 +02:00
Carlos Satorres 4199fc0dc5 refs #7396 fix basicData, summary, change deleteDepartment 2024-05-20 09:00:54 +02:00
Jorge Penadés 2366ef772f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 08:55:35 +02:00
Jon Elias e69f134b59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-05-20 08:46:41 +02:00
Javier Segarra c40f322a8f Merge branch 'dev' into feature/ZoneWarehouses 2024-05-20 08:40:27 +02:00
Jon Elias 708a852473 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-20 05:08:02 +00:00
William Buezas 202473158c resolve conflicts 2024-05-19 14:21:32 -03:00
Javier Segarra bbd51c5773 feat: AccountDescriptorMenu 2024-05-18 11:40:32 +02:00
Javier Segarra 0397f9ee68 feat: AccountDescriptor & AccountDescriptorMenu 2024-05-18 11:18:23 +02:00
Javier Segarra c64a403ee2 feat: AccountSummary 2024-05-18 11:17:58 +02:00
Javier Segarra a2316fb222 feat: change skeleteon different components 2024-05-18 10:35:08 +02:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
Javier Segarra 902d260822 Merge branch 'dev' into feature/ZoneDelivery 2024-05-18 07:06:57 +00:00
Javier Segarra ce87008c12 fix: remove console.log 2024-05-18 08:50:38 +02:00
William Buezas 78e81c6f75 ZoneWarehouses and ZoneWareousesCreate refactor 2024-05-17 17:16:58 -03:00
William Buezas e38f3fc60d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ZoneWarehouses 2024-05-17 15:32:45 -03:00
William Buezas 6c374061d0 Handle request orders 2024-05-17 15:24:17 -03:00
William Buezas 6e49982531 Revert "Handle onsubmit" 
This reverts commit 7c5b61cca8.
 2024-05-17 15:18:10 -03:00
William Buezas 7c5b61cca8 Handle onsubmit 2024-05-17 14:35:15 -03:00
Javier Segarra 6afafb2f11 minor changes 2024-05-17 18:44:25 +02:00
Javier Segarra cda59116ff Revert "first approach" 
This reverts commit 9604599b33.
 2024-05-17 18:04:48 +02:00
Jorge Penadés 81998a4137 refactor: refs #6942 summary 2024-05-17 17:26:58 +02:00
William Buezas e196cf8fd5 Zone warehouses 2024-05-17 10:57:20 -03:00
Jorge Penadés 1abcb4796f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-17 14:36:22 +02:00
Alex Moreno 75f3d4f410 fix: refs #6539 VnSelect use url 2024-05-17 14:32:39 +02:00
Carlos Satorres 488c6b3f94 Merge branch '7396-addBasicDataWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7396-addBasicDataWorker 2024-05-17 14:23:02 +02:00
Carlos Satorres d359063e5d refs #7396 fix summary 2024-05-17 14:23:00 +02:00
Javier Segarra ce444c7e5c first approach 2024-05-17 14:19:29 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Javier Segarra 41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-17 11:58:38 +00:00
Carlos Satorres d7e3303d68 refs #7396 add fiDueDate, machine 2024-05-17 13:19:59 +02:00
Carlos Satorres 067df2d56b Merge branch 'dev' into 6914-fixWorkerCreateErrors 2024-05-17 11:15:25 +00:00
Alex Moreno d00801b066 feat: refs #6825 VnComponent mix component and attrs Form to create new row 2024-05-17 13:00:57 +02:00
Javier Segarra 49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-17 12:30:55 +02:00
Javier Segarra 8e4c74c1cc fix: style 2024-05-17 12:26:45 +02:00
Jon Elias 8b835e299b Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-17 08:31:52 +00:00
Jon Elias d754e5efce Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-17 10:30:51 +02:00
Jon Elias 4ca7df5bfb refactor: refs #7361 changes in css 2024-05-17 10:30:50 +02:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +02:00
Javier Segarra dc597f73e2 fix: style 2024-05-17 09:50:18 +02:00
Javier Segarra 38d7c96c00 feat: #6957: Rename FetchedTags instance tag 2024-05-16 23:01:55 +02:00
William Buezas a35ccb5b51 Zone Locations 2024-05-16 16:38:27 -03:00
Carlos Satorres 660577c9fe refs #6914 fix vnLocation workerCreate 2024-05-16 16:02:38 +02:00
Pablo Natek a5dd7c817e Merge branch 'dev' into 7187-refactorWokerPda 2024-05-16 12:08:51 +00:00
Alex Moreno 598d116848 feat: refs #6825 share filters, create popup 2024-05-16 13:38:15 +02:00
Pablo Natek 108533d475 fix: delete translates 2024-05-16 12:57:35 +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 1654fb93d4 fix: refs #6598 build 2024-05-16 09:06:12 +02:00
Jorge Penadés 288f776c9c Merge branch 'dev' into 7274-fixCustomer 2024-05-16 07:01:08 +00:00
Jorge Penadés ed9310cbb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings 2024-05-16 08:58:00 +02:00
Alex Moreno cf16db2e33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-16 08:52:03 +02:00
Alex Moreno c7cb591008 warmFix(customerFiscalData): fix vnRows 2024-05-16 08:52:02 +02:00
Robert Ferrús ca5cf66f56 Merge branch 'dev' into 7039-country-country 2024-05-16 06:46:32 +00:00
Alex Moreno 6f38aeba83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-16 07:33:53 +02:00
Robert Ferrús b7fce0917e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country 2024-05-16 07:29:07 +02:00
Jon Elias 6603c81aa3 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-16 05:18:13 +00:00
Pablo Natek c24062fccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda 2024-05-15 22:18:40 +02:00
Pablo Natek bc9c1fdf8e feat: pda duplicates 2024-05-15 22:17:40 +02:00
Carlos Satorres adde8d1ab8 refs #6332 fix colors 2024-05-15 16:00:56 +02: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
William Buezas 5677a1af1b remove unused onMounted 2024-05-15 10:31:33 -03:00
William Buezas f3a5ebbcec Bug fix 2024-05-15 10:27:45 -03:00
William Buezas cd8095d3b8 Last changes 2024-05-15 09:39:15 -03:00
Jon Elias e766bdfdfb Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-15 12:35:59 +00:00
Jon Elias 5e3fca3f81 Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-15 14:35:09 +02:00
Jon Elias ccaf993841 refactor: refs #7361 requested changes 2024-05-15 14:35:08 +02:00
Jorge Penadés 628fc888ba fix: refs #7281 fix warnings 2024-05-15 14:31:51 +02:00
Jorge Penadés bf43893b05 fix: refs #7274 use VnInputDate 2024-05-15 14:06:42 +02:00
Jorge Penadés 872aee51ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-15 12:34:21 +02:00
Jorge Penadés 2eca98d31d feat: refs #7274 show total on rightMenu 2024-05-15 11:54:14 +02:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer 2024-05-15 11:22:23 +02:00
Jon Elias 77f058944a style: refs #6464 changed checkbox and qbtn styles 2024-05-15 11:20:45 +02:00
Jorge Penadés 546a5150ae fix: refs #7274 fix duplicate rows 2024-05-15 10:39:59 +02:00
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false 2024-05-15 09:37:33 +02:00
Jorge Penadés 7e66fc38ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-05-15 09:06:47 +02:00
Jon Elias b97f7e6b42 6464 2024-05-15 09:05:29 +02:00
Jorge Penadés 9d9d3db43b fix: refs #7274 defaulterFilter 2024-05-14 17:29:15 +02:00
William Buezas cbe44c97f6 Upcoming deliveries 2024-05-14 12:03:43 -03:00
Jorge Penadés e4637b7d15 fix: refs #7274 add note 2024-05-14 14:39:55 +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 a095670ff1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-14 12:42:14 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate 2024-05-14 11:52:29 +02:00
Javier Segarra c443b0a00f feat: input validations 2024-05-14 10:50:29 +02:00
Javier Segarra 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration 2024-05-14 10:42:43 +02:00
Javier Segarra fa82efe5d2 fix: limit width some fields 2024-05-14 10:41:28 +02:00
Javier Segarra 289bdeecae fix: Workers/isActive 2024-05-14 10:41:07 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors 2024-05-13 17:59:39 +02:00
Jorge Penadés a878ad23b9 fix: refs #6891 fix invoiceInform design 2024-05-13 16:01:18 +02:00
William Buezas 7b99d2f38b re order translation 2024-05-13 10:31:11 -03:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03: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
William Buezas 9304b511bc Zone delivery 2024-05-13 10:14:36 -03:00
Alex Moreno c223bbe0ea fea(VnTable)t: refs #6825 create VnComponent, add rowClick and redirect 2024-05-13 14:16:01 +02:00
Javier Segarra 1181cd0daa Merge branch 'dev' into 7271-EndZoneMigration 2024-05-13 12:15:50 +00:00
Javier Segarra a94c1a32e1 fix: show label agency instead id 2024-05-13 14:13:41 +02:00
Jon Elias 04ce9558b7 Merge branch 'dev' into 7361-TicketSummaryRefactor 2024-05-13 11:58:49 +00:00
Jon Elias 146ced2ea2 Merge branch '7361-TicketSummaryRefactor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7361-TicketSummaryRefactor 2024-05-13 13:57:52 +02:00
Jon Elias 2859a7bad6 style: refs #7361 style refactor 2024-05-13 13:57:51 +02:00
Alex Moreno 4cb5b8c326 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-13 13:53:24 +02:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 13:20:15 +02:00
Jon Elias 14910c5899 feat: refs #7271 basicData and Log 2024-05-13 12:46:25 +02:00
Alex Moreno 0ed3cafcab Merge branch 'dev' into feature/ZoneList 2024-05-13 07:31:17 +00:00
Alex Moreno a28d18f1e1 fix: redirection when clone and styles 2024-05-13 09:30:03 +02:00