0
0
Fork 0
Commit Graph

4483 Commits

Author SHA1 Message Date
Javier Casado 103e3fe08a Merge branch 'dev' into 6911-saveOnEnter 2024-05-23 07:31:08 +00:00
Jorge Penadés c6477af493 fix: refs #6942 formModel watch changes & invoiceInCreate 2024-05-23 09:29:50 +02:00
Jon Elias 1183908942 Merge branch 'dev' into 5447-travelExtraCommunity 2024-05-23 07:28:07 +00:00
Alex Moreno c4441eed1f fix(VnTable): refs #6825 checkbox align and color 2024-05-23 09:25:28 +02:00
Carlos Satorres 6ea942bf31 refs #6111 fix merge, fix column 2024-05-23 09:24:50 +02:00
Carlos Satorres 66c841114b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList 2024-05-23 09:23:11 +02:00
Jon Elias 1558b600be refactor: refs #5447 changed warehouse filter 2024-05-23 09:20:16 +02:00
Alex Moreno 569df64d8d feat(VnTable): refs #6825 move to folder. fix checkboxs 2024-05-23 09:05:57 +02:00
Jorge Penadés c73599692b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-23 09:00:45 +02:00
Javier Segarra 433564507e Merge branch 'dev' into 7311_boilerplate_users 2024-05-23 08:53:10 +02:00
Javier Segarra 06664cc2d0 feat: newRole 2024-05-23 08:52:57 +02:00
Jon Elias 406c095ed2 Merge pull request '#6652 improved defaulter section' (!394) from 6652-improveCustomerDefaulter into dev
Reviewed-on: verdnatura/salix-front#394
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-23 06:34:59 +00:00
Jon Elias 566ef90cbe Merge branch 'dev' into 6652-improveCustomerDefaulter 2024-05-23 06:34:10 +00:00
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
Alex Moreno bcb800269e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-22 14:32:00 +02:00
Alex Moreno 4ae580543b feat(VnTable): refs #6825 execute function when create 2024-05-22 14:20:38 +02: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
William Buezas 790e69f659 WIP 2024-05-22 08:08:43 -03: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
jcasado 96719884fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-05-22 12:46:56 +02:00
Carlos Satorres 506b5dd9c2 refs #6820 fix error front 2024-05-22 12:24:08 +02:00
jcasado 4de9895b38 refs: #6911-saveOnEnter 2024-05-22 12:07:27 +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