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

5741 Commits

Author SHA1 Message Date
Alex Moreno 368e013f54 Merge branch 'master' into hotFix_claimList_attenderFk 2024-09-12 07:59:16 +00:00
Jorge Penadés e10ab5863a Merge pull request 'fix: refs #7323 show user name' (!701) from 7323-hotfix-showUserName into master 
Reviewed-on: verdnatura/salix-front#701
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-09-12 07:44:15 +00:00
Jorge Penadés 59f6913a74 fix: refs #7323 add correct label 2024-09-12 09:43:08 +02:00
Jorge Penadés d92659289b fix: refs #7323 add correct label 2024-09-12 09:41:29 +02:00
Jorge Penadés 22bc8f2414 fix: refs #7323 show user name 2024-09-12 09:33:06 +02:00
Alex Moreno d822bb6f20 fix(ClaimList): attenderFk filter 2024-09-12 09:12:36 +02:00
Alex Moreno 8d04d50a13 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-12 08:26:01 +02:00
Jon Elias 05f770e469 Merge pull request '#7903 Warmfix: fixed ticket's search bar and keybinding tooltip' (!699) from 7903-WarmfixTicketSearchbar into test 
Reviewed-on: verdnatura/salix-front#699
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-12 04:41:21 +00:00
Jon Elias 18fc5e241c fix: refs #7903 fixed ticket's search bar and keybinding tooltip 2024-09-11 14:07:31 +02:00
Carlos Satorres 98056b2bcb Merge pull request 'refs #7962 fix claimSummary' (!698) from 7962-hotfixClaimLines into master 
Reviewed-on: verdnatura/salix-front#698
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-11 09:34:32 +00:00
Jorge Penadés 9219fa07f5 fix: refs #7353 hide search param 2024-09-11 11:23:14 +02:00
Carlos Satorres 1c9e13fe15 refs #7962 fix claimSummary 2024-09-11 10:23:27 +02:00
Jorge Penadés b559f2f18c refactor: refs #7353 use global locales 2024-09-11 10:18:11 +02:00
Jorge Penadés 2b012d2de4 fix: refs #7353 use same datakey 2024-09-11 10:04:40 +02:00
Alex Moreno b9c721728f Merge pull request 'fix(ClaimLines): not reload when change quantity' (!696) from hotFix_claimLine_noReload into master 
Reviewed-on: verdnatura/salix-front#696
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-09-11 07:31:31 +00:00
Alex Moreno e2d3154878 fix(ClaimLines): not reload when change quantity 2024-09-11 09:21:30 +02:00
Jorge Penadés 568fd9ae1a Merge pull request '#6772 warmfix fix e2e' (!695) from 6772-warmfix-fixE2e into test 
Reviewed-on: verdnatura/salix-front#695
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-11 07:12:34 +00:00
Jorge Penadés 49f90801a8 Merge branch 'test' into 6772-warmfix-fixE2e 2024-09-11 07:09:46 +00:00
Alex Moreno 97da106522 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:33:25 +02:00
Jorge Penadés a41143b410 chore: refs #6772 fix e2e 2024-09-10 14:43:35 +02:00
Jorge Penadés 77f2a4d825 fix: refs #6900 rollback 2024-09-10 14:36:44 +02:00
Jorge Penadés 070c9ca25f fix: refs #6900 e2e error 2024-09-10 14:17:59 +02:00
Carlos Satorres 7b2545798c fix(account_privileges): fix url update 2024-09-10 12:38:09 +02:00
Carlos Satorres 1ba66bcba2 Merge pull request 'hotfix cau #218919 accountPrivileges fix' (!694) from hotfix218919-accountPrivilegesFix into master 
Reviewed-on: verdnatura/salix-front#694
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-10 08:40:02 +00:00
Carlos Satorres 8c57bca4e0 hotfix cau #218919 accountPrivileges fix 2024-09-10 10:36:41 +02:00
Alex Moreno 1094daf530 Merge pull request '7953-devToTest_2438' (!693) from 7953-devToTest_2438 into test 
Reviewed-on: verdnatura/salix-front#693
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-09-10 08:31:28 +00:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-10 08:13:56 +02:00
Alex Moreno cc6e898830 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-10 08:11:25 +02:00
Javier Segarra f4f8e83fea Merge pull request '#7671 - Fix minor bugs ItemFixedPrices' (!692) from 7671_dense_itemFixedPrices into dev 
Reviewed-on: verdnatura/salix-front#692
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-10 05:19:47 +00:00
Javier Segarra d347a81d74 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-10 05:19:02 +00:00
Jon Elias 24426c5d38 Merge pull request 'feat: refs #7889 added shortcuts to modules' (!682) from 7889-KeyShortcuts into dev 
Reviewed-on: verdnatura/salix-front#682
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-10 04:46:52 +00:00
Jon Elias 4786a0e277 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-10 04:45:24 +00:00
Javier Segarra 7e74123459 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-10 00:18:12 +02:00
Javier Segarra d734674eb6 fix: minor changes 2024-09-10 00:18:09 +02:00
Javier Segarra b4b65ad0fd fix: minor error whit dates 2024-09-10 00:17:59 +02:00
Javier Segarra 41939315be style: show subName value 2024-09-10 00:17:39 +02:00
Javier Segarra 9c86fd0ed5 perf: order by 2024-09-10 00:17:13 +02:00
Javier Segarra 7358dab1d0 fix: call upsert when crudModel haschanges 2024-09-10 00:16:01 +02:00
Javier Segarra eed844aeb5 Merge pull request '#7671 - ItemFixedPrices dense rows' (!527) from 7671_dense_itemFixedPrices into dev 
Reviewed-on: verdnatura/salix-front#527
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-09 12:33:11 +00:00
Javier Segarra b3f305a3fd Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-09 12:17:59 +00:00
Jorge Penadés 7fe5923ee2 Merge pull request 'fix: refs #7909 add originFk' (!691) from 7909-hotfix-rollbackScroll into master 
Reviewed-on: verdnatura/salix-front#691
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-09 11:44:40 +00:00
Jorge Penadés ac421344d0 fix: refs #7909 add originFk 2024-09-09 13:41:04 +02:00
Jorge Penadés 28b4bac761 Merge branch '7909-hotfix-rollbackScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-rollbackScroll 2024-09-09 13:38:51 +02:00
Jorge Penadés 803c02b80d fix: refs #7909 rollback scroll 2024-09-09 13:38:27 +02:00
Javi Gallego 7c22a5d0ac feat: fix refund parameters 2024-09-09 13:18:51 +02:00
Jorge Penadés 9506ed695b fix: refs #7909 rollback scroll 2024-09-09 13:17:38 +02:00
Jorge Penadés 132501e4a4 Merge pull request 'feat: refs #7909 add scroll' (!659) from 7909-hotfix-addScroll into master 
Reviewed-on: verdnatura/salix-front#659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-09 11:11:26 +00:00
Alex Moreno 9e94cb2d36 Merge pull request 'feat(AccountConnections): use VnToken' (!471) from 7547-accessToken-security into dev 
Reviewed-on: verdnatura/salix-front#471
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-09-09 11:05:07 +00:00
Jorge Penadés 6f2018271e Merge branch '7909-hotfix-addScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:04:11 +02:00
Jorge Penadés 5ce3ef8bea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:03:39 +02:00