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

5949 Commits

Author SHA1 Message Date
Alex Moreno cba8647ac2 Merge pull request 'feat(AccountBasicData): add twoFactorFk' (!689) from 7792-accountBasicData_twoFactorFk into dev 
Reviewed-on: verdnatura/salix-front#689
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-09-18 10:41:56 +00:00
Alex Moreno 8abd375985 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk 2024-09-18 10:14:54 +02:00
Alex Moreno 21a7fafba5 feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData 2024-09-18 09:57:21 +02:00
Javier Segarra 9d210ace84 Merge pull request 'fix: SupplierFiscalData VnLocation' (!725) from fix_supplierFD_location into dev 
Reviewed-on: verdnatura/salix-front#725
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-18 07:54:42 +00:00
Javier Segarra aa6dac3944 fix: SupplierFiscalData VnLocation 2024-09-18 07:28:10 +00:00
Alex Moreno f1759eca04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk 2024-09-18 08:23:25 +02:00
Alex Moreno fb1a94604b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-18 08:20:45 +02:00
Carlos Satorres 4f662375cd fix(VnTable): sanitizer value is defined 2024-09-17 15:04:58 +02:00
Pablo Natek 6886c18ddc Merge pull request '7404-stockBought' (!593) from 7404-stockBought into dev 
Reviewed-on: verdnatura/salix-front#593
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-17 11:55:41 +00:00
Pablo Natek cead2c2b5e Merge branch 'dev' into 7404-stockBought 2024-09-17 11:40:42 +00:00
Pablo Natek e559ab43d7 fix: refs #7404 remove some style 2024-09-17 13:40:27 +02:00
Jon Elias 162c7858ff Merge pull request '#6346 Wagons to VnTable' (!717) from 6346-WagonTypeToCard into dev 
Reviewed-on: verdnatura/salix-front#717
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-17 09:09:50 +00:00
Jon Elias 58cd0b54cf Merge branch 'dev' into 6346-WagonTypeToCard 2024-09-17 09:08:00 +00:00
Carlos Satorres 3b59dc7fb5 Merge pull request 'hotfix searchbar' (!723) from hotfix-invoiceOutSearchbar into master 
Reviewed-on: verdnatura/salix-front#723
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-17 08:38:28 +00:00
Carlos Satorres 044156356c hotfix searchbar 2024-09-17 10:37:22 +02:00
Javier Segarra 907e6dbf4f Merge pull request '#7677 - Improve VnLocation' (!563) from 7677_vnLocation_perf into dev 
Reviewed-on: verdnatura/salix-front#563
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-17 08:29:23 +00:00
Alex Moreno 3d6e9f9600 Merge pull request 'fix(itemDescriptor): fix redirection to itemDiary' (!722) from hotFix_itemDiary_redirect_2 into master 
Reviewed-on: verdnatura/salix-front#722
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-09-17 08:25:36 +00:00
Alex Moreno 3d1bb0c67a fix(itemDescriptor): fix redirection to itemDiary 2024-09-17 10:20:44 +02:00
Pablo Natek 7faa0c240f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-17 10:10:40 +02:00
Alex Moreno 198c47f0c9 Merge pull request 'fix(itemDescriptor): fix redirection to itemDiary' (!721) from hotFix_itemDiary_redirect into master 
Reviewed-on: verdnatura/salix-front#721
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-09-17 07:37:01 +00:00
Javier Segarra e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 07:29:00 +00:00
Alex Moreno 37b6a03288 fix(itemDescriptor): fix redirection to itemDiary 2024-09-17 09:25:53 +02:00
Alex Moreno 07010548bf Merge pull request '7983-testToMaster_2438' (!718) from 7983-testToMaster_2438 into master 
Reviewed-on: verdnatura/salix-front#718
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-09-17 05:39:38 +00:00
Alex Moreno dc047435f5 chore: changelog 2024-09-16 15:17:31 +02:00
Alex Moreno 09cdd2f7e7 chore: changelog 2024-09-16 15:17:05 +02:00
Alex Moreno b4cee6b02f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 14:24:22 +02:00
Javier Segarra af4756d810 Merge pull request '#7017 Show FormModel Validations' (!469) from 7017_formModel_validations into dev 
Reviewed-on: verdnatura/salix-front#469
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-16 12:11:52 +00:00
Javier Segarra 603fb1de71 Merge branch 'dev' into 7017_formModel_validations 2024-09-16 11:58:15 +00:00
Jon Elias cb87f4dce1 Merge branch 'dev' into 6346-WagonTypeToCard 2024-09-16 11:04:29 +00:00
Jon Elias ae76bd0b0e refactor: refs #6346 wagons to VnTable 2024-09-16 12:58:06 +02:00
Jorge Penadés 3c14d94bf1 Merge pull request '#7828 makeCorrectCalls' (!703) from 7828-makeCorrectCalls into dev 
Reviewed-on: verdnatura/salix-front#703
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-16 10:26:53 +00:00
Jorge Penadés 8577f33599 Merge branch 'dev' into 7828-makeCorrectCalls 2024-09-16 10:24:45 +00:00
Pablo Natek 263dc29d7a fix: refs #7404 remove console.log 2024-09-16 12:19:03 +02:00
Jon Elias e6278d51eb Merge pull request 'fix: refs #7500 fixed e2e test' (!712) from Hotfix-FixEntryDmsTest into dev 
Reviewed-on: verdnatura/salix-front#712
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-16 10:17:33 +00:00
Alex Moreno a2f9178832 Merge pull request 'fix(ClaimList): fix summary' (!716) from warmFix_ClaimList_popup into test 
Reviewed-on: verdnatura/salix-front#716
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-16 08:06:22 +00:00
Alex Moreno 4c8238455f fix(ClaimList): fix summary 2024-09-16 10:03:12 +02:00
Alex Moreno 5c3c511568 Merge pull request 'fix(VnSectionMain): add QPage' (!715) from warmFix_VnSectionMain_add_QPage into test 
Reviewed-on: verdnatura/salix-front#715
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-16 07:30:38 +00:00
Alex Moreno 8c4e4a16af fix(VnSectionMain): add QPage 2024-09-16 09:19:08 +02:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-16 08:59:46 +02:00
Pablo Natek deb30ee955 feat: refs #7404 travel m3 form 2024-09-16 08:59:36 +02:00
Jon Elias c08167c5a9 Merge branch 'dev' into Hotfix-FixEntryDmsTest 2024-09-16 06:20:36 +00:00
Guillermo Bonet 07e45f2051 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 07:17:38 +02:00
Guillermo Bonet 57b939bdd5 Merge branch 'test' into dev 2024-09-16 07:17:25 +02:00
Guillermo Bonet b6ee1ac2bc Merge branch 'master' into test 2024-09-16 07:17:12 +02:00
Guillermo Bonet fd3b09f6f0 Merge pull request 'feat: refs #7644 Icon' (!713) from 7644-updateInPrint into master 
Reviewed-on: verdnatura/salix-front#713
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-16 05:11:36 +00:00
Javier Segarra 93488a5750 fix: styles 2024-09-13 23:19:16 +02:00
Javier Segarra b6cce74449 fix: merge conflicts 2024-09-13 23:11:18 +02:00
Javier Segarra 401400bdcf fix: remove FetchData 2024-09-13 22:52:26 +02:00
Javier Segarra ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations 2024-09-13 22:50:13 +02:00
Javier Segarra 8ce082d841 Merge pull request '#7671 - Improve/FIX ItemFixedPrice' (!714) from 7671_dense_itemFixedPrices into dev 
Reviewed-on: verdnatura/salix-front#714
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-13 20:44:29 +00:00