Commit Graph

1380 Commits

Author SHA1 Message Date
carlosfonseca c0a9835e80 Solucion a comentarios 5
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 20:37:51 -05:00
carlosfonseca 6bf9b7c0c8 Se deshacen cambios que se hicieron el el commit 11eb597fa3
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 14:09:26 -05:00
carlosfonseca 3cf3687b84 Correccion de comentarios3
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 13:54:17 -05:00
Carlos Satorres 7aab50ffff Merge branch 'dev' into 6795-claimRefact
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 16:46:51 +00:00
Carlos Satorres a9c288e6ea refs #6795 fix url, details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 13:58:13 +01:00
William Buezas cd2eb71efd Fix view icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-12 08:14:10 -03:00
William Buezas 4810e02907 add basic order to table
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 20:50:33 -03: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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 08:59:46 -03:00
William Buezas 1b31657338 Add tooltip to VnSelegDialog Action icon and small corrections
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 08:51:39 -03:00
Carlos Satorres 587e0a53e7 refs #6791 change field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 12:17:35 +01:00
Carlos Satorres c87f49b86e refs #6795 popup item
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 11:46:47 +01:00
Carlos Satorres b355d4aa0f refs #6795 remove watch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 10:15:36 +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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 09:07:54 +01:00
William Buezas c67f4cf858 Thermograph create form and general improvements
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 23:30:08 -03:00
carlosfonseca 11eb597fa3 Correccion de comentarios2
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 20:24:48 -05:00
carlosfonseca 7f1c4690e8 Correccion de comentarios
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 13:25:44 -05:00
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 17:30:47 +00:00
Kevin Martinez 4e42a6ab74 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/pages/Route/RouteList.vue
2024-02-08 10:22:58 -03:00
Carlos Satorres 2f081841f9 refs #6795 fix claims
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 13:02:14 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 12:32:28 +01:00
William Buezas f24b9f5a75 Adjust thermograph notify
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 08:26:36 -03:00
William Buezas 770f17a362 Fix edit thermograph id problem
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 08:21:41 -03:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 12:11:12 +01:00
Alex Moreno 04ec81e852 Merge branch 'dev' into 4666-invoiceInCorrection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 11:03:30 +00:00
William Buezas c8153b6414 Add action to qfile icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 08:01:16 -03:00
William Buezas 4dc31bfdce Travel summary corrections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/head This commit looks good Details
2024-02-08 10:11:00 +01:00
Carlos Satorres 481b022786 fix(VnSelecFilter) filter
gitea/salix-front/pipeline/head This commit looks good Details
2024-02-08 10:10:43 +01:00
Carlos Satorres 10fc95c6bc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-02-08 09:54:42 +01:00
Carlos Satorres 78b484baeb fix(VnSelecFilter) filter
gitea/salix-front/pipeline/head This commit looks good Details
2024-02-08 09:54:17 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
# 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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-07 15:01:51 -03:00
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-07 15:53:14 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-07 14:42:51 +01:00
carlosfonseca fcdcfd9e97 Modulo customer completo
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-07 06:20:08 -05:00
Javier Segarra 552ac49d0a Merge branch 'dev' into 5858-fiscalData-validations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
Carlos Fonseca f2a877557f Merge branch 'dev' into features/ms_164_file_management_card 2024-02-06 16:06:14 +00:00
carlosfonseca fd3eea70de Se corrigen comentarios de PR 2024-02-06 11:04:37 -05:00
William Buezas 225d600b52 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 11:21:39 -03:00
Jorge Penadés a4deaf4be9 fix: refs refs #4466 console log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 15:12:35 +01:00
Jorge Penadés b76c2a35a8 fix: refs refs #4466 tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 15:11:59 +01:00
Carlos Satorres 346fed0578 refs #6795 summary, order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 15:03:56 +01:00
Kevin Martinez 011e15233e Fix Shelving creation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 10:54:06 -03:00
William Buezas 6773a9a696 Entry buys import open file explorer when clicking clip icon
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 10:14:48 -03:00
Carlos Satorres 8e869a650d refs #6809 remove supplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 13:26:13 +01:00
Carlos Satorres 7e8f81323a refs #6809 supplier UpperCase
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 13:23:11 +01:00
Jorge Penadés 1883cb79ab feat: refs # create vnCurrency
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 13:19:56 +01:00
William Buezas f6b0404cb4 multiple changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:33:06 -03:00
Kevin Martinez 7e45486abd Add missing worker descriptor 2024-02-06 08:16:10 -03:00
Kevin Martinez 1665dbf400 Fix shelving priority field
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 22:00:44 -03:00
carlosfonseca 01ffe3adb7 Se termina desarrollo de las tarjetas gestion documental e impagado 2024-02-05 15:51:09 -05:00
William Buezas a7e653cbce Stop propagation on item descriptor cell click
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 14:04:24 -03:00
William Buezas 02c163c5e0 small change
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:50:05 -03:00
William Buezas 86bbc7cfd6 label input changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:47:58 -03:00
William Buezas 5da5bb2047 get input events improvement
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:31:57 -03:00
William Buezas 0525f5fdd8 Add ItemDescriptor to EntryBuys table
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:13:21 -03:00
William Buezas 28790705ea Sort entry observation options
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 12:04:28 -03:00
William Buezas cde41ab337 Entry notes validation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 11:55:22 -03:00
William Buezas 67e2130374 Adjust spacing in entry create form
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 11:36:56 -03:00
William Buezas ddcbc5d8d7 make EditTableCellForm componente reusable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 09:37:29 -03:00
William Buezas 2de02723ba Abstract repetitive returns in a function
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 09:31:12 -03:00
William Buezas 5280a4fa2d Remove '' in click.stop handle
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 08:36:54 -03:00
William Buezas 7089202fe1 remove comment
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 08:35:26 -03:00
William Buezas 584511bc62 Change EntryBuys table image proportions
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 08:32:56 -03:00
Carlos Satorres 760b2d5574 refs #6787 isLoading CardDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-05 10:30:23 +01:00
Carlos Satorres 5462d3ce9a refs #6787 isLoading
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-05 08:32:57 +01:00
Alex Moreno a5064e2e2f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-05 07:10:20 +01:00
Javier Segarra d49a82d10c Refs #6694 fix: VnLocation placeholder i18n
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-02-04 15:51:54 +00:00
William Buezas a88b1137dc Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2024-02-02 14:11:36 -03:00
William Buezas dc554f03d0 merge with salix-front dev 2024-02-02 14:11:12 -03:00
William Buezas 6c8e736b17 changes in entry searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-02-02 14:41:59 +01:00
carlosfonseca b06e5b9252 Correcciones comentarios pr 2024-02-02 08:21:23 -05: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