wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
1,871 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

1410 Commits

Author SHA1 Message Date
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
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
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name 2024-02-07 15:59:25 +01:00
Jorge Penadés e2facf3330 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 15:53:14 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00
Javier Segarra 552ac49d0a Merge branch 'dev' into 5858-fiscalData-validations 2024-02-07 09:30:03 +00: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 018f251f3d small improvements 2024-02-06 15:00:25 -03:00
William Buezas 087d22e77d Mejoras y cosas faltantes 2024-02-06 14:10:52 -03:00
William Buezas 344ad0281f Improvements WIP 2024-02-06 14:09:32 -03:00
William Buezas 0ff70a378d Travel termographs and general improvements 2024-02-06 14:08:44 -03:00
William Buezas a84f665bc6 TravelSummary improvements 2024-02-06 14:06:42 -03:00
William Buezas 2459e32f00 In TravelList show warehouses name instead warehouseFk 2024-02-06 14:06:33 -03:00
William Buezas 7b542dc3bb WIP 2024-02-06 14:06:24 -03:00
William Buezas c9bd3d413a Travel termographs WIP 2024-02-06 14:06:15 -03:00
William Buezas 71e2cdebe4 WIP 2024-02-06 14:05:57 -03: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 b80fbdbb6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-06 15:12:35 +01:00
Jorge Penadés b76c2a35a8 fix: refs refs #4466 tests 2024-02-06 15:11:59 +01:00
Carlos Satorres 346fed0578 refs #6795 summary, order 2024-02-06 15:03:56 +01:00
Kevin Martinez 011e15233e Fix Shelving creation 2024-02-06 10:54:06 -03:00
William Buezas 6773a9a696 Entry buys import open file explorer when clicking clip icon 2024-02-06 10:14:48 -03:00
Carlos Satorres 8e869a650d refs #6809 remove supplier 2024-02-06 13:26:13 +01:00
Carlos Satorres 7e8f81323a refs #6809 supplier UpperCase 2024-02-06 13:23:11 +01:00
Jorge Penadés 1883cb79ab feat: refs # create vnCurrency 2024-02-06 13:19:56 +01:00
William Buezas f6b0404cb4 multiple changes 2024-02-06 08:33:06 -03:00
Kevin Martinez 7e45486abd Add missing worker descriptor 2024-02-06 08:16:10 -03:00
Carlos Satorres 7175c50bd6 refs #6763 popup fix click 2024-02-06 09:50:18 +01:00
Kevin Martinez 1665dbf400 Fix shelving priority field 2024-02-05 22:00:44 -03:00
William Buezas a7e653cbce Stop propagation on item descriptor cell click 2024-02-05 14:04:24 -03:00
William Buezas 02c163c5e0 small change 2024-02-05 12:50:05 -03:00
William Buezas 86bbc7cfd6 label input changes 2024-02-05 12:47:58 -03:00
William Buezas 5da5bb2047 get input events improvement 2024-02-05 12:31:57 -03:00
William Buezas 0525f5fdd8 Add ItemDescriptor to EntryBuys table 2024-02-05 12:13:21 -03:00
William Buezas 28790705ea Sort entry observation options 2024-02-05 12:04:28 -03:00
William Buezas cde41ab337 Entry notes validation 2024-02-05 11:55:22 -03:00
Jorge Penadés e49a9f4165 feat: refs #6317 create vnCurrency 2024-02-05 15:39:53 +01:00
William Buezas 67e2130374 Adjust spacing in entry create form 2024-02-05 11:36:56 -03: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
William Buezas 2de02723ba Abstract repetitive returns in a function 2024-02-05 09:31:12 -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
William Buezas 5280a4fa2d Remove '' in click.stop handle 2024-02-05 08:36:54 -03:00
William Buezas 7089202fe1 remove comment 2024-02-05 08:35:26 -03:00
William Buezas 584511bc62 Change EntryBuys table image proportions 2024-02-05 08:32:56 -03:00
Carlos Satorres 760b2d5574 refs #6787 isLoading CardDescriptor 2024-02-05 10:30:23 +01:00
Carlos Satorres 5462d3ce9a refs #6787 isLoading 2024-02-05 09:57:09 +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
Jorge Penadés ecba57ebb6 fix: refs #4466 id reactivity 2024-02-02 16:07:39 +01:00
Jorge Penadés fed382d1fd fix: refs #4466 conficts 2024-02-02 15:28:10 +01:00
Javier Segarra 1c7ad7946e refs #5888 feat: change layout 2024-02-02 14:41:59 +01:00
Jorge Penadés 814c8dc0e2 fix: refs #4466 conficts 2024-02-02 14:07:33 +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
Kevin Martinez ea9a9323e7 Fix feedback 2024-02-02 08:33:37 -03:00
Carlos Satorres c6a9ec5415 refs #6763 fix changes 2024-02-02 09:55:38 +01:00
Javier Segarra fd56f0744b refs #5888 feat: change model variable 2024-02-02 09:52:36 +01:00
Javier Segarra 13504be081 refs #5888 feat: change layout 2024-02-02 09:52:29 +01:00
Alex Moreno e1e5bbccc6 Merge branch 'dev' into 5834_billingDataSwift 2024-02-02 07:18:04 +00:00
Alex Moreno 565b94e915 refs #6762 fix(supplierConsumption): subtoolbar 2024-02-02 07:38:06 +01: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 25926e6660 Add item descriptor photo class again 2024-02-01 11:38:16 -03: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
William Buezas bb1ddf5900 add table rows selection 2024-01-31 21:22:32 -03:00
Javier Segarra f14246631a Merge branch 'dev' into 5834_billingDataSwift 2024-01-31 14:39:27 +00:00
William Buezas 71e9740306 text area changes 2024-01-31 11:34:11 -03:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
William Buezas aa40a3b0f5 resolve conflicts with dev 2024-01-31 11:27:08 -03:00
William Buezas cb51445ead Change available and visible text colors in item descriptor 2024-01-31 11:00:45 -03:00
William Buezas 43c621f379 remove tooltip to attach icon 2024-01-31 10:55:55 -03:00
William Buezas 96af02116d Change SupplierAgencyTermCreate inputs layout 2024-01-31 10:52:14 -03:00
William Buezas c7653088b2 Change bank entity input label 2024-01-31 10:50:03 -03:00
William Buezas 0e32138714 Make input file clip icon work 2024-01-31 10:49:29 -03:00
William Buezas b9dcbc18ca Change SupplierAddressesCreate inputs layout 2024-01-31 09:51:22 -03:00
William Buezas 2f67fef562 Add tooltip to Beneficiary input in SupplierAccounts 2024-01-31 09:37:02 -03:00
William Buezas ae4c80f45c Make Notes a input text instead of textarea 2024-01-31 09:34:13 -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 27bfd009cf refs #5834 perf: fix bad lint 2024-01-31 09:05:21 +01:00
Javier Segarra c42d8169dc refs #5834 perf: remove bad tag 2024-01-31 09:03:44 +01: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
Javier Segarra 6fe6cd79e8 refs #5834 feat: add tooltip for iban input 2024-01-31 08:41:02 +01:00
William Buezas 77f9cc1d80 change white color 2024-01-30 22:39:21 -03: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
William Buezas 73f5c1c636 Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SuppliersCorrections 2024-01-29 10:58:30 -03:00
Carlos Satorres 53da9406d0 Merge branch 'dev' into 6733-workerCreate 2024-01-29 13:55:24 +00:00
Javier Segarra b0083544f0 Merge branch 'dev' into 6280_vnLocation 2024-01-29 13:14:20 +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
Alex Moreno 05c6825141 Merge branch 'dev' into 6664-portesClaim 2024-01-29 11:32:06 +00:00
Carlos Satorres afcfd645ce Merge branch '6664-portesClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6664-portesClaim 2024-01-29 11:48:20 +01:00
Carlos Satorres 324d6da3a3 refs #6664 claimfix 2024-01-29 11:48:18 +01:00
Carlos Satorres a89748827f refs #6677 url 2024-01-29 11:42:08 +01:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css 2024-01-29 10:25:59 +01:00
Javier Segarra 81527ce95c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6280_vnLocation 2024-01-29 10:05:47 +01:00
Alex Moreno a51b539189 Merge branch 'dev' into 6733-workerCreate 2024-01-29 08:49:58 +00:00
Alex Moreno f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3 2024-01-29 08:15:25 +01:00
Kevin Martinez 4cf9548234 Fix shelving module 2024-01-28 15:40:57 -03:00
Kevin Martinez 5449b34fa0 Fix searchbar redirection bug 2024-01-28 15:21:28 -03:00