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

6190 Commits

Author SHA1 Message Date
Carlos Satorres 6c78fb1bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-09 12:06:01 +02:00
Carlos Satorres 3004d77d34 refs #7283 fix ItemDescriptor warehouse 2024-09-09 12:05:08 +02:00
Jorge Penadés 803ce3b909 refactor: refs #4074 rollback 2024-09-09 11:53:59 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router 2024-09-09 11:35:49 +02:00
Jon Elias e702e9d1a1 Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:48 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Jorge Penadés bef9b05b45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-09 10:03:51 +02:00
Jon Elias 5f546a47bf Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-09 08:02:17 +00:00
Alex Moreno 684215fc46 feat(AccountBasicData): add twoFactorFk 2024-09-09 09:59:22 +02:00
Jon Elias 6a96b252b4 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 07:47:40 +00:00
Jon Elias 2bd80b2ee7 perf: refs #7889 perf shortcut test 2024-09-09 09:45:30 +02:00
Jorge Penadés b4ef1e297a Merge pull request 'refactor: refs #7323 drop useless code' (!687) from 7323-fixWorkerDescritor into dev 
Reviewed-on: verdnatura/salix-front#687
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-09 07:05:08 +00:00
Jon Elias de08ae81a3 Merge branch '7889-KeyShortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889-KeyShortcuts 2024-09-09 08:47:47 +02:00
Jon Elias ba7497f055 fix: refs #7889 fixed shortcut test 2024-09-09 08:47:44 +02:00
Jon Elias 0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems 2024-09-09 08:14:53 +02:00
Jon Elias 94ae74ca7f Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-09 08:10:06 +02:00
Jon Elias 4630496361 refactor: refs #7553 changed fields in ticket component & ticket filter 2024-09-09 08:10:05 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 05:30:14 +00:00
Jon Elias b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-09 05:27:53 +00:00
Javier Segarra 6de4d5f123 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-08 12:56:47 +02:00
Javier Segarra 53e6c67ff9 perf: minor clean code 2024-09-08 12:56:40 +02:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-08 07:54:26 +02:00
Javier Segarra 754f047943 perf: order components 2024-09-07 21:55:08 +02:00
Javier Segarra 0c1cd47d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-07 16:38:06 +02:00
Jorge Penadés 18c952c0fc refactor: refs #7323 drop useless code 2024-09-06 17:51:13 +02:00
Jorge Penadés b87e7ce750 refactor: refs #4074 use VnTitle 2024-09-06 17:01:23 +02:00
Jorge Penadés d0131dd552 fix: refs #4074 drop wrong acl 2024-09-06 15:52:06 +02:00
Jorge Penadés 3693ba0c99 feat: refs #4074 drop useless code 2024-09-06 15:37:33 +02:00
Javier Segarra a5bbc4c9d2 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-06 13:04:14 +00:00
Carlos Satorres 27f25f611f refs #7283 fix ItemDescriptor warehouse 2024-09-06 14:57:10 +02:00
Javier Segarra 3276548f88 fix: editTableOptions 2024-09-06 14:47:29 +02:00
Javier Segarra 31b8088b5f perf: improve ItemFixedPricefilterPanel 2024-09-06 14:41:38 +02:00
Jorge Penadés 86e1396da4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 14:23:04 +02:00
Javier Segarra a8057b47dc feat: updates 2024-09-06 14:06:30 +02:00
Jon Elias 4636e2f2e6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:05:07 +00:00
Jorge Penadés 1f8ebf0127 Merge pull request 'chore: refs #7323 worker changes' (!681) from 7323-fetchFromScope into dev 
Reviewed-on: verdnatura/salix-front#681
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-06 12:03:24 +00:00
Jorge Penadés 635cc94652 Merge branch 'dev' into 7323-fetchFromScope 2024-09-06 12:01:24 +00:00
Jon Elias 04f4521a59 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-06 12:00:41 +00:00
Jon Elias 0e5607d685 feat: refs #7553 ticket component to vntable and fixed minor errors 2024-09-06 13:59:50 +02:00
Jorge Penadés 34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-06 13:23:02 +02:00
Jorge Penadés 40c401e72c Merge branch 'master' into 7909-hotfix-addScroll 2024-09-06 11:19:04 +00:00
Jorge Penadés f073573b57 Merge pull request '#7847 drop reloadBtn' (!686) from 7847-fixCheckboxFilter into dev 
Reviewed-on: verdnatura/salix-front#686
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-06 11:15:58 +00:00
Javier Segarra 9bb298bbeb feat: handle create row 2024-09-06 13:14:46 +02:00
Jorge Penadés 2f7dd3c22e feat: refs #7847 remove reload fn 2024-09-06 12:49:33 +02:00
Jorge Penadés 64752bbace feat: refs #7847 remove reload btn 2024-09-06 12:44:20 +02:00
Jorge Penadés 6f98f24926 chore: refs #7663 add test 2024-09-06 11:55:39 +02:00
Jorge Penadés b13874e8a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-06 11:30:24 +02:00
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jorge Penadés 42a2d9124e Merge pull request 'hotfix dynamic fetch' (!683) from hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#683
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-06 08:02:17 +00:00