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

3521 Commits

Author SHA1 Message Date
Alex Moreno 741ce4c274 refs #6062 fix: invoiceOuts translation 2024-01-08 08:00:06 +01:00
Kevin Martinez 8a6e78a143 Merge branch 'dev' into feature/order-catalog-filter 
# Conflicts:
#	src/components/ui/VnFilterPanel.vue
#	src/pages/Order/Card/OrderCatalogFilter.vue
#	src/pages/Order/OrderCatalog.vue
 2024-01-05 13:13:03 -04:00
Kevin Martinez c997d19a5e Implement tag filter 2024-01-05 13:04:06 -04:00
William Buezas aa1f8c4f3b Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules-2 2024-01-05 11:07:22 -03:00
William Buezas 27616b9bd4 improve TableVisibleColumns code 2024-01-05 10:57:43 -03:00
William Buezas 4d0d051c8a supplier log submodule 2024-01-05 08:51:03 -03:00
William Buezas edb1c1c71a Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules 2024-01-05 08:27:23 -03:00
William Buezas 8cb6ed136a mover clase de selector de css para añadir * a inputs requeridos a archivo de css global 2024-01-04 19:37:46 -03:00
William Buezas 073a8f5c70 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-04 18:13:46 -03:00
William Buezas e8fa564bc2 Agregar * a inputs de campos required via css 2024-01-04 18:13:31 -03:00
Carlos Fonseca c832ee6ecc Merge pull request 'Correcciones solicitadas' (#58) from branch-PR-2-fixies-3 into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#58
 2024-01-04 18:15:00 +00:00
carlosfonseca bd8acbe084 Correcciones solicitadas 2024-01-04 13:12:58 -05:00
Carlos Fonseca 083094b25d Merge pull request 'Mejoras en las correcciones de codigo' (#57) from branch-PR-2-fixies-2 into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#57
 2024-01-04 16:43:00 +00:00
carlosfonseca 6b3bed0085 Mejoras en las correcciones de codigo 2024-01-04 11:37:46 -05:00
Carlos Fonseca fb7a3c208c Merge pull request 'Se hacen correcciones en base a comentarios en el PR' (#56) from branch-PR-2-fixes into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#56
 2024-01-04 15:25:33 +00:00
carlosfonseca 64777bb804 Se hacen correcciones en base a comentarios en el PR 2024-01-04 10:23:55 -05:00
Pablo Natek 11a37b7716 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-04 14:47:46 +00:00
William Buezas 3ba4e56204 merge with dev 2024-01-04 11:19:40 -03:00
Carlos Satorres 7ae05f23fc refs #6420 notes 2024-01-04 14:38:33 +01:00
William Buezas cfac9acbe8 Small corrections 2024-01-04 09:58:37 -03:00
William Buezas de8996d596 Fixes PR 2024-01-04 09:34:24 -03:00
Carlos Satorres d30d16bced Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary 2024-01-04 12:23:09 +01:00
Alex Moreno a7289602cc Merge pull request '6618-vnSubToolBar' (!143) from 6618-vnSubToolBar into dev 
Reviewed-on: verdnatura/salix-front#143
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-04 09:56:50 +00:00
Carlos Satorres 83cfd8e4da Merge branch 'dev' into 6618-vnSubToolBar 2024-01-04 09:33:24 +00:00
Carlos Satorres 96acd00469 refs #6618 remove import 2024-01-04 10:33:11 +01:00
Alex Moreno c651becb76 Merge branch 'dev' into 5858-fiscalData-validations 2024-01-04 09:20:06 +00:00
Alex Moreno 4306226e5c refs #6635 feat: correct version 2024-01-04 08:08:28 +01:00
Kevin Martinez b622f9cca7 Add order orderBy filter 2024-01-04 02:27:43 -04:00
Kevin Martinez 5e9006bf33 Fix travel summary cards 2024-01-04 00:58:08 -04:00
William Buezas bdbc3209f4 Merge pull request 'feature/ms-114-ImproveExtendedListFilters' (#53) from feature/ms-114-ImproveExtendedListFilters into dev 
Reviewed-on: hyervoni/salix-front-mindshore#53
 2024-01-03 19:58:24 +00:00
William Buezas aee4696bb2 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-03 16:56:11 -03:00
William Buezas 8fc7a5ea12 Aplicar clases a close-icon en el css 2024-01-03 16:55:48 -03:00
Carlos Fonseca 2df7214324 Merge pull request 'Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas' (#54) from features/ms_93_leftmenu_icons into dev 
Reviewed-on: hyervoni/salix-front-mindshore#54
 2024-01-03 19:55:20 +00: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
William Buezas 142bac7a43 agregar data por default en tabla extended list 2024-01-03 13:49:08 -03:00
Kevin Martinez 467f32d9e0 Merge remote-tracking branch 'origin/branch-PR-2' into branch-PR-2 2024-01-03 10:50:42 -04:00
Kevin Martinez 2af176a502 Fix catalog filter 2024-01-03 10:50:26 -04:00
Kevin Martinez 54d77c9851 Fix Icon sizing 2024-01-03 10:02:14 -04:00
William Buezas a66b88ba8e add delete department popup translation 2024-01-03 10:59:11 -03:00
William Buezas 24fdc1ff97 wip 2024-01-03 10:56:13 -03:00
Alex Moreno b62a317a66 refs #6595 fix: customerExtendedListFilter 2024-01-03 14:17:09 +01: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
Carlos Satorres 9cd20439a6 refs #6618 fix name 2024-01-03 14:09:29 +01:00
Carlos Satorres 9a9bb2fa44 refs #6618 invoiceOut fix 2024-01-03 13:24:49 +01:00
Carlos Satorres 3c98d099b3 refs #6618 component Cards 2024-01-03 13:00:45 +01:00
Carlos Satorres 92127b766b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar 2024-01-03 13:00:25 +01:00
Kevin Martinez 134f1e0195 Merge pull request 'Create order lines' (#46) from feature/order into dev 
Reviewed-on: hyervoni/salix-front-mindshore#46
 2024-01-03 10:52:20 +00:00
Kevin Martinez 733baa1310 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
 2024-01-03 06:51:38 -04:00
Javier Segarra 8bde0073f0 Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev 
Reviewed-on: verdnatura/salix-front#141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-01-03 10:44:26 +00:00
Jorge Penadés a1b6698819 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-01-03 11:34:07 +01:00