Commit Graph

1620 Commits

Author SHA1 Message Date
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:34:05 +02:00
Javier Segarra 3116bf0944 Merge branch 'dev' into feature/ItemRequests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 06:21:36 +00:00
Javier Casado 6d5e0484cd Merge branch 'dev' into 6697-changeClaimQuantity
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 05:32:32 +00:00
William Buezas 823351f76d Item botanical
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:55:48 -03:00
Javier Segarra e5eb3010a3 fix: Change method because X updates row
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-25 15:31:14 +02:00
Javier Segarra fb4170d83d fix Double request when update row
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-25 15:25:20 +02:00
Alex Moreno 08a40e13f9 Merge branch 'dev' into 6764-rename-VnSelectFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-25 12:10:32 +00:00
jcasado 13d38c8b02 refactor: refs #6764 fix conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-25 09:02:24 +02:00
jcasado c6c925a105 refs: #6764 fixConflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 08:50:12 +02:00
jcasado 4b3df372cd refs: #6764 fixConflicts 2024-04-25 08:49:40 +02:00
jcasado aa58838ad7 refs: #6764 rename VnSelect
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 08:34:40 +02:00
William Buezas 726699bbc5 Item log
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 10:38:00 -03:00
Javier Segarra 51b432dfd0 fix icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 14:28:20 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
jcasado c9ab98471e refs #6697 fix changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 12:01:55 +02:00
jcasado 5103b5b365 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity 2024-04-24 12:01:15 +02:00
jcasado 6391ed1360 refs #6697 changes claim
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 11:26:32 +02:00
Javier Segarra 8bb3d48c81 Merge branch 'dev' into feature/FixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:37:39 +00:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 09:33:34 +02:00
Jon Elias 39685c222f refactor: refs #6899 fixed css and minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 09:14:35 +02:00
Jon Elias ca3b280dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 09:06:24 +02:00
Jorge Penadés d93963e2c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 08:48:43 +02:00
jcasado 716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 08:02:19 +02:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:34:49 +02:00
Javier Segarra dc1444641d Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:13:19 +02:00
William Buezas 4396f7d6ba Fill thumb_down icon on hover
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 09:13:10 -03:00
Javier Segarra 4f475a045d Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:12:15 +02:00
William Buezas 81a630d6cd Add more translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 09:10:28 -03:00
Javier Segarra 9a78b8ac3b Merge branch 'dev' into feature/ItemRequests 2024-04-23 13:55:43 +02:00
Javier Segarra bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 13:31:41 +02:00
jcasado 7f07b9780c refs: #6764 rename VnSelectFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 13:03:32 +02:00
Jorge Penadés f9a88ea8c2 fix: refs #6480 fix workerCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 12:00:29 +02:00
Jorge Penadés a3ce0440e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 09:53:38 +02:00
Alex Moreno 9cb662b6f5 Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 07:22:34 +00:00
Jorge Penadés f3c1608403 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 09:17:41 +02:00
William Buezas e11625e05f set columns default attrs to avoid repeating code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 11:30:16 -03:00
Alex Moreno 952d5bf543 fix(VnNotes): refs #6336 VnAvatar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 15:03:10 +02:00
William Buezas c9767e7b1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:45:01 -03:00
William Buezas dce48b536d Change in newPrice assign
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:42:28 -03:00
William Buezas 2105d7870b Refactor isBigger and isLower
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:38:16 -03:00
William Buezas 1398a146ff Change restOfData to restOfItem
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:07:48 -03:00
William Buezas 7dac6ba910 Remove unused imports
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:02:35 -03:00
William Buezas 64fc02e33b Fix supplier consumption disabled buttons 2024-04-22 09:00:57 -03:00
Jon Elias 3b8761dc7c refactor: refs #6899 moved css to app.scss
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 11:21:28 +02:00
Jon Elias ab61a68f28 refactor: refs #6899 moved css to app.scss 2024-04-22 11:20:25 +02:00
Alex Moreno 99af402281 fix(VnNotes): refs #6336 fix v-for key
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 08:42:38 +02:00
Jon Elias 3c2f281e0a Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 06:00:26 +00:00