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

5958 Commits

Author SHA1 Message Date
Javier Segarra b5dcc865e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-10 15:17:25 +02:00
Javier Segarra 622afca9be feat: CustomerSample to VnTable 2024-09-10 15:17:10 +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
Jorge Penadés a8d4457365 Merge pull request '#4074 useAcls' (!584) from 4074-useAcls into dev 
Reviewed-on: verdnatura/salix-front#584
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-10 11:50:43 +00:00
Jorge Penadés 05c91e2a29 Merge branch 'dev' into 4074-useAcls 2024-09-10 11:45:15 +00:00
Carlos Satorres 7b2545798c fix(account_privileges): fix url update 2024-09-10 12:38:09 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Javier Segarra 113ebd23a6 Merge branch 'dev' into 5938_fine_ticketAdvance 2024-09-10 09:49:23 +00: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 6d017d8c99 build: init version 2440 2024-09-10 10:33:55 +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
Jorge Penadés 5cc1d0cec4 chore: refs #7663 drop useless code 2024-09-10 10:04:40 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-10 09:41:34 +02:00
Jorge Penadés 3fafb15eb8 refactor: refs #4074 use fn 2024-09-10 09:18:57 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-10 08:59:01 +02:00
Jon Elias b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:29:51 +00:00
Jon Elias abc39633bf Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-10 08:28:49 +02:00
Jon Elias 30ffb2428e perf: refs #6346 previous changes 2024-09-10 08:28:48 +02: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
Jon Elias 6790067a89 Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:02:18 +00:00
Jon Elias e1adb1a8dd refactor: refs #6346 requested changes 2024-09-10 08:01:28 +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
Jorge Penadés f3471fe5ab fix: refs #4074 await to watch 2024-09-09 17:20:16 +02:00
Jorge Penadés f8cbb0a762 chore: refs #4074 fix tests 2024-09-09 17:10:35 +02:00
Jorge Penadés 04aa96b798 chore: refs #4074 fix tests 2024-09-09 17:01:36 +02:00
Jorge Penadés 26c7dfde35 chore: refs #4074 fix tests 2024-09-09 16:44:43 +02:00
Javier Segarra 67b2cd3a0b feat: stateGroupedFilter 2024-09-09 14:58:26 +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 bd00f86d74 chore: refs #4074 fix tests 2024-09-09 14:09:29 +02:00
Jorge Penadés ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-09 13:59:13 +02: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