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

5771 Commits

Author SHA1 Message Date
Jorge Penadés aa33e42701 Merge pull request 'fix: refs #7353 sales person filter and locale' (!724) from 7353-hotfix-fixFilter into master 
Reviewed-on: verdnatura/salix-front#724
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-18 07:19:45 +00:00
Jorge Penadés eb6f12ae3b fix: refs #7353 rollback 2024-09-17 12:58:06 +02:00
Jorge Penadés ed4a4e1e59 fix: refs #7353 rollback 2024-09-17 12:57:43 +02:00
Jorge Penadés 2cb2ce16ef fix: refs #7353 locale 2024-09-17 12:56:50 +02:00
Jorge Penadés 3f03f0d4e9 fix: refs #7353 show unremovable params 2024-09-17 12:41:57 +02:00
Jorge Penadés 4edcff41f1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixFilter 2024-09-17 11:39:07 +02:00
Jorge Penadés 56f8cbe615 fix: refs #7353 sales person filter and locale 2024-09-17 11:37:44 +02: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
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
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
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 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
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
Guillermo Bonet eca34e2c0f feat: refs #7644 Icon 2024-09-13 14:57:33 +02:00
Jorge Penadés 9d63bd1f02 Merge pull request '#7353 warmfix-fixSearchbar' (!697) from 7353-warmfix-fixSearchbar into test 
Reviewed-on: verdnatura/salix-front#697
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 07:22:43 +00:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar 2024-09-13 07:19:42 +00:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Alex Moreno 6703511ce9 Merge pull request 'fix: refs #7524 dynamic load' (!709) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#709
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 05:59:29 +00:00
Jorge Penadés 5907fedcd6 fix: refs #7524 test 2024-09-12 17:49:59 +02:00
Jorge Penadés 6adcaff5d8 fix: refs #7524 dynamic load 2024-09-12 16:48:39 +02:00
Alex Moreno ccbd6fad19 Merge pull request 'fix(ClaimList): attenderFk filter' (!700) from hotFix_claimList_attenderFk into master 
Reviewed-on: verdnatura/salix-front#700
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-09-12 08:04:04 +00:00
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