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

3926 Commits

Author SHA1 Message Date
Javier Segarra cabee09052 Merge branch 'feature/UpcomingDeliveries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/UpcomingDeliveries 2024-05-24 08:13:40 +02:00
Javier Segarra 286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-24 08:13:37 +02:00
Alex Moreno f12c9d5a9e refactor: add flat 2024-05-24 07:55:54 +02:00
Jorge Penadés 75c2800e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-23 16:49:18 +02:00
Jorge Penadés b6638e3545 refactor: refs #6942 use router hook 2024-05-23 16:48:50 +02:00
Carlos Satorres a603f37144 refs #7391 fix textarea 2024-05-23 15:54:57 +02:00
Jon Elias b7fe50ba1d Merge branch 'dev' into 6739-invoiceOut 2024-05-23 13:08:56 +00:00
Jon Elias f0b1919157 refactor: refs #6739 deleted useless const 2024-05-23 15:08:03 +02:00
Jon Elias 08ac9c5931 Merge branch '6739-invoiceOut' of https://gitea.verdnatura.es/verdnatura/salix-front into 6739-invoiceOut 2024-05-23 15:06:58 +02:00
Jon Elias d73b5b6f4c refactor: refs #6739 changed router.push 2024-05-23 15:06:57 +02:00
Carlos Satorres 4bf4d754a2 Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev 
Reviewed-on: verdnatura/salix-front#264
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-23 12:48:28 +00:00
Carlos Satorres 6388f08ffb Merge branch 'dev' into 6111-modsRouteList 2024-05-23 12:47:38 +00:00
Pablo Natek 92c7109290 Merge pull request 'fix: refs #7187 fix responsive' (!393) from 7187-fix-workerPda into test 
Reviewed-on: verdnatura/salix-front#393
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-23 12:43:34 +00:00
Pablo Natek 0896ae24d2 Merge branch 'test' into 7187-fix-workerPda 2024-05-23 12:42:54 +00:00
Carlos Satorres 0dfd00dbfc Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev 
Reviewed-on: verdnatura/salix-front#391
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-23 12:39:51 +00:00
Carlos Satorres bfdd319366 Merge branch 'dev' into 6332-calendarMods 2024-05-23 12:36:36 +00:00
Pablo Natek 410012df55 fix: refs #7187 fix div 2024-05-23 14:24:58 +02:00
Jorge Penadés d153cc9c24 fix: refs #6942 unit tests 2024-05-23 14:19:39 +02:00
Jorge Penadés 4a6d09ae2c feat: refs #6942 use correct currency in InvoiceIn components 2024-05-23 14:04:35 +02:00
Javier Segarra 889263bfb8 feat: roleCreate as dialog 2024-05-23 13:47:14 +02:00
Carlos Satorres 8b8033cb3d refs #6095 remove limit 2024-05-23 13:21:54 +02:00
Jon Elias 68213721a7 feat: refs #7003 new data order in section 2024-05-23 13:09:11 +02:00
Jorge Penadés e8fed46dd1 fix: refs #6942 cardDescriptor use store if its popup or different source data 2024-05-23 12:33:13 +02:00
Carlos Satorres 74f25f54ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search 2024-05-23 11:55:49 +02:00
Jorge Penadés af32c4b79c fix: refs #6942 drop console 2024-05-23 11:24:29 +02:00
Carlos Satorres 2432a37211 refs #6111 fix sticky 2024-05-23 10:26:54 +02:00
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
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
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
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