0
0
Fork 0
Commit Graph

1065 Commits

Author SHA1 Message Date
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary 2024-03-06 09:48:34 +01:00
Pablo Natek 1aedb3c7da Merge branch 'dev' into 6486-salixColors 2024-03-06 08:43:21 +00:00
Pablo Natek 0192ec344f Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-06 09:43:45 +01:00
Pablo Natek b584295101 fix: refs #6486 add title to basicData 2024-03-06 09:43:45 +01:00
Pablo Natek 28b63831cc Merge branch 'dev' into 6486-salixColors 2024-03-06 08:41:49 +00:00
Carlos Satorres 207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact 2024-03-06 08:40:46 +00:00
Pablo Natek 59d41029d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-06 09:39:56 +01:00
Carlos Satorres 366ed0974a Merge branch 'dev' into 6935-cardDescriptorRemake 2024-03-06 08:39:19 +00:00
Javier Segarra 4637053ab2 refs #6336 feat: useCardSize 2024-03-06 09:35:01 +01:00
Alex Moreno 973a6eb58c Merge branch 'dev' into 6935-cardDescriptorRemake 2024-03-06 08:30:43 +00:00
Carlos Satorres 65f1d56d5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact 2024-03-05 14:47:42 +01:00
Carlos Satorres ed44d96589 refs #6892 fix checkbox 2024-03-05 14:45:13 +01:00
William Buezas 052123ad0e Change currentSupplier variable name 2024-03-05 09:58:54 -03:00
Pablo Natek 23cfe35d94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors 2024-03-05 12:04:13 +01:00
Jorge Penadés da1296a8c8 feat: refs #6981 replace files 2024-03-05 11:38:32 +01:00
Alex Moreno 5f77115716 refs #6336 feat: polish claims 2024-03-04 14:56:12 +01:00
William Buezas 432280884f Resolve conflicts 2024-03-04 10:46:11 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
William Buezas 9f1abf5cde Use next tick 2024-03-04 10:12:55 -03:00
Carlos Satorres 8f9048a786 refs #6892 fix scss class 2024-03-04 13:51:14 +01:00
William Buezas ff94d7e43d supplier account changes 2024-03-04 09:47:47 -03:00
Carlos Satorres adc290da6d refs #6935 restyle card 2024-03-04 12:26:14 +01:00
Carlos Satorres e3cf34fcda Merge branch 'dev' into 6980-redirection 2024-03-04 10:25:21 +00:00
Carlos Satorres c6f315d493 refs #6892 fix checkbox css 2024-03-04 10:32:51 +01:00
Carlos Satorres 8d4ba3d729 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact 2024-03-04 09:53:43 +01:00
Carlos Satorres fdf09710d8 refs #6892 fix checkbox 2024-03-04 09:51:51 +01:00
Carlos Satorres 04903928f5 refs #6892 fix css 2024-03-04 09:33:12 +01:00
Pablo Natek c18a974ff8 Merge branch 'dev' into 6486-salixColors 2024-03-01 09:51:12 +00:00
Pablo Natek eca0997db5 remove(style): refs #6486 remove from claimCard 2024-03-01 10:51:58 +01:00
Pablo Natek bc4e081bee fix(light): refs #6486 add light theme colors 2024-03-01 10:33:23 +01:00
Alex Moreno 4abb230180 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-01 10:26:38 +01:00
Pablo Natek 02959ca8a5 feat(colors): refs #6486 add salix-colors 2024-03-01 09:45:17 +01:00
Alex Moreno 28dbc76fe6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-01 09:26:18 +01:00
Alex Moreno 2105e3880b refs #6175 warmFix(WorkSummary): nullables 2024-03-01 09:26:17 +01:00
Carlos Satorres a1b377c844 warmFix remove div col 2024-03-01 08:59:50 +01:00
Carlos Satorres 91a137b072 warmFix row 2024-03-01 08:53:53 +01:00
Carlos Satorres 0de5ad0648 refs #6892 refact summary 2024-03-01 08:36:04 +01:00
Jorge Penadés 4b68f5224f fix: refs #6315 drop icon prop 2024-02-29 15:45:07 +01:00
Jorge Penadés cbf9bff0e3 fix: refs #6315 drop icon 2024-02-29 15:22:41 +01:00
Jorge Penadés 151d08f0bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency 2024-02-29 14:53:01 +01:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Jorge Penadés 2969191657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6945-quitVnRow 2024-02-28 15:22:30 +01:00
Jorge Penadés 26184328f9 fix: refs #6945 entryNotes 2024-02-28 15:21:44 +01:00
Carlos Satorres 447cbdeca8 Merge branch 'dev' into 6768-VnLocationRefact 2024-02-28 13:09:17 +00:00
William Buezas 9e86036f40 Change new address tooltip 2024-02-28 09:53:15 -03:00
William Buezas f1961f07d1 CardSummary changes 2024-02-28 08:54:53 -03:00
Carlos Satorres dd8ec1309f refs #6768 fix order 2024-02-28 10:59:12 +01:00
Carlos Satorres b8c6f43d0c refs #6768 shelving fix 2024-02-28 10:58:41 +01:00
Carlos Satorres 32685efc1c Merge branch '6768-VnLocationRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6768-VnLocationRefact 2024-02-28 10:28:13 +01:00