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

6197 Commits

Author SHA1 Message Date
Jon Elias 4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-13 09:05:26 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02: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
Carlos Satorres 8be1833f9e refs #7155 scopeDays 2024-09-13 08:49:36 +02:00
Jon Elias 770663cc37 Merge pull request 'fix: refs #6346 fix list and create' (!404) from 6346-fixWagonModule into dev 
Reviewed-on: verdnatura/salix-front#404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 06:16:04 +00:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Jon Elias 6c4f5ef915 Merge pull request '#7500 added VnImg in EntryDms' (!565) from 7500_ChangeEntryDms into dev 
Reviewed-on: verdnatura/salix-front#565
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-13 06:11:32 +00:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-13 06:10:34 +00: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
Javier Segarra 67140e4383 Merge pull request '#6943 - Customer module migration bugs' (!705) from 6943_fix_customer_module into dev 
Reviewed-on: verdnatura/salix-front#705
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-13 05:33:51 +00:00
Javier Segarra b36f072b24 Merge branch 'dev' into 6943_fix_customer_module 2024-09-12 21:26:43 +02:00
Javier Segarra aca13d9119 fix: CustomerBillingData 2024-09-12 21:26:28 +02:00
Javier Segarra fa408dc226 fix: CustomerAddress mobile 2024-09-12 21:20:30 +02:00
Javier Segarra 6e784bb290 fix: address-create i18n 2024-09-12 21:11:51 +02:00
Javier Segarra 54fc7f6394 fix: CustomerRecovery transalate label 2024-09-12 21:10:06 +02:00
Javier Segarra 39f2deafc4 fix: CustomerCreditOpinion workerDescriptor 2024-09-12 21:08:41 +02:00
Javier Segarra 70d0132710 fix: CustomerWebPayment 2024-09-12 21:03:19 +02:00
Javier Segarra 24f4af712e fix: CustomerMandates 2024-09-12 20:59:35 +02:00
Javier Segarra 8fc7e3cfb4 fix: CustomerSamples 2024-09-12 20:43:50 +02:00
Javier Segarra a29ee42b9e fix: CustomerBasicData show id assigned 2024-09-12 20:41:50 +02: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 dcb8c5daad fix: workerDms filter workerFk 2024-09-12 13:27:28 +02:00
Jon Elias bb1eb30a25 fix: refs #7553 changed fields in order in purchase request table 2024-09-12 13:22:53 +02:00
Javier Segarra cfdfc7f531 fix: CustomerSamples 2024-09-12 13:19:37 +02:00
Jorge Penadés 44fd356d63 feat: refs #7828 useAcl & cherry pick mail data worker 2024-09-12 13:19:31 +02:00
Jon Elias b4c46dc153 refactor: refs #7553 modified ticketSummary QChips, deleted useless code 2024-09-12 13:13:56 +02:00
Jorge Penadés adb9cac360 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-12 13:11:11 +02:00
Javier Segarra ea37015ec2 Merge pull request '#5938 - Use filter grouped by id' (!706) from 5938_filterGrouped into dev 
Reviewed-on: verdnatura/salix-front#706
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-12 11:05:25 +00:00
Jon Elias b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:34:55 +02:00
Jon Elias d00a88a3f4 refactor: refs #7500 deleted useless code 2024-09-12 12:34:54 +02:00
Jon Elias be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-12 10:32:47 +00:00
Jon Elias 35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms 2024-09-12 12:31:03 +02:00
Jon Elias e5056c45c0 fix: refs #7500 fixed showing images wrongly 2024-09-12 12:31:00 +02:00
Javier Segarra 058039fd61 Merge branch 'dev' into 5938_filterGrouped 2024-09-12 10:27:36 +00:00
Javier Segarra 856d551503 Merge pull request 'Fix Call back when hasMoreData' (!707) from fix_VnTable_infiniteScroll into dev 
Reviewed-on: verdnatura/salix-front#707
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-12 10:13:57 +00:00
Javier Segarra 29bd3f0516 Merge branch 'dev' into fix_VnTable_infiniteScroll 2024-09-12 10:12:31 +00:00
Javier Segarra a3afe790b9 fix: CustomerGreuges 2024-09-12 12:00:07 +02:00
Javier Segarra c22f8f1069 fix: stop call back event hasMoreData 2024-09-12 09:57:31 +00:00
Javier Segarra c7adb91912 feat: use disableInifiniteScroll property 2024-09-12 09:56:37 +00:00
Javier Segarra 3892df250c fix: #5938 grouped filter 2024-09-12 08:53:46 +00:00
Javier Segarra 25b7569791 Merge pull request 'FIX InfiniteScroll when use VnTable' (!704) from fix_VnTable_infiniteScroll into dev 
Reviewed-on: verdnatura/salix-front#704
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-12 08:22:25 +00:00
Jon Elias 4a1f5e922c refactor: refs #7553 align ticket sale qdrawer fields 2024-09-12 10:19:21 +02:00
Jon Elias 6a5f31ff1e fix: refs #7553 fixed conflicts 2024-09-12 10:14:38 +02:00
Javier Segarra 9941975683 fix: infiniteScroll 2024-09-12 08:07:53 +00: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 1dffa8865e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-12 09:55:30 +02: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