Commit Graph

349 Commits

Author SHA1 Message Date
William Buezas e51ea9996b Item list view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:18:18 -03:00
Robert Ferrús cd3024c0a1 feat: refs #6679 add icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 09:17:49 +02:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
Javier Segarra f2d513766e fix_merge_worker_submoduls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-08 07:03:42 +00:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-05 09:11:23 -03:00
William Buezas 4701714aa9 merge with dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 08:42:13 -03:00
William Buezas 03be831ee5 remove package-lock.json
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 08:24:55 -03:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Pablo Natek fb6a2c8097 feat: refs #4988 add agencyList and searchBar 2024-04-03 14:59:51 +02:00
Pablo Natek 6c39c7da97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-03 08:40:15 +02:00
Pablo Natek f404243d63 feat(route): refs # agency add agencyList 2024-04-03 08:38:26 +02:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-28 07:17:28 +00:00
Kevin Martinez 0dee7e8cc9 Create worker calendar submodule 2024-03-27 16:51:44 -03:00
William Buezas 37465ffa4a resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 11:23:54 -03:00
William Buezas b546b63352 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:11:20 -03:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 08:30:37 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 08:55:01 +01:00
carlosfonseca 627d3bbe85 Se implementan las correcciones a los comentarios
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-25 16:00:47 -05:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 08:30:54 -05:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 15:31:15 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 08:01:57 -03:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-20 16:55:09 +00:00
Kevin Martinez cf25476a5d Create worker log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 21:04:52 -03:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 08:39:10 -05:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-15 03:12:46 +00:00
Jorge Penadés dd91449818 feat: refs #5186 use global locales
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:16:50 +01:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 09:50:27 -03:00
William Buezas 6baaebf6bd WIP 2024-03-14 09:48:04 -03:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 10:55:02 +00:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:21 +01:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 14:37:06 +00:00
William Buezas 4925bed845 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 11:31:55 -03:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:16:40 -03:00
William Buezas 319295f2c2 Workers PDA
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 16:53:33 -03:00
Jorge Penadés 37f155aa85 fix: refs #5186 css, required files & routes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 10:06:11 +01:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 09:32:30 +01:00
Jorge Penadés 300e384f75 feat: refs #5186 add e2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 10:32:41 +01:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:57:54 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/components/ui/VnPaginate.vue
2024-03-06 23:19:47 -03:00
William Buezas 6a105d5d38 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 08:35:49 -03:00
William Buezas 859c87940d Several changes 2024-03-06 08:15:50 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Kevin Martinez 31911be3ba Remove unused route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-03 23:36:30 -03:00
Jorge Penadés ebbe38a14e fix: refs #5186 parking routes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-01 11:05:34 +01:00
Jorge Penadés c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-29 15:52:43 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
2024-02-28 21:27:01 -03:00
William Buezas a0f9c811ff resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-28 12:56:13 -03:00
William Buezas b0d43edbce Route summary link logic improvement
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-28 12:02:38 -03:00
carlosfonseca 0a33b8d92a Solucion a comentarios 24
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-27 11:38:58 -05:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-26 19:06:21 +01:00
Kevin Martinez 185de3c931 Add roadmap stops
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-23 00:46:57 -03:00
carlosfonseca 9ae0874ccf Solucion a comentarios
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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 3bcd4984f5 Solucion a comentarios 17
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-22 05:11:02 -05:00
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-22 10:57:11 +01:00
Jorge Penadés ddb6bdeb47 fix: refs #5186 parking routes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-21 11:31:25 +01:00
Jorge Penadés 1af5b270a0 fear: refs #5186 WIP parking section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-21 10:26:20 +01:00
Kevin Martinez 75733fd530 Fix autonomous route
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 20:51:25 -03:00
carlosfonseca 01d68734b6 Correccion de conflictos
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 12:15:27 -05:00
Kevin Martinez 0a03ef69ea Create roadmap basic data page
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-20 08:00:17 -03:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
Kevin Martinez 45d7b021a6 Create roadmap create page 2024-02-20 07:58:14 -03:00
Kevin Martinez 8ffa3b7626 Create roadmap list page 2024-02-20 07:57:59 -03:00
Kevin Martinez 046ac0406b Create invoice in autonomous page
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 10:13:17 -03:00
Kevin Martinez e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00
Kevin Martinez 76dd84fd87 Create route logs 2024-02-19 09:58:33 -03:00
Kevin Martinez 67f862ebe3 Create route tickets 2024-02-19 09:57:49 -03:00
carlosfonseca ab20ec1738 Solucion a comentarios 8
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 12:21:00 -05: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
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
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
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 08:59:46 -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
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
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
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 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 0ff70a378d Travel termographs and general improvements 2024-02-06 14:08:44 -03:00
William Buezas 7b542dc3bb WIP 2024-02-06 14:06:24 -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 01ffe3adb7 Se termina desarrollo de las tarjetas gestion documental e impagado 2024-02-05 15:51:09 -05: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 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 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
Jorge Penadés fed382d1fd fix: refs #4466 conficts 2024-02-02 15:28:10 +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