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

4829 Commits

Author SHA1 Message Date
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
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 b4cee6b02f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 14:24:22 +02: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 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
Alex Moreno 4c8238455f fix(ClaimList): fix summary 2024-09-16 10:03:12 +02: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
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
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 9c36a113e1 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-13 20:17:01 +00:00
Javier Segarra 6e6af0af80 perf: improve style 2024-09-13 15:16:40 +02:00
Guillermo Bonet eca34e2c0f feat: refs #7644 Icon 2024-09-13 14:57:33 +02:00
Jon Elias 6f9e46f7a0 fix: refs #7553 deleted log 2024-09-13 13:01:07 +02:00
Carlos Satorres 842fb9de5f refs #7155 scopeDays fix 2024-09-13 12:52:25 +02:00
Jon Elias c291ea267c refactor: refs #7553 added clickable event in transfer sales like Salix 2024-09-13 12:07:45 +02:00
Jorge Penadés 48a5c15b9d feat: refs #7828 create axios instance which no manage errors 2024-09-13 10:54:09 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Jorge Penadés 46fb7d0c73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls 2024-09-13 09:20:14 +02:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar 2024-09-13 07:19:42 +00:00
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 ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Jon Elias eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms 2024-09-13 06:10:34 +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 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
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 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
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 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 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 9d055a48c4 Merge branch 'dev' into 7792-accountBasicData_twoFactorFk 2024-09-12 07:29:47 +00:00
Jorge Penadés 6b79d70551 refactor: refs #7828 wip 2024-09-12 09:14:55 +02:00
Alex Moreno d822bb6f20 fix(ClaimList): attenderFk filter 2024-09-12 09:12:36 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Alex Moreno 4a234dd875 fix: duplicate code 2024-09-12 08:31:57 +02:00
Alex Moreno 8bf7b729d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-12 08:26:10 +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 18fc5e241c fix: refs #7903 fixed ticket's search bar and keybinding tooltip 2024-09-11 14:07:31 +02:00
Javier Segarra 8d96539b24 perf: solve reload CardSummary component 2024-09-11 13:18:54 +02:00
Javier Segarra c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-11 12:48:38 +02:00
Javier Segarra f02ca7437c Merge branch 'dev' into 6156-advanceTicketsNewField 2024-09-11 10:27:12 +00:00
Jorge Penadés 9219fa07f5 fix: refs #7353 hide search param 2024-09-11 11:23:14 +02:00
Jon Elias 422907447b refactor: refs #7553 merge conflicts 2024-09-11 10:27:08 +02:00
Jon Elias d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-11 10:26:52 +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
Jon Elias ff7bcfb00a refactor: refs #7553 modified ticket sale to create a row in the table 2024-09-11 10:16:42 +02:00
Jorge Penadés 2b012d2de4 fix: refs #7353 use same datakey 2024-09-11 10:04:40 +02:00
Jorge Penadés 2d5602e784 Merge branch 'dev' into 7663-setWeight 2024-09-11 07:40:36 +00:00
Alex Moreno e2d3154878 fix(ClaimLines): not reload when change quantity 2024-09-11 09:21:30 +02:00
Javier Segarra 2d8322c6da fix: remove FIXME 2024-09-11 09:20:54 +02:00
Jorge Penadés 49f90801a8 Merge branch 'test' into 6772-warmfix-fixE2e 2024-09-11 07:09:46 +00:00
Javier Segarra 19eb770893 feat: remove cli warnings 2024-09-11 08:41:16 +02:00
Alex Moreno 97da106522 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:33:25 +02:00
Alex Moreno e7fb6a7963 hotFix: keyBinding toUpperCase if is null 2024-09-11 08:32:59 +02:00
Javier Segarra b2535dedcf Merge branch 'dev' into 5938_fine_ticketAdvance 2024-09-11 06:29:27 +00:00
Pablo Natek c7e717c611 feat: refs #7404 add travel m3 to reserves form 2024-09-11 07:55:12 +02:00
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