wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
4,385 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

4385 Commits

Author SHA1 Message Date
Alex Moreno bea756d7cb feat(vnTable): reload data when change url 2024-06-14 10:53:02 +02:00
Carlos Satorres 7fccd0ae81 Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-14 10:47:03 +02:00
Alex Moreno 4f36da7598 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-14 09:25:13 +02:00
Jon Elias 5eea790dee Merge branch 'dev' into 6464-fixNegativeBases 2024-06-14 07:22:09 +00:00
Jon Elias f497d97c84 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-14 09:21:03 +02:00
Jon Elias 20ae555e14 fix: refs #6464 fix error isLoading 2024-06-14 09:21:02 +02:00
Alex Moreno 42042ea3cd fix: SkeletonTable 2024-06-14 09:19:51 +02:00
Jon Elias 64648c77f6 Merge branch 'dev' into 7566-FixCustomerSummary 2024-06-14 07:11:09 +00:00
Jorge Penadés fc54b44c7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-14 09:05:49 +02:00
Jon Elias 75a478ddc4 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-14 06:48:24 +00:00
Jon Elias b16b87fadd Merge branch '5447-travelExtraCommunity' of https://gitea.verdnatura.es/verdnatura/salix-front into 5447-travelExtraCommunity 2024-06-14 08:47:27 +02:00
Jon Elias c017493cb8 refactor: refs #5447 fixed filter if continent not selected 2024-06-14 08:47:25 +02:00
William Buezas 8c3262bcdf Add change state dropdown action 2024-06-13 15:36:30 -03:00
William Buezas 531f4bb8cd Avoid firing request if quantity does not change 2024-06-13 14:14:46 -03:00
William Buezas 975e8f06c0 WIP 2024-06-13 13:56:19 -03:00
Javier Segarra 914a9afb92 Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev 
Reviewed-on: verdnatura/salix-front#441
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-13 12:57:40 +00:00
Javier Segarra 7d73cd0e33 Merge branch 'dev' into bugfix/WorkerDepartment 2024-06-13 14:56:34 +02:00
Javier Segarra 648546888d fix: DeleteDepartment VnConfirm 2024-06-13 14:56:19 +02:00
Pablo Natek d6f085dc3d Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 13:48:44 +02:00
Pablo Natek f2dddb5e30 Merge branch 'dev' into 7129-finishRouteMigration 2024-06-13 10:45:37 +02:00
Carlos Satorres 548fc374c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-13 09:22:45 +02:00
Carlos Satorres 8c5ea42be2 Merge branch 'dev' into 6897-EntryMigration 2024-06-13 06:51:02 +00:00
Carlos Satorres 3958d5ab08 Merge branch 'dev' into 7366-travelMigration 2024-06-13 06:50:28 +00:00
Jon Elias 2b66148ff5 Merge branch 'dev' into 7566-FixCustomerSummary 2024-06-13 05:45:23 +00:00
Jon Elias fa55e33b54 fix: refs #7566 fixed summary cards and table 2024-06-13 07:43:49 +02:00
Pablo Natek 78042ab109 Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev 
Reviewed-on: verdnatura/salix-front#428
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-13 05:41:26 +00:00
Pablo Natek e10755d8fe Merge branch 'dev' into 7499-refactorEntrys 2024-06-13 05:39:13 +00:00
Javier Segarra ffd4109dc7 Merge branch 'dev' into bugfix/WorkerDepartment 2024-06-12 20:23:30 +00:00
Jorge Penadés 7393b82008 refactor: refs #6238 update getRate function and color logic 2024-06-12 16:46:14 +02:00
Jorge Penadés 19aa1bf01d fix; refs #6238 fix test 2024-06-12 14:48:31 +02:00
Carlos Satorres 6e4843563c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-12 14:42:06 +02:00
Carlos Satorres 34e92d130a refs #7366 fix basic-data 2024-06-12 14:31:18 +02:00
Carlos Satorres e464608a9f refs #7391 fix url, fix filters 2024-06-12 14:01:10 +02:00
William Buezas b0e4dc99b0 Fix worker department create modal did not open 2024-06-12 08:47:32 -03:00
Jorge Penadés 2641489d83 fix: refs #6238 use .value prop 2024-06-12 13:45:17 +02:00
Carlos Satorres f414b8aa0e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7391-defaulterFilter 2024-06-12 13:23:21 +02:00
Jorge Penadés 1052e9eb21 fix: refs #6238 use :deep 2024-06-12 13:14:02 +02:00
Jorge Penadés a4c21c7673 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-12 12:42:23 +02:00
Jorge Penadés 51d497a1de feat: refs #6238 add percentage & summary btn 2024-06-12 12:17:52 +02:00
Alex Moreno c596f68103 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 12:13:28 +02:00
Guillermo Bonet 9388cb3599 Merge branch 'test' into dev 2024-06-12 12:02:12 +02:00
Guillermo Bonet 135e05b139 hotfix: refs #6636 EN i18n 2024-06-12 12:00:43 +02:00
Guillermo Bonet 38610870ea feat: refs #7545 Deleted hasIncoterms client column 2024-06-12 11:49:36 +02:00
Javier Segarra d55c75089c Merge branch 'dev' into 7323_department_descriptor_routerLink 2024-06-12 09:28:05 +00:00
Alex Moreno c4cbd7f156 feat(VnTable): is-editable and use-model. fix: checkbox 2024-06-12 11:01:18 +02:00
Alex Moreno d7237463ea feat(WorkerFormation): is-editable and use-model 2024-06-12 11:00:10 +02:00
Javier Segarra ef24a5cd2f Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev 
Reviewed-on: verdnatura/salix-front#437
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-12 07:33:27 +00:00
Javier Segarra 11c0154c48 Merge branch 'dev' into 7323_fix_workerTimeControl 2024-06-12 07:31:51 +00:00
Alex Moreno 11d1fdd80e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-12 08:41:03 +02:00
Alex Moreno 6a19687066 Merge pull request 'feat(jenkinsfile): use build_id' (!438) from jenkinsFile_useBuildIdInVersion into master 
Reviewed-on: verdnatura/salix-front#438
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-06-12 06:21:36 +00:00