Commit Graph

287 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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 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
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
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-29 15:12:30 +01:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
William Buezas e9fe4a3cb9 improvement 2024-01-27 12:14:50 -03:00
William Buezas a01b80703e Create child submodules feature 2024-01-27 12:08:56 -03:00
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00
carlosfonseca b06234441c Se crean las tarjetas de greuges, recobros y acceso web 2024-01-19 10:08:26 -05:00
William Buezas f66af0e663 Merge pull request 'Create Route module' (#73) from feature/routes into dev
Reviewed-on: hyervoni/salix-front-mindshore#73
2024-01-18 13:22:20 +00:00
Kevin Martinez 661e9d4368 Create route summary 2024-01-18 08:45:41 -04:00
carlosfonseca 91e36e6404 Se crea la tarjeta de creditos, listado y creacion 2024-01-17 13:45:01 -05:00
Carlos Fonseca 4838549748 Merge branch 'dev' into features/ms_118_update_customs_agent 2024-01-17 16:53:08 +00:00
Kevin Martinez a68f53d9f7 Add route form 2024-01-17 09:04:10 -04:00
William Buezas a41fd4c487 Merge pull request 'feature/EntrySubmodules' (#71) from feature/EntrySubmodules into dev
Reviewed-on: hyervoni/salix-front-mindshore#71
2024-01-17 11:39:18 +00:00
carlosfonseca 27f9d5a7b2 Se crea tarjeta de notas, lectura y creacion 2024-01-16 22:25:17 -05:00
William Buezas 64a4a800f7 Entry buys import 2024-01-16 16:11:23 -03:00
William Buezas 596904c4f8 Entry submodules: Log, Basic data, Buys (WIP) 2024-01-16 13:26:12 -03:00
carlosfonseca 29418d22bb Se crea formulario de actualización de un agente de aduanas y observaciones 2024-01-16 09:48:30 -05:00
carlosfonseca c471a4febc Se crea el formulario para la creacion de un agente de aduanas 2024-01-15 09:16:50 -05:00
William Buezas 129cacb88b Merge pull request 'feature/ms-115-EntryListView' (#68) from feature/ms-115-EntryListView into dev
Reviewed-on: hyervoni/salix-front-mindshore#68
2024-01-14 23:57:12 +00:00
William Buezas f64ac5c70d Entry summary 2024-01-12 17:02:52 -03:00
Carlos Fonseca 7432f754f5 Merge branch 'dev' into features/ms_118_consignees_cart 2024-01-12 15:42:33 +00:00
Kevin Martinez 3d98bf578e Create route list 2024-01-12 10:03:18 -04:00
William Buezas 2b6faf8186 merge with dev 2024-01-11 14:59:18 -03:00
carlosfonseca d2ee8a98eb Se crea la tarjeta que muestra el listado de consignatarios existentes y la tarjeta de creacion 2024-01-11 08:25:59 -05:00
William Buezas 5511e365aa WIP 2024-01-09 10:46:27 -03:00
Alex Moreno bc8b9501c0 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-09 07:43:29 +01:00
William Buezas 865a13aafa Submodulos de suppliers: Accounts, Contacts y Addresses 2024-01-08 16:16:42 -03:00
carlosfonseca ead8bb4992 Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas 2024-01-03 14:53:01 -05:00
Alex Moreno 5994b4e08e Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-03 14:16:26 +01:00
Kevin Martinez 733baa1310 Merge branch 'dev' into feature/order
# Conflicts:
#	src/i18n/en/index.js
2024-01-03 06:51:38 -04:00
Jorge Penadés a1b6698819 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-01-03 11:34:07 +01:00
carlosfonseca 677660f5cc Se hacen maquetado general de menu izquierdo en summary de clientes 2024-01-02 06:54:15 -05:00
carlosfonseca 31467a2bef Correccion de conflicto 2024-01-02 03:17:23 -05:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
William Buezas c4c344f07a Add descriptor and submodules to supplier card left menu 2023-12-29 14:00:32 -03:00
Jorge Penadés d374709d4a logs added: refs #6605
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-29 08:58:32 +01:00
carlosfonseca eebefca919 Correccion de conflictos 2023-12-28 10:31:15 -05:00
carlosfonseca 5729204a3b Se crea tabla y filtros de morosos en clientes 2023-12-28 10:25:23 -05:00
William Buezas 59e2e20827 Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev
Reviewed-on: hyervoni/salix-front-mindshore#45
2023-12-28 15:07:33 +00:00
Jorge Penadés 232827ef48 WIP: corrective section created: refs #4466
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-28 16:02:04 +01:00
Kevin Martinez b22fcddcd3 Create order lines 2023-12-26 17:45:54 -04:00
Carlos Fonseca 5e1e49e253 Merge pull request 'Se crea tabla de notificaciones, tarjeta por identificador y filtros' (#44) from features/ms_93_customer_notifications_2 into dev
Reviewed-on: hyervoni/salix-front-mindshore#44
2023-12-26 13:56:09 +00:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
carlosfonseca 899b9536b6 Se crea tabla de notificaciones, tarjeta por identificador y filtros 2023-12-22 08:29:21 -05:00
William Buezas 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03:00
Kevin Martinez 36344d112b Create order volume 2023-12-22 00:34:18 -04:00
Kevin Martinez bcfb34475b Merge branch 'dev' into feature/order 2023-12-20 13:58:51 -04:00
Carlos Fonseca 19ab09ee08 Merge pull request 'Se crea tabla y filtros de extended list' (#37) from features/ms_64_extended_list into dev
Reviewed-on: hyervoni/salix-front-mindshore#37
2023-12-20 17:16:16 +00:00
Kevin Martinez a65db2f4cf Create order catalog section 2023-12-19 09:15:54 -04:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
William Buezas d309f04a8f Merge with dev 2023-12-18 12:00:26 -03:00
carlosfonseca b34a5f1d89 Se crea tabla y filtros de extended list 2023-12-18 09:41:10 -05:00
Carlos Fonseca 4c55896dfb Merge pull request 'Se crea formulario de creacion de cliente' (#34) from features/ms_63_client_create into dev
Reviewed-on: hyervoni/salix-front-mindshore#34
2023-12-14 16:43:16 +00:00
carlosfonseca 0a41ce6aa9 Se crea formulario de creacion de cliente 2023-12-14 06:49:40 -05:00
William Buezas 0b80e8cacc Add left menu to travel card 2023-12-14 08:42:52 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
2023-12-14 07:08:58 -04:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors
gitea/salix-front/pipeline/head There was a failure building this commit Details
2023-12-13 14:19:42 +01:00