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

7314 Commits

Author SHA1 Message Date
Jorge Penadés 2eceb226a9 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 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
Jorge Penadés 5d90939288 Merge pull request '#6657 fixSummaryDescriptor' (!175) from 6657-fixSummaryDescriptor into dev 
Reviewed-on: verdnatura/salix-front#175
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-08 12:22:52 +00:00
Javier Segarra 242a8e25a8 refs #4466 fix: change VnSearchBar placeholder 2024-02-08 13:02:14 +01:00
Kevin Martinez a0ba4ac017 Fix LeftMenu Unit test 2024-02-08 08:32:35 -03:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
William Buezas f24b9f5a75 Adjust thermograph notify 2024-02-08 08:26:36 -03:00
William Buezas 770f17a362 Fix edit thermograph id problem 2024-02-08 08:21:41 -03:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Alex Moreno 04ec81e852 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 11:03:30 +00:00
William Buezas c8153b6414 Add action to qfile icon 2024-02-08 08:01:16 -03:00
William Buezas 4dc31bfdce Travel summary corrections 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 2024-02-08 10:11:00 +01:00
Carlos Satorres 481b022786 fix(VnSelecFilter) filter 2024-02-08 10:10:43 +01:00
Carlos Satorres 10fc95c6bc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 09:54:42 +01:00
Carlos Satorres 78b484baeb fix(VnSelecFilter) filter 2024-02-08 09:54:17 +01: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
Alex Moreno 18b76e5e12 refs #5509 feat: VnDmsList 2024-02-08 07:25:23 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# 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 2024-02-07 15:01:51 -03:00
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name 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 2024-02-07 15:53:14 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00
carlosfonseca fcdcfd9e97 Modulo customer completo 2024-02-07 06:20:08 -05:00
Javier Segarra 56aa29b3ea Merge pull request '#5878 - FiscalData Validations' (!108) from 5858-fiscalData-validations into dev 
Reviewed-on: verdnatura/salix-front#108
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-02-07 09:31:47 +00:00
Javier Segarra 552ac49d0a Merge branch 'dev' into 5858-fiscalData-validations 2024-02-07 09:30:03 +00:00
Jorge Penadés dafa29f5b5 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:31 +01: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
Javier Segarra 532c88c7c3 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-07 07:52:14 +00:00
Alex Moreno 267565a9f7 Merge pull request 'feature/EntriesCorrections' (!177) from hyervoni/salix-front-mindshore:feature/EntriesCorrections into dev 
Reviewed-on: verdnatura/salix-front#177
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-07 06:44:33 +00:00
William Buezas 018f251f3d small improvements 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 5127369e5c Merge pull request 'Se termina desarrollo de las tarjetas gestion documental e impagado' (#88) from features/ms_164_file_management_card into dev 
Reviewed-on: hyervoni/salix-front-mindshore#88
 2024-02-06 16:09:27 +00: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 2024-02-06 11:21:39 -03:00
Jorge Penadés a4deaf4be9 fix: refs refs #4466 console log 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 2024-02-06 15:12:35 +01:00
Jorge Penadés b76c2a35a8 fix: refs refs #4466 tests 2024-02-06 15:11:59 +01:00
Carlos Satorres 346fed0578 refs #6795 summary, order 2024-02-06 15:03:56 +01:00
Kevin Martinez 011e15233e Fix Shelving creation 2024-02-06 10:54:06 -03:00