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

8283 Commits

Author SHA1 Message Date
Jon Elias ad64c4ea0c Merge pull request 'Hotfix: Remove params when searching by id on VnSearchbar' (!1102) from Hotfix-VnSearchbarRemoveParams into master 
Reviewed-on: verdnatura/salix-front#1102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-27 11:00:53 +00:00
PAU ROVIRA ROSALENY d4eb61116a Merge pull request 'fix: fixed translations' (!1136) from hotfix_unhandledTranslations into test 
Reviewed-on: verdnatura/salix-front#1136
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 10:55:19 +00:00
Jon Elias 93047ab179 Merge pull request '#8201: Fix descriptor icons error' (!1080) from 8201-DescriptorIcons into dev 
Reviewed-on: verdnatura/salix-front#1080
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 09:55:46 +00:00
Jon Elias fad3e49e2f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 09:55:02 +00:00
Javier Segarra 0211aeb5cf Merge pull request 'fix: discount class' (!1137) from fix_discount_class into dev 
Reviewed-on: verdnatura/salix-front#1137
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 09:49:59 +00:00
Jon Elias d73b03f757 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams 2024-12-27 09:48:39 +00:00
Javier Segarra d81daf8c66 fix: fixed translations 2024-12-27 10:42:41 +01:00
Jon Elias 0e9c342b88 Merge pull request 'Hotfix: modified VnTable bottom icon to display when no data in the table' (!1103) from Hotfix-VnTableBottomButton into master 
Reviewed-on: verdnatura/salix-front#1103
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-27 09:41:17 +00:00
Jon Elias 976b891a75 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams 2024-12-27 09:40:16 +00:00
Jon Elias a4f6974e69 Merge branch 'master' into Hotfix-VnTableBottomButton 2024-12-27 09:39:36 +00:00
Jon Elias c7f358115f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 09:39:05 +00:00
Jon Elias 894b0d3dee Merge branch '8201-DescriptorIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 8201-DescriptorIcons 2024-12-27 10:36:04 +01:00
Jon Elias de30725322 perf: refs #8201 onDataSaved fetch 2024-12-27 10:36:03 +01:00
PAU ROVIRA ROSALENY 9d89f6c5d1 fix: discount class 2024-12-27 09:24:39 +00:00
PAU ROVIRA ROSALENY 470e0cc08a fix: fixed translations 2024-12-27 10:08:28 +01:00
Javier Segarra d1fdb1777d Merge pull request 'fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component' (!1135) from 7935-dropDuplicateCol into dev 
Reviewed-on: verdnatura/salix-front#1135
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 08:23:23 +00:00
Jon Elias ceb470fc0f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 08:20:36 +00:00
Jon Elias 1ff54d7423 refactor: refs #8201 deleted condition 2024-12-27 09:18:29 +01:00
Jorge Penadés be71e66075 fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component 2024-12-26 17:59:42 +01:00
Jose Antonio Tubau 494b8440d6 Merge pull request '#7050 testCrudModel' (!1077) from 7050-testCrudModel into dev 
Reviewed-on: verdnatura/salix-front#1077
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-12-26 11:14:15 +00:00
Jose Antonio Tubau c27a7fc206 Merge branch 'dev' into 7050-testCrudModel 2024-12-26 11:13:13 +00:00
Jose Antonio Tubau 33cf755782 Merge remote-tracking branch 'origin/dev' into 7050-testCrudModel 2024-12-26 12:10:26 +01:00
Jorge Penadés 1d7927a604 Merge pull request '#7056 update route meta information and add FormModel tests' (!1122) from 7056-formModelTest into dev 
Reviewed-on: verdnatura/salix-front#1122
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-26 11:07:20 +00:00
Jorge Penadés 90500538e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7056-formModelTest 2024-12-26 12:06:00 +01:00
Jose Antonio Tubau 435d9750ca Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-26 07:43:32 +00:00
PAU ROVIRA ROSALENY bd5daa8368 Merge pull request 'feat: #7079 created VnLocation front test' (!1126) from 7079-testVnLocation into dev 
Reviewed-on: verdnatura/salix-front#1126
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-24 13:08:10 +00:00
PAU ROVIRA ROSALENY 37f16cb762 Merge branch 'dev' into 7079-testVnLocation 2024-12-24 13:07:06 +00:00
Jose Antonio Tubau 87cf722c5f Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-24 12:03:14 +00:00
Jose Antonio Tubau 638bd1dc26 refactor: refs #7050 removed blank spaces 2024-12-24 12:59:40 +01:00
Jose Antonio Tubau 790c82926b Merge pull request 'feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog()' (!1092) from 7074-makeFrontTestToVnDmsList into dev 
Reviewed-on: verdnatura/salix-front#1092
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-24 11:45:59 +00:00
Javier Segarra 9d03333e37 Merge branch 'dev' into 7074-makeFrontTestToVnDmsList 2024-12-24 12:31:24 +01:00
PAU ROVIRA ROSALENY 89acb338a9 refactor: refs #7079 removed useless code 2024-12-24 12:18:36 +01:00
PAU ROVIRA ROSALENY 7d1f25563d Merge branch 'dev' into 7079-testVnLocation 2024-12-24 11:15:29 +00:00
Alex Moreno 9c899a65e6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-24 12:04:17 +01:00
Alex Moreno 9dabe11cd0 fix(AccountList): use $refs 2024-12-24 12:02:58 +01:00
PAU ROVIRA ROSALENY 4f60544a1e Merge branch 'dev' into 7079-testVnLocation 2024-12-24 10:59:36 +00:00
Alex Moreno 774afbec06 Merge branch 'beta' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-24 11:57:39 +01:00
Alex Moreno afa4a6ac43 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta 2024-12-24 11:44:47 +01:00
Alex Moreno 14b8284e34 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-24 11:44:31 +01:00
Alex Moreno 2e4fccf8cb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-24 11:43:38 +01:00
Alex Moreno cd4d5d011e Merge pull request '8197-VnCardMain' (!1044) from 8197-VnCardMain into beta 
Reviewed-on: verdnatura/salix-front#1044
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-12-24 10:29:03 +00:00
Carlos Satorres 43af53da38 Merge pull request 'fix: ClaimList orderBy priority' (!1128) from warmfix_claimList_orderBy into test 
Reviewed-on: verdnatura/salix-front#1128
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-24 09:19:11 +00:00
Javier Segarra 17b178d9f1 fix: orderBy priority 2024-12-24 09:06:17 +00:00
Alex Moreno cfb35d23b4 perf: refs #8197 perf 2024-12-23 18:16:50 +01:00
Alex Moreno dd36b35bf7 fix: refs #8197 staticParams and redirect 2024-12-23 17:56:09 +01:00
Jorge Penadés 7ef1e49277 Merge pull request 'fix: refs #7133 handleSalesModelValue function to handle empty input' (!1116) from 7133-fixCustomerSelect into dev 
Reviewed-on: verdnatura/salix-front#1116
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-23 15:56:32 +00:00
Jorge Penadés 24d09c1841 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7133-fixCustomerSelect 2024-12-23 16:55:17 +01:00
Jose Antonio Tubau cbdfe2b2ec Merge pull request 'feat: refs #8293 addZoneToClaimList' (!1088) from 8293-addZoneToClaimList into dev 
Reviewed-on: verdnatura/salix-front#1088
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-23 14:15:52 +00:00
Jose Antonio Tubau 1cf817be17 refactor: refs #7050 refactorize 2024-12-23 15:09:14 +01:00
Jose Antonio Tubau 9a04e0d2b4 feat: refs #8266 added descriptor to item name 2024-12-23 14:50:55 +01:00