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

5220 Commits

Author SHA1 Message Date
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
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Alex Moreno c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 07:50:41 +02:00
Alex Moreno 937f75ec63 feat(jenkinsfile): use build_id 2024-06-12 07:40:04 +02:00
Alex Moreno 048685277f Merge branch 'dev' into 6825-vnTable 2024-06-12 05:31:31 +00:00
Jon Elias 79e84175a6 Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev 
Reviewed-on: verdnatura/salix-front#436
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-12 05:05:33 +00:00
Jon Elias df364dca4a Merge branch 'dev' into 7154-ItemDescriptor 2024-06-12 05:04:16 +00:00
William Buezas 89f6873b03 WIP 2024-06-11 22:40:07 -03:00
Javier Segarra e9051f1ee8 Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev 
Reviewed-on: verdnatura/salix-front#426
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-11 19:14:29 +00:00
Javier Segarra d0759cb654 Merge branch 'dev' into feature/AccountFormsView 2024-06-11 21:12:13 +02:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors 2024-06-11 16:38:12 +02:00
Carlos Satorres a7b805a4ab stash departmentFilter 2024-06-11 16:24:07 +02:00
Alex Moreno 3dfe3226ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 15:00:52 +02:00
Alex Moreno 00da1c2808 feat: adapt tu VnTable → CrudModel 2024-06-11 15:00:43 +02:00
Alex Moreno 14e27f193e feat: adapt tu VnTable → CrudModel 2024-06-11 15:00:03 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev 
Reviewed-on: verdnatura/salix-front#432
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 12:53:42 +00:00