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

3029 Commits

Author SHA1 Message Date
jcasado d8d805a0ca refs #6911 changesSaveOnEnter 2024-04-30 08:16:31 +02:00
Alex Moreno 34797450af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-30 07:59:14 +02:00
Alex Moreno 6a03038c3a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-30 07:58:56 +02:00
Alex Moreno 2dfb2300a2 hotFix: refs #6336 fix vnLog user?.id 2024-04-30 07:51:22 +02:00
Alex Moreno 0abc31d96d Merge pull request 'feat: refs #6336 v4' (!334) from 6336-claims_v4 into dev 
Reviewed-on: verdnatura/salix-front#334
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-04-30 05:38:37 +00:00
Alex Moreno 8390a8b7b0 Merge branch 'dev' into 6336-claims_v4 2024-04-30 05:37:46 +00:00
William Buezas ccac3a54f9 move translations 2024-04-29 17:39:37 -03:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
William Buezas 1b619055eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary 2024-04-29 10:32:53 -03:00
Javier Segarra 4be559bbe8 fix: hansChanges to false 2024-04-29 15:16:37 +02:00
William Buezas 0b5aea76d9 Move translations 2024-04-29 09:39:04 -03:00
William Buezas bd5bf2419b Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily 2024-04-29 08:23:50 -03:00
William Buezas 6276c433d1 Fix exprBuilder 2024-04-29 08:23:29 -03:00
Javier Segarra a5d6ca447b fix: TicketSummary.packages label 2024-04-29 12:12:20 +02:00
Javier Segarra b3aaf35c6a Merge branch 'dev' into 6887-endClaimMigration 2024-04-29 09:58:26 +00:00
Javier Segarra f713b830ee Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily 2024-04-29 11:47:02 +02:00
Javier Segarra e01b988ee8 Merge branch 'dev' into feature/ItemFamily 2024-04-29 11:46:56 +02:00
Javier Segarra 761bc7724f fix: redirect 2024-04-29 11:46:40 +02:00
Javier Segarra 0fff6cd446 perf: VnCard 2024-04-29 11:46:33 +02:00
Javier Segarra 7e2ec588c5 fix: remove Warning 2024-04-29 11:24:20 +02:00
Javier Segarra 2f55272df7 fix: WorkerDescriptor 2024-04-29 11:23:50 +02:00
Alex Moreno b71aeb1d07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-29 10:39:44 +02:00
Alex Moreno 5378ed6f2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-29 10:34:48 +02:00
Javier Segarra 1e23666943 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-29 08:33:53 +00:00
Javier Segarra 6c69c44dfd remove comment 2024-04-29 08:33:38 +00:00
Alex Moreno 806f3a13d5 fix(claimLines): refs #6336 fix total calc 2024-04-29 10:33:32 +02:00
Javier Segarra 0e66f08674 Merge branch 'dev' into feature/ItemFamily 2024-04-29 10:22:03 +02:00
Javier Segarra 34c8874468 fix: i18n 2024-04-29 10:17:18 +02:00
Javier Segarra 8c3d32ec86 fix: remove VnFilterPanel inside Summary 2024-04-29 10:12:50 +02:00
Javier Segarra bdc5d7210f fix: remove redirect 2024-04-29 10:12:37 +02:00
Javier Segarra 19fcacebc9 perf: VnSearchbar 2024-04-29 10:12:19 +02:00
Jon Elias b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration 2024-04-29 07:51:16 +00:00
Carlos Satorres abd1f72340 Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-29 09:49:32 +02:00
Carlos Satorres a78c920ec8 refs #7172 fix VnSelect 2024-04-29 09:49:29 +02:00
Jon Elias 6ae38d2611 refactor: refs #6887 pending claim changes 2024-04-29 09:49:06 +02:00
jcasado c4748cc9b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-04-29 09:42:09 +02:00
Carlos Satorres 76a1227c0e Merge branch 'dev' into 7172-fixClaimBasicData 2024-04-29 07:38:59 +00:00
Carlos Satorres e3237ee4f1 refs #7172 refact VnSelect 2024-04-29 09:35:57 +02:00
Alex Moreno 8b55044891 feat: refs #6336 add ItemDescriptor 2024-04-29 08:56:35 +02:00
Javier Casado e757fff4dd Merge pull request 'refs #6641 add checkbox' (!283) from 6641-myTeamFilterClaim into dev 
Reviewed-on: verdnatura/salix-front#283
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 06:49:07 +00:00
Javier Casado fe22fb26fb Merge branch 'dev' into 6641-myTeamFilterClaim 2024-04-29 06:47:55 +00:00
Javier Segarra 1c435725f2 Merge branch 'dev' into feature/ItemFamily 2024-04-29 08:23:11 +02:00
Javier Segarra 9a840c9cee Merge branch 'dev' into feature/ItemFamily 2024-04-29 06:03:50 +00:00
Javier Segarra 4d0b9707cf Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev 
Reviewed-on: verdnatura/salix-front#324
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 06:02:41 +00:00
Javier Segarra f83ef4eb4c Merge branch 'dev' into feature/ItemListFilter 2024-04-29 06:02:02 +00:00
Alex Moreno fdd088955b Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev 
Reviewed-on: verdnatura/salix-front#333
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-29 05:24:59 +00:00
William Buezas 322ad816b9 item diary 2024-04-28 19:37:44 -03:00
Javier Segarra 1e1c88e55c fix: reset fieldFilter.value when change model 2024-04-26 21:05:45 +02:00
William Buezas ce55109dd3 fix more fields label when selected 2024-04-26 15:41:03 -03:00
William Buezas 4282463e51 Fill filter fields with user params 2024-04-26 14:29:11 -03:00