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

3034 Commits

Author SHA1 Message Date
Javier Segarra 1907301852 Merge branch 'dev' into 6321_negative_tickets 2024-05-02 12:48:45 +02:00
Javier Segarra c81e20e22e Merge pull request 'Item diary' (!339) from hyervoni/salix-front-mindshore:feature/ItemDiary into dev 
Reviewed-on: verdnatura/salix-front#339
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:29:17 +00:00
Javier Segarra e4f787f2fa Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:28:00 +00:00
Carlos Satorres e685b58adf Merge pull request 'refs #7172 change vnselectfilter' (!274) from 7172-fixClaimBasicData into dev 
Reviewed-on: verdnatura/salix-front#274
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:23:21 +00:00
Carlos Satorres 73ade834e9 Merge branch 'dev' into 7172-fixClaimBasicData 2024-05-02 08:21:43 +00:00
Javier Segarra 494f0be44a Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:13:41 +00:00
Javier Segarra 6482f5680d Merge pull request '#7190 - Renew tokenMultimedia' (!278) from 7190_renewTokenMultimedia into dev 
Reviewed-on: verdnatura/salix-front#278
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:11:08 +00:00
Javier Segarra 94fc856bea Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:05:17 +00:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia 2024-05-02 07:44:20 +00:00
Javier Segarra 43093cfa7d Merge pull request 'Item types' (!319) from hyervoni/salix-front-mindshore:feature/ItemFamily into dev 
Reviewed-on: verdnatura/salix-front#319
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 07:39:58 +00:00
Javier Segarra 57736654f1 Merge branch 'dev' into feature/ItemFamily 2024-05-02 07:38:41 +00:00
Javier Segarra 2c59e6acc3 Merge branch 'dev' into 6321_negative_tickets 2024-04-30 15:25:10 +02:00
Javier Segarra 1929545e5b feat: itemProposal table 2024-04-30 15:23:49 +02:00
Alex Moreno 2c4cd56102 Merge pull request 'fix: refs #6336 fix reload and disable button when is loading' (!340) from 6336-claims_v4_action into dev 
Reviewed-on: verdnatura/salix-front#340
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-04-30 13:01:09 +00:00
Javier Segarra 0988936884 feat: frmItemProposal show 2024-04-30 14:51:49 +02:00
Alex Moreno f3387cf120 fix: refs #6336 fix reload and disable button when is loading 2024-04-30 12:39:50 +02:00
Carlos Satorres acb4e2d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-30 09:44:06 +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 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 1d4549439c feat: remove agName 2024-04-29 15:09:10 +02:00
Javier Segarra b7bfb4b056 feat: updates 2024-04-29 15:08:12 +02:00
Javier Segarra 56a6f24071 feat: family filter 2024-04-29 14:21:39 +02:00
Javier Segarra 1ccad36020 feat: remove unnused filters 2024-04-29 13:25:18 +02: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 df29ad31fd minor changes 2024-04-29 13:22:31 +02:00
Javier Segarra 7108444a44 fix: 1. Warehouse default 2024-04-29 13:22:23 +02:00
Javier Segarra 5425902918 Merge branch 'dev' into 6321_negative_tickets 2024-04-29 11:55:56 +02: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
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