0
0
Fork 0
Commit Graph

1549 Commits

Author SHA1 Message Date
carlosfonseca e56aa6587f Solucion a comentarios 25 2024-02-28 06:37:15 -05:00
Javier Segarra e708e0cd6d refs #6980 feat: enable List, disable summary 2024-02-28 11:52:36 +01:00
Carlos Satorres dd8ec1309f refs #6768 fix order 2024-02-28 10:59:12 +01:00
Carlos Satorres b8c6f43d0c refs #6768 shelving fix 2024-02-28 10:58:41 +01:00
Carlos Satorres 32685efc1c Merge branch '6768-VnLocationRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6768-VnLocationRefact 2024-02-28 10:28:13 +01:00
Carlos Satorres 65fcfbff91 refs #6768 summary redirect 2024-02-28 10:28:11 +01:00
Pablo Natek fbd303f1f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-02-28 10:08:19 +01:00
Jorge Penadés 96077f3174 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6909-addWarningUnsavedChanges 2024-02-28 08:34:19 +01:00
carlosfonseca 0a33b8d92a Solucion a comentarios 24 2024-02-27 11:38:58 -05:00
Jorge Penadés ddff5a3661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6909-addWarningUnsavedChanges 2024-02-27 15:41:48 +01:00
Jorge Penadés 1484b7de3b feat: refs #6909 popup onBeforeLeave 2024-02-27 15:41:09 +01:00
William Buezas c767bcde7d Add scroll on LeftMenu item expansion 2024-02-27 10:55:45 -03:00
Carlos Satorres b69b937c42 refs #6908 remove Banner 2024-02-27 14:27:09 +01:00
Carlos Satorres 478f0e17b1 refs #6890 change redirect 2024-02-27 14:19:53 +01:00
William Buezas 50218d6ddf WIP 2024-02-27 07:32:51 -03:00
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-27 08:23:02 +01:00
Alex Moreno c8a4854df9 refs #5509 fix(vnDms): fix issues 2024-02-27 08:22:38 +01:00
William Buezas 9f35d20f2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters 2024-02-26 15:15:07 -03:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
carlosfonseca 7eca27b8af Solucion a comentarios 23 2024-02-26 09:58:38 -05:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
Pablo Natek b092c5af6d refs 6486 commit 2024-02-26 15:00:14 +01:00
Jorge Penadés f90c3d7474 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6904-fixCustomerSection 2024-02-26 14:23:46 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList 2024-02-26 14:17:02 +01:00
carlosfonseca efb676e4a4 Solucion a comentarios 22 2024-02-26 06:59:33 -05:00
Alex Moreno 6dd227769f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-26 12:43:45 +01:00
Alex Moreno 5ac5f91847 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-26 10:03:17 +01:00
Alex Moreno d3d73b985e refs #6336 fix(claimSummary): loadPhoto, ItemDescriptor 2024-02-26 09:16:37 +01:00
Javier Segarra e859fc29c8 refs #6935 feat: remove width, add text-align and label : 2024-02-26 08:33:17 +01:00
carlosfonseca b12968f982 Solucion a comentarios 21 2024-02-25 22:28:56 -05:00
William Buezas bf66d4ec99 Table column filters 2024-02-25 22:02:52 -03:00
Carlos Satorres 6512cee257 Merge branch 'dev' into 6768-VnLocationRefact 2024-02-23 12:33:15 +00:00
Carlos Satorres 3316aa02ff refs #6768 fix postalCode 2024-02-23 13:28:30 +01:00
carlosfonseca 90ee50eab5 Solucion a comentarios 20 2024-02-22 18:01:38 -05:00
carlosfonseca 2c70a73b8e Solucion a comentarios 19 2024-02-22 13:49:06 -05:00
carlosfonseca 9ae0874ccf Solucion a comentarios 2024-02-22 10:44:29 -05:00
William Buezas f69b25716d Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER 2024-02-22 10:38:30 -03:00
William Buezas 1b67b7ab36 Customer description corrections and creation of tickets create view 2024-02-22 10:38:15 -03:00
carlosfonseca d9a1d62c74 Solucion a comentarios 2024-02-22 05:57:28 -05:00
carlosfonseca 980904a382 Solucion a comentarios 18 2024-02-22 05:46:56 -05:00
carlosfonseca 3bcd4984f5 Solucion a comentarios 17 2024-02-22 05:11:02 -05:00
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon 2024-02-22 10:57:11 +01:00
Alex Moreno 00bed4fd61 refs #5509 fix(FormModel): autoLoad && formInitalData 2024-02-22 10:20:44 +01:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-22 09:11:36 +01:00
Carlos Satorres 5e5c2e640b refs #6768 consignee 2024-02-21 13:48:48 +01:00
Carlos Satorres f0b2979066 refs #6768 create consignee 2024-02-21 13:19:28 +01:00
Carlos Satorres 9673447792 refs #6768 location consignee create 2024-02-21 12:21:24 +01:00
Alex Moreno c184851b26 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-21 08:49:40 +00:00
carlosfonseca d06271b91d Solucion a comentarios 16 2024-02-20 19:02:42 -05:00
William Buezas a0d75e5b02 Remove unnecesary validate un CustomerNotificationsFilter 2024-02-20 16:10:41 -03:00
William Buezas 7c8b0a345e Fix CustomerSummaryTableActions import 2024-02-20 16:02:32 -03:00
carlosfonseca 01d68734b6 Correccion de conflictos 2024-02-20 12:15:27 -05:00
carlosfonseca a0e5549311 Solucion a comentarios 15 2024-02-20 11:43:01 -05:00
William Buezas f1f0f9fffb Customer contacts view 2024-02-20 09:48:09 -03:00
carlosfonseca 86199d8197 Solucion a comentarios 14 2024-02-19 11:27:24 -05:00
Jorge Penadés 53de842af5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-19 14:49:52 +01:00
William Buezas d5d8de08fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ExtraCommunityDragAndDrop 2024-02-19 09:24:10 -03:00
William Buezas 433444c869 Improvements and corrections 2024-02-19 09:23:44 -03:00
Carlos Satorres 9caf9edfbb Merge branch 'dev' into 6763-vnTreeRefact 2024-02-19 11:48:07 +00:00
Carlos Satorres 5cc2384149 refs #6763 remove 2024-02-19 11:30:04 +01:00
Carlos Satorres 7397f07463 refs #6763 remove 2024-02-19 11:29:30 +01:00
Carlos Satorres 01850c6670 refs #6763 pointer 2024-02-19 11:24:49 +01:00
Alex Moreno 789bed7c9e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-02-19 11:24:42 +01:00
carlosfonseca bb10714824 Solucion a comentarios 13 2024-02-19 05:24:26 -05:00
Jorge Penadés c6e9ae2c5f fix: refs #6317 validation % fix e2e 2024-02-19 10:56:47 +01:00
Alex Moreno c916bd5945 refs #6863 fix: VnSelect + url, VnLocation 2024-02-19 10:50:35 +01:00
Carlos Satorres 4eb2f1f725 Merge branch '6763-vnTreeRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-19 10:26:08 +01:00
Carlos Satorres 3a48d09080 refs #6763 refactor node 2024-02-19 10:26:05 +01:00
Alex Moreno e8a4dd65e2 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-19 08:35:15 +00:00
Jorge Penadés 64b402abb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-19 08:57:50 +01:00
Javier Segarra fddc669729 refs #6763 feat: fix features 2024-02-19 05:51:35 +01:00
carlosfonseca d0cf13d0af Solucion a comentarios 12 2024-02-16 13:29:36 -05:00
carlosfonseca ebd1ee07f4 Solucion a comentarios 11 2024-02-16 13:12:57 -05:00
William Buezas f230090711 Add scroll when dragging elements 2024-02-16 15:00:24 -03:00
Carlos Satorres 5f28296725 Merge branch 'dev' into 6795-claimRefact 2024-02-16 13:06:21 +00:00
Carlos Satorres deacf0feef Merge branch 'dev' into 6787-loadingDescriptor 2024-02-16 12:50:32 +00:00
Carlos Satorres 72e7bf0f7a refs #6795 fix navigate 2024-02-16 13:49:11 +01:00
William Buezas 0761860b37 Improve drag and drop borders status 2024-02-16 09:24:31 -03:00
carlosfonseca 17a0afda73 Solucion a comentarios 10 2024-02-15 21:42:29 -05:00
William Buezas c322bfb46c general improvements 2024-02-15 14:23:01 -03:00
Alex Moreno 87f81eb80a refs #6664 hotFix: multiplicatorValue updateGreuges 2024-02-15 16:15:48 +01:00
Alex Moreno 72d51a53a8 hotFix: vnSelectFilter 2024-02-15 14:53:43 +01:00
Carlos Satorres 3c4df81579 refs #6862 fixtest 2024-02-15 11:30:51 +01:00
Jorge Penadés 7db177ccba feat: refs #6317 create VnCurrency & useValidNumber 2024-02-15 09:43:01 +01:00
William Buezas 08e39232e2 add dashed border to first and last child to drop row 2024-02-14 22:18:54 -03:00
William Buezas e29801a47e General improvements and handle params changes in VnFilterPanel 2024-02-14 22:14:44 -03:00
carlosfonseca 5e2c668fec Solucion a comentarios 9 2024-02-14 19:17:18 -05:00
William Buezas 60d2491409 change drag status color 2024-02-14 18:20:54 -03:00
carlosfonseca ab20ec1738 Solucion a comentarios 8 2024-02-14 12:21:00 -05:00
Carlos Satorres 926395a7e7 refs #6763 fix tree descriptor 2024-02-14 15:31:53 +01:00
William Buezas fbe8c912f6 Fix dragend status 2024-02-14 09:55:18 -03:00
Jorge Penadés 40d043036e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-14 13:35:37 +01:00
carlosfonseca 08e072100b Solucion a comentarios 7 2024-02-13 21:10:10 -05:00
William Buezas 617200331d remove unnecesary code 2024-02-13 14:58:51 -03:00
William Buezas da5186f184 Show sample preview as v-html 2024-02-13 14:53:29 -03:00
carlosfonseca d0e98010a5 Solucion a comentarios 6 2024-02-13 12:50:00 -05:00
Alex Moreno 4315408452 refs #5509 feat: VnDms description 2024-02-13 15:01:24 +01:00
William Buezas ca06140a8d remove v-if 2024-02-13 10:49:27 -03:00
William Buezas 2693f259d4 Add drag and drop do Travel Extra Community table 2024-02-13 10:17:24 -03:00
Carlos Satorres 1e5638b487 refs #6787 fix descriptor skeleton 2024-02-13 12:44:20 +01:00
Carlos Satorres 409bb1a13e refs #6795 fix return 2024-02-13 11:51:59 +01:00
Carlos Satorres ab512e3b03 refs #6795 fix tfront 2024-02-13 11:50:12 +01:00
Carlos Satorres c2675bfe56 refs #6763 fix descriptor 2024-02-13 11:31:33 +01:00
Alex Moreno 1d4179cfa1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-13 08:09:25 +01:00
Alex Moreno 1db827a7c8 refs #6795 fix: claim paddings and colors 2024-02-13 08:03:31 +01:00
carlosfonseca c0a9835e80 Solucion a comentarios 5 2024-02-12 20:37:51 -05:00
carlosfonseca 6bf9b7c0c8 Se deshacen cambios que se hicieron el el commit 11eb597fa3 2024-02-12 14:09:26 -05:00
carlosfonseca 3cf3687b84 Correccion de comentarios3 2024-02-12 13:54:17 -05:00
Carlos Satorres 7aab50ffff Merge branch 'dev' into 6795-claimRefact 2024-02-12 16:46:51 +00:00
Alex Moreno aa4d5bffc3 refs #5509 feat: VnDms & VnDmsList 2024-02-12 15:06:20 +01:00
Carlos Satorres e3e0439d7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-12 14:07:08 +01:00
Carlos Satorres a9c288e6ea refs #6795 fix url, details 2024-02-12 13:58:13 +01:00
William Buezas cd2eb71efd Fix view icon 2024-02-12 08:14:10 -03:00
William Buezas 4810e02907 add basic order to table 2024-02-09 20:50:33 -03:00
Alex Moreno cb6ba483d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 14:43:50 +01:00
William Buezas 254d5a291f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TravelExtraCommunityCorrections 2024-02-09 10:43:09 -03:00
William Buezas 399f47b17c merge with salix-front dev branch and resolve conflicts 2024-02-09 08:59:46 -03:00
William Buezas 1b31657338 Add tooltip to VnSelegDialog Action icon and small corrections 2024-02-09 08:51:39 -03:00
Carlos Satorres 587e0a53e7 refs #6791 change field 2024-02-09 12:17:35 +01:00
Carlos Satorres c87f49b86e refs #6795 popup item 2024-02-09 11:46:47 +01:00
Carlos Satorres b355d4aa0f refs #6795 remove watch 2024-02-09 10:15:36 +01:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Carlos Satorres d13bf60ea3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact 2024-02-09 09:08:56 +01:00
Carlos Satorres b3251967b8 refs #6795 fix descriptor 2024-02-09 09:07:54 +01:00
William Buezas c67f4cf858 Thermograph create form and general improvements 2024-02-08 23:30:08 -03:00
carlosfonseca 11eb597fa3 Correccion de comentarios2 2024-02-08 20:24:48 -05:00
carlosfonseca 7f1c4690e8 Correccion de comentarios 2024-02-08 13:25:44 -05:00
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 17:30:47 +00:00
Kevin Martinez 4e42a6ab74 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154
# Conflicts:
#	src/pages/Route/RouteList.vue
2024-02-08 10:22:58 -03:00
Carlos Satorres 2f081841f9 refs #6795 fix claims 2024-02-08 13:59:37 +01:00
Jorge Penadés 2eceb226a9 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:21 +01:00
Jorge Penadés 97b8b0fa37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:15 +01:00
Javier Segarra 242a8e25a8 refs #4466 fix: change VnSearchBar placeholder 2024-02-08 13:02:14 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
William Buezas f24b9f5a75 Adjust thermograph notify 2024-02-08 08:26:36 -03:00
William Buezas 770f17a362 Fix edit thermograph id problem 2024-02-08 08:21:41 -03:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Alex Moreno 04ec81e852 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 11:03:30 +00:00
William Buezas c8153b6414 Add action to qfile icon 2024-02-08 08:01:16 -03:00
William Buezas 4dc31bfdce Travel summary corrections 2024-02-08 07:58:52 -03:00
Jorge Penadés 9393e05bd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6657-fixSummaryDescriptor 2024-02-08 11:57:18 +01:00
William Buezas 5312a4e43a WIP 2024-02-08 07:24:24 -03:00
Carlos Satorres 1cc9502328 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 10:11:00 +01:00
Carlos Satorres 481b022786 fix(VnSelecFilter) filter 2024-02-08 10:10:43 +01:00
Carlos Satorres 10fc95c6bc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 09:54:42 +01:00
Carlos Satorres 78b484baeb fix(VnSelecFilter) filter 2024-02-08 09:54:17 +01:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Alex Moreno 18b76e5e12 refs #5509 feat: VnDmsList 2024-02-08 07:25:23 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
2024-02-07 22:38:57 -03:00
William Buezas f59c2409f1 travels corrections and improvements 2024-02-07 15:01:51 -03:00