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

1298 Commits

Author SHA1 Message Date
Alex Moreno b3f412a6f7 Merge branch 'dev' into hyervoni-branch-PR-2 2024-01-11 12:13:02 +00:00
Alex Moreno 489ea94d3f refs #6595 fix invoiceInBasicData 2024-01-11 13:12:55 +01:00
Carlos Satorres 30c1f8d1f5 Merge pull request 'remove ID' (!148) from removeId into dev 
Reviewed-on: verdnatura/salix-front#148
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-11 11:30:05 +00:00
Carlos Satorres 98810657a1 Merge branch 'dev' into removeId 2024-01-11 11:29:08 +00:00
Alex Moreno 7b974a2f32 refs #6595 fix: remove duplicated 2024-01-11 12:13:38 +01:00
Alex Moreno bc46435299 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-11 12:09:16 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
Jorge Penadés 0a940e2cfb Merge pull request '#6643 create vnUserLink' (!147) from 6643-VnUserLink into dev 
Reviewed-on: verdnatura/salix-front#147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-01-10 13:56:59 +00:00
Jorge Penadés fb4c371371 fix: refs #6643 remove console log 2024-01-10 14:36:30 +01:00
Jorge Penadés 315c089936 fix: refs #6643 fix tests 2024-01-10 14:01:36 +01:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01:00
Jorge Penadés 7b8ad3720e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink 2024-01-10 10:41:49 +01:00
Carlos Satorres ceeba871ce Merge pull request 'refs #6420 change url' (!136) from 6420-claimNotesSummary into dev 
Reviewed-on: verdnatura/salix-front#136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-10 07:27:18 +00:00
Carlos Satorres fa62eb0292 Merge branch 'dev' into 6420-claimNotesSummary 2024-01-10 07:23:42 +00:00
Carlos Satorres 2825001bca Merge pull request 'refs #6383 darkMode' (!152) from 6383-darkMode into dev 
Reviewed-on: verdnatura/salix-front#152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-10 07:23:29 +00:00
Carlos Satorres b83a773278 refs #6420 fix pr 2024-01-09 14:55:52 +01:00
Carlos Satorres a4a7a48fb6 refs #6383 fix 2024-01-09 14:48:47 +01:00
Carlos Satorres 9e314276bd refs #6383 set dark 2024-01-09 14:37:44 +01:00
Carlos Satorres a59a86dfd6 refs #6383 darkMode 2024-01-09 08:36:50 +01:00
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-09 07:47:55 +01: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
Kevin Martinez 1f12609a05 Merge pull request 'Order Catalog Filter' (#59) from feature/order-catalog-filter into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#59
 2024-01-08 15:05:15 +00:00
William Buezas 8a2a6fe1c9 Cambiar traducción de fiscalData 2024-01-08 11:51:20 -03:00
Kevin Martinez 5c2b995659 Add order catalog sort filter 2024-01-08 10:28:55 -04:00
Kevin Martinez fbd5abb330 Fix fallowing feedback 2024-01-08 10:00:04 -04:00
Carlos Satorres 63b1c53ca9 refs #6420 scss fix 2024-01-08 14:17:40 +01:00
Carlos Satorres 651cc6b1ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary 2024-01-08 13:46:33 +01:00
Jorge Penadés 647bb58148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink 2024-01-08 13:41:04 +01:00
Alex Moreno 94e4bb383a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-08 12:02:00 +01:00
Alex Moreno dcedc314f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-08 12:01:38 +01:00
Alex Moreno 80276100f5 refs #6062 fix: console.logs 2024-01-08 11:42:21 +01:00
Alex Moreno 75d2c9ac32 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2024-01-08 11:39:22 +01:00
Alex Moreno 1775ac85e2 refs #6062 fix(claimAction): pagination. fix(claimDevelopment): alignament. fix(claimSummary): object can be null 2024-01-08 11:39:21 +01:00
Pablo Natek e3bd3ac663 Merge pull request 'fix(workerDescriptor): refs #6611 fix workerpopUp' (!146) from 6611-workerDescriptorPopUp into master 
Reviewed-on: verdnatura/salix-front#146
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-08 09:15:18 +00:00
Carlos Satorres b90da9f622 Merge branch 'dev' into removeId 2024-01-08 08:37:25 +00:00
Carlos Satorres a9c4d514bc remove ID 2024-01-08 09:27:34 +01:00
Pablo Natek b670f6b3ee Merge pull request 'refactor(ticketsms): refs #6259 add vnSms create customerSms' (!137) from 6259-ticketSmsToClientSms into dev 
Reviewed-on: verdnatura/salix-front#137
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-08 07:59:29 +00:00
Jorge Penadés a002231d3d refactor: refs #6643 drop payments title 2024-01-08 08:52:17 +01:00
Pablo Natek ad2844d88d fix(workerDescriptor): refs #6611 fix workerpopUp 2024-01-08 08:37:36 +01:00
Pablo Natek eca2413630 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-08 07:23:28 +00:00
Alex Moreno babc217083 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-08 08:00:23 +01:00
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 27616b9bd4 improve TableVisibleColumns code 2024-01-05 10:57:43 -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