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

809 Commits

Author SHA1 Message Date
Jorge Penadés 46bcba99bc fix: refs #5186 margin top 2024-03-01 09:59:32 +01:00
Alex Moreno 37160158ce refs #5509 fix(FormModel) $props.formInitialData 2024-03-01 09:33:59 +01:00
Pablo Natek 3abcf7bb09 Merge branch 'dev' into 6349-removeRma 2024-03-01 07:38:22 +00:00
Carlos Satorres 0de5ad0648 refs #6892 refact summary 2024-03-01 08:36:04 +01:00
Jorge Penadés 3a1ba0bc17 fix: refs #6315 drop icon prop 2024-02-29 15:35:58 +01:00
Jorge Penadés cbf9bff0e3 fix: refs #6315 drop icon 2024-02-29 15:22:41 +01:00
Jorge Penadés 151d08f0bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-29 14:53:01 +01:00
Alex Moreno 9119865ed6 Merge branch 'dev' into 6933-fetchedTagsRefact 2024-02-29 11:02:49 +00:00
Carlos Satorres 3804ec3e36 refs #6933 fetchedTags title fix 2024-02-29 09:22:44 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module 
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
 2024-02-28 21:27:01 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Jorge Penadés b1d8ce40bc fix: refs #6945 css vnRow 2024-02-28 15:13:43 +01:00
William Buezas fe5e448cf0 Change show summary icon condition 2024-02-28 10:13:49 -03:00
William Buezas f1961f07d1 CardSummary changes 2024-02-28 08:54:53 -03:00
William Buezas 98c92abba2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-02-28 08:29:39 -03:00
Javier Segarra fd35b3d8f0 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-02-28 10:58:22 +00: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
William Buezas 5c8b3da33d Merge conflicts 2024-02-27 13:24:21 -03: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
Carlos Satorres b69b937c42 refs #6908 remove Banner 2024-02-27 14:27:09 +01: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
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
William Buezas f048a1c820 Add reactivity to supplier descriptor icons 2024-02-26 13:22:25 -03:00
William Buezas e372c04d35 change variable name 2024-02-26 11:28:03 -03:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
William Buezas 4f4bc89ff6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosEntries 2024-02-26 11:06:00 -03: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
William Buezas 740eedbe44 Improve reactivity of card descriptor 2024-02-26 09:54:59 -03:00
Kevin Martinez 698a88e6f0 Fix infinite scroll in VnPaginate 2024-02-26 09:52:56 -03: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
Javier Segarra e859fc29c8 refs #6935 feat: remove width, add text-align and label : 2024-02-26 08:33:17 +01:00
Javier Segarra 4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia 2024-02-26 07:11:33 +01:00
William Buezas 46e5503a79 save descriptor data in state 2024-02-23 10:43:30 -03: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
William Buezas c407566d67 descriptor menu actions 2024-02-21 11:27:32 -03:00
Alex Moreno c184851b26 Merge branch 'dev' into 6763-vnTreeRefact 2024-02-21 08:49:40 +00:00
William Buezas 587baa645e generic FormPopup creation and SendInvoiceForm creation 2024-02-20 08:47:24 -03: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
Kevin Martinez 988362ab69 Fix route ticket sms event 2024-02-19 10:02:48 -03:00
Kevin Martinez b3f8d369ee Create route tickets actions 2024-02-19 09:58:28 -03: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
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
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
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
William Buezas ac555a0146 Transfer invoice form 2024-02-15 11:36:53 -03: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 e29801a47e General improvements and handle params changes in VnFilterPanel 2024-02-14 22:14:44 -03:00
Carlos Satorres 926395a7e7 refs #6763 fix tree descriptor 2024-02-14 15:31:53 +01: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
Alex Moreno 4315408452 refs #5509 feat: VnDms description 2024-02-13 15:01:24 +01:00
Carlos Satorres 1e5638b487 refs #6787 fix descriptor skeleton 2024-02-13 12:44:20 +01:00
Carlos Satorres c2675bfe56 refs #6763 fix descriptor 2024-02-13 11:31:33 +01:00
Alex Moreno 1db827a7c8 refs #6795 fix: claim paddings and colors 2024-02-13 08:03:31 +01: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
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 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
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
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 97b8b0fa37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:15 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01: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
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name 2024-02-07 15:59:25 +01:00
Jorge Penadés c162f34ee5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:23 +01:00
William Buezas 225d600b52 resolve conflicts 2024-02-06 11:21:39 -03:00
Jorge Penadés a4deaf4be9 fix: refs refs #4466 console log 2024-02-06 15:13:43 +01:00
Jorge Penadés b76c2a35a8 fix: refs refs #4466 tests 2024-02-06 15:11:59 +01:00
Kevin Martinez 011e15233e Fix Shelving creation 2024-02-06 10:54:06 -03:00
William Buezas f6b0404cb4 multiple changes 2024-02-06 08:33:06 -03:00
Carlos Satorres 7175c50bd6 refs #6763 popup fix click 2024-02-06 09:50:18 +01:00
William Buezas a7e653cbce Stop propagation on item descriptor cell click 2024-02-05 14:04:24 -03:00
Jorge Penadés e49a9f4165 feat: refs #6317 create vnCurrency 2024-02-05 15:39:53 +01:00
Alex Moreno 64b7a07d41 refs #5509 feat: VnDms FormModel 2024-02-05 15:04:13 +01:00
William Buezas ddcbc5d8d7 make EditTableCellForm componente reusable 2024-02-05 09:37:29 -03:00
Alex Moreno 7b68f15781 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-05 12:54:58 +01:00
Carlos Satorres 760b2d5574 refs #6787 isLoading CardDescriptor 2024-02-05 10:30:23 +01:00
Jorge Penadés 53a08724c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-05 08:32:57 +01:00
Alex Moreno a5064e2e2f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-05 07:10:20 +01:00
Javier Segarra d49a82d10c Refs #6694 fix: VnLocation placeholder i18n 2024-02-04 15:51:54 +00:00
William Buezas 6c8e736b17 changes in entry searchbar 2024-02-02 14:08:17 -03:00
William Buezas 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
William Buezas ba45f71a42 Entries several changes 2024-02-02 12:45:29 -03:00
Jorge Penadés 63e5d46973 feat: refs #4466 icons added 2024-02-02 16:36:22 +01:00
Javier Segarra 1c7ad7946e refs #5888 feat: change layout 2024-02-02 14:41:59 +01:00
Jorge Penadés 3d6f9f9dd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-02 14:06:34 +01:00
Carlos Satorres c6a9ec5415 refs #6763 fix changes 2024-02-02 09:55:38 +01:00
Alex Moreno e1e5bbccc6 Merge branch 'dev' into 5834_billingDataSwift 2024-02-02 07:18:04 +00:00
Alex Moreno 0ffff5ea1c Merge branch 'feature/SuppliersCorrections' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2024-02-02 07:30:57 +01:00
William Buezas 68260c1383 force item descriptor image upload 2024-02-01 11:35:14 -03:00
Alex Moreno 6bfa710864 fix(VnLog): option-value 2024-02-01 14:20:46 +01:00
Carlos Satorres 5450f948a3 refs #6763 fix tree 2024-02-01 12:35:20 +01:00
Javier Segarra f14246631a Merge branch 'dev' into 5834_billingDataSwift 2024-01-31 14:39:27 +00:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
William Buezas 43c621f379 remove tooltip to attach icon 2024-01-31 10:55:55 -03:00
William Buezas 0e32138714 Make input file clip icon work 2024-01-31 10:49:29 -03:00
William Buezas 588a5ff674 photo uplader updates 2024-01-31 09:31:20 -03:00
Carlos Satorres 78877556cf refs #6763 click 2024-01-31 12:52:50 +01:00
Javier Segarra a9ee2b7cb6 Merge branch 'dev' into 6677-urlSelectFilter 2024-01-31 08:12:50 +00:00
Javier Segarra fea618b213 refs #5834 feat: replace QInput by VnInput 2024-01-31 09:00:48 +01:00
Javier Segarra 0287ec4932 refs #5834 feat: add required for code 2024-01-31 08:57:05 +01:00
Javier Segarra f3e7d8ceb1 refs #5834 feat: i18n 2024-01-31 08:54:49 +01:00
Javier Segarra 40fb0c4533 refs #5834 feat: add required for country 2024-01-31 08:41:21 +01:00
William Buezas 3cfef87efb upload file form WIP 2024-01-30 21:54:14 -03:00
William Buezas 7e1fced429 WIP 2024-01-30 10:20:40 -03:00
Carlos Satorres 021d851655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6677-urlSelectFilter 2024-01-30 13:34:57 +01:00
Carlos Satorres adac3bc895 refs #6677 fix code 2024-01-30 13:34:05 +01:00
Jorge Penadés 3c67e1d51c Merge branch '6654-stickySubToolbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-30 10:30:09 +01:00
Jorge Penadés 66e119adc3 fix: refs #6654 btn responsive & replace toolbars 2024-01-30 10:30:07 +01:00
Javier Segarra 8200b19238 Merge branch 'dev' into 6654-stickySubToolbar 2024-01-30 08:25:24 +00:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard 2024-01-29 13:59:51 +00:00
Carlos Satorres 53da9406d0 Merge branch 'dev' into 6733-workerCreate 2024-01-29 13:55:24 +00:00
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-29 14:10:58 +01:00
William Buezas 5e296869a1 More improvements 2024-01-29 08:59:20 -03:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
Carlos Satorres a89748827f refs #6677 url 2024-01-29 11:42:08 +01:00