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

6190 Commits

Author SHA1 Message Date
Javier Segarra cf95cd7db7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module 2024-09-16 13:33:28 +02:00
Javier Segarra 6ffd985575 perf: CustomerBasicData.salesPersonFk 2024-09-16 13:33:07 +02: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
Javier Segarra eb8690a422 fix: remove promise execution 2024-09-16 10:30:04 +00:00
Javier Segarra d384894bf0 fix: rule 2024-09-16 10:29:36 +00: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
Javier Segarra 27069e56b8 Merge branch 'dev' into 6943_fix_customer_module 2024-09-16 10:11:29 +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
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
Jon Elias 0f604ea8b5 fix: refs #7500 fixed e2e test 2024-09-13 11:34: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 a56dc7aa08 test: fix test 2024-09-13 10:33:08 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Jorge Penadés 58be11df04 chore: refs #7828 fix e2e 2024-09-13 10:13:03 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Javier Segarra a5ea940dd8 fix: Customer module find salesPersons out of first get 2024-09-13 09:23:15 +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 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 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