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

3503 Commits

Author SHA1 Message Date
Jorge Penadés 7685c38fb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-22 16:45:58 +02:00
Javier Segarra 722f1e8a03 Merge branch 'dev' into feature/ZoneLocations 2024-05-22 14:00:06 +00:00
William Buezas e43485f19c resolve conflict 2024-05-22 10:57:33 -03:00
William Buezas 1347e4ec40 Handle params search on mounted 2024-05-22 10:56:37 -03:00
Carlos Satorres 1a4d8bb0c0 Merge pull request '6820-changeKmroute' (!395) from 6820-changeKmroute into dev 
Reviewed-on: verdnatura/salix-front#395
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-22 13:56:18 +00:00
Javier Segarra e2b72f132c Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations 2024-05-22 15:49:23 +02:00
Javier Segarra 3fded533a6 perf: remove local tree variable 2024-05-22 15:49:11 +02:00
William Buezas f4807d887f Improve node management when using search bar 2024-05-22 10:20:36 -03:00
Carlos Satorres 6b474bfd06 Merge branch 'dev' into 6820-changeKmroute 2024-05-22 12:53:40 +00:00
Jorge Penadés 3db3d04bc9 fix: refs #6942 formModel & CardDescriptor 2024-05-22 13:57:12 +02:00
Carlos Satorres e4ebf4c4db refs #6820 fix traduction 2024-05-22 13:44:53 +02:00
Carlos Satorres 2746ea7f5e Merge pull request 'remove right' (!389) from fix-CalendarTimeControlRightPanel into dev 
Reviewed-on: verdnatura/salix-front#389
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-22 10:56:10 +00:00
Carlos Satorres 499e104daa Merge branch 'dev' into fix-CalendarTimeControlRightPanel 2024-05-22 10:49:43 +00:00
Carlos Satorres 506b5dd9c2 refs #6820 fix error front 2024-05-22 12:24:08 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel 2024-05-22 11:22:46 +02:00
Carlos Satorres 98449b0c1e refs #6111 scroll horizontal 2024-05-22 10:23:10 +02:00
Javier Segarra d900ed3764 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 10:22:05 +02:00
Javier Segarra f6051472ef style: color transparent when is fetive 2024-05-22 10:21:06 +02:00
Jon Elias 77e3104047 Merge branch 'dev' into 6652-improveCustomerDefaulter 2024-05-22 08:10:52 +00:00
Jon Elias 2af4df8ded refactor: refs #6652 improved defaulter section 2024-05-22 10:07:58 +02:00
Carlos Satorres c1bcc0379d refs #6332 fix festive 2024-05-22 09:35:56 +02:00
Javier Segarra eaa0288f25 update 2024-05-22 09:27:48 +02:00
Jorge Penadés 467531d029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-22 09:17:18 +02:00
Javier Segarra a0ca26ad9b Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:56:10 +02:00
Javier Segarra 0e0f649ff9 fix: 9-12 2024-05-22 08:54:37 +02:00
Carlos Satorres 81f7e06143 refs #6332 fix calendar 2024-05-22 08:35:01 +02:00
Javier Segarra 3d6fac5338 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods 2024-05-22 08:28:51 +02:00
Javier Segarra 2094506baf fix: WorkerCalendarItem 2024-05-22 08:27:09 +02:00
Alex Moreno 56804900d9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-22 08:05:23 +02:00
Alex Moreno d466e9f70a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-05-22 08:05:05 +02:00
Alex Moreno f3c334b826 hotFix(VnDmsList): downloadModel default undefined 2024-05-22 08:02:59 +02:00
Javier Segarra ad328d9c51 Merge branch 'dev' into 6957_refactorFetechedTags 2024-05-22 00:00:58 +02:00
Pablo Natek d2d80645d0 fix: refs #7187 fix responsive 2024-05-21 19:12:40 +02:00
Carlos Satorres 27c86288e1 refs #6332 color red button 2024-05-21 16:14:55 +02:00
William Buezas 990e3f6e75 handle searchbar dataKey change 2024-05-21 09:13:36 -03:00
Carlos Satorres bacc07a4ca remove right 2024-05-21 12:04:56 +02:00
Carlos Satorres 99d16d215f refs #6332 colors 2024-05-21 11:56:30 +02:00
Alex Moreno a8fef3fa84 deploy: init version 2024-05-21 11:30:00 +02:00
Alex Moreno 05587ece9e Merge pull request '7430_devToTest' (!388) from 7430_devToTest into test 
Reviewed-on: verdnatura/salix-front#388
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-05-21 09:26:35 +00:00
Jorge Penadés 5f10d25630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-21 09:04:17 +02:00
Pablo Natek fe5211e14e Merge pull request '#7187 - refactorWokerPda' (!378) from 7187-refactorWokerPda into dev 
Reviewed-on: verdnatura/salix-front#378
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-21 06:35:14 +00:00
Pablo Natek e32e922c45 Merge branch 'dev' into 7187-refactorWokerPda 2024-05-20 23:06:07 +00:00
Pablo Natek 45f56078d7 feat: refs #7187 add vnconfirm on delete 2024-05-21 01:04:52 +02:00
Pablo Natek 9468e409ea fix: refs #7187 fix reload 2024-05-21 00:34:03 +02:00
William Buezas b26bf10e70 Apply searchbar logic 2024-05-20 15:53:38 -03:00
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Carlos Satorres 9f517eb59d refs #6820 fix BasicData Tickets 2024-05-20 12:40:47 +02:00
Javier Segarra febc88203d style: fix color when is empty 2024-05-20 11:16:05 +02:00
Jorge Penadés c1a6bca508 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-20 09:31:58 +02:00
Jorge Penadés cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue 2024-05-20 09:31:31 +02:00