Commit Graph

2248 Commits

Author SHA1 Message Date
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
Alex Moreno 1206cc2292 warmFix: duplicated button after merge min
gitea/salix-front/pipeline/head This commit looks good Details
2024-04-24 08:11:33 +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 1ea74d0639 fix: minor updates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:55:01 +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 5dc41f8236 Merge branch 'dev' into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:01:46 +02:00
William Buezas 42fe189e9f Add module name in Item router file
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 16:45:28 -03:00
Javier Segarra e259a38214 Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 14:23:28 +02:00
William Buezas 672bc9ca9d Change form model popup buttons order
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 09:18:28 -03: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 c8b08b9e2d fix: refs #6480 fix workerCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 12:34:38 +02:00
Jorge Penadés f8c238f443 fix: refs #6480 fix workerCard 2024-04-23 12:04:24 +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 54f9cf36c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-23 11:49:06 +02:00
Jon Elias 02637556fb Merge branch 'dev' into 7239-changeTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 09:45:25 +00:00
Jon Elias f21fcc8959 Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 10:15:56 +02:00
Jon Elias fe600d9318 refactor: refs #7239 requested changes 2024-04-23 10:15:54 +02:00
Carlos Satorres 5cce1df708 refs #6976 fix supplierConsumption
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 10:06:57 +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
Jorge Penadés 498b8b3315 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 08:39:33 +02:00
Alex Moreno 20ec141237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-04-23 07:39:15 +02:00
Jon Elias 781e863aca Merge branch 'dev' into 7239-changeTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 05:16:34 +00:00
Jon Elias 87ce1f0217 Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 07:15:41 +02:00
Jon Elias 4ddcbaeacd refactor: refs #7239 fixed errors 2024-04-23 07:15:39 +02:00
Pablo Natek 663c093a00 feat: refs #4988 agency e2e 2024-04-22 18:17:01 +02:00
Jorge Penadés 3abc504158 fix: unit test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 16:35:34 +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
Alex Moreno 72deeab2ef Merge branch 'dev' into warmFix_hasMoreData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 13:01:28 +00: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
William Buezas 78561c5f42 Item types
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 08:34:38 -03:00
Jon Elias 2e493258fd Merge branch 'dev' into 7239-changeTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 11:19:15 +00:00
Jon Elias dd74c7d507 refactor: refs #7239 changed translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 13:17:22 +02:00
Jorge Penadés 1f391dc49b fix: skip
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 13:17:05 +02:00
Jorge Penadés 80844e7869 fix: hasMoreData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 12:53:09 +02:00
Pablo Natek 43aadd4fc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 12:22:04 +02:00
Pablo Natek 6b4cb4ed12 feat: refs #4988 add agency section
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 12:19:22 +02:00
Carlos Satorres d2ec47fe1c refs #6976 total Stems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 11:25:32 +02: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 4a5285358c fix(VnNotes): refs #6336 restore index in key
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:46:40 +02:00
Alex Moreno 918ce0dc86 fix(VnNotes): refs #6336 remove index in key
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 09:38:38 +02:00
Jorge Penadés 9a3f714290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 08:57:26 +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
Alex Moreno 3eb5041bf5 fix: refs #6590 remove unnecessary import
gitea/salix-front/pipeline/head This commit looks good Details
2024-04-22 07:50:34 +02:00
Javier Segarra edd1b66110 fix: merge toDateHourMin
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-21 16:09:21 +02:00
William Buezas d5832eaf41 improvement
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 12:52:45 -03:00
William Buezas 9212e53905 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 12:48:07 -03:00
William Buezas 3f5c711fa1 Improvements
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-19 12:26:49 -03:00
William Buezas 3a03e42cf9 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 10:40:04 -03:00
Alex Moreno ae2737673d fix: hasMoreData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 14:43:38 +02:00
Alex Moreno c638209f0e fix: hasMoreData 2024-04-19 14:39:20 +02:00
Jon Elias cfe03aeffa Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 12:31:47 +00:00
Jorge Penadés 7a4f975cc9 fix: refs #6480 fix warning
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 13:52:19 +02:00
Jorge Penadés bd539449a6 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-19 13:33:47 +02:00
Jorge Penadés da6e121137 refactor: refs #6480 use VnCard
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 13:33:29 +02:00
Jorge Penadés c3db9e17a8 fix: refs #6480 reactive summary 2024-04-19 13:30:07 +02:00
William Buezas b22d54f490 WIP 2024-04-19 08:23:23 -03:00
Jorge Penadés e38b53ca25 fix: refs #6480 reactive descriptor 2024-04-19 13:12:14 +02:00
Jorge Penadés 3fb155e697 fix: refs #6480 reactivity 2024-04-19 11:57:04 +02:00
Jorge Penadés 2450d5bf7a reafacto: refs #6480 slots 2024-04-19 11:40:52 +02:00
Jorge Penadés de0468bb99 fix: refs #6480 summary reactivity 2024-04-19 10:32:52 +02:00
Jorge Penadés b352dcde21 fix: refs #6480 summary data-key 2024-04-19 09:42:42 +02:00
Jorge Penadés ff36f82333 fix: refs #6480 disable popup on no observe changes 2024-04-19 09:39:17 +02:00
Alex Moreno 6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 09:36:10 +02:00
Jorge Penadés 9887d59808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-19 09:01:37 +02:00
Jon Elias 988fd1f449 Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 06:09:58 +00:00
Jon Elias 6021e1e4ce refactor: refs #6899 changed comercial value in negativeBases table
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 07:37:33 +02:00
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 13:14:23 -03:00
William Buezas a3cc6ed95b Add filter dates tooltip
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 10:32:32 -03:00
Jorge Penadés dfdfb6ec93 feat: refs #6480 locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 15:25:32 +02:00
Jon Elias 8fadccce92 Merge branch 'dev' into 7139-changeColumnsInRouteSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 12:48:02 +00:00
William Buezas 7165e48bff Add states translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:19:15 -03:00
Jorge Penadés 246944d2a4 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-18 14:10:41 +02:00
William Buezas 5f01e5c705 change es translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:09:22 -03:00
William Buezas b52b70041c resolve pnpm lock conflicts and change some colors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 08:33:23 -03:00
Jorge Penadés f8da680e98 feat: refs #6480 setArrayData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 13:33:21 +02:00
Guillermo Bonet 9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 11:18:22 +00:00
William Buezas 75dc81eba7 add column filters 2024-04-18 08:16:37 -03:00
Jon Elias 3f8cafd201 style: refs #6899 fixed style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 13:14:59 +02:00
Javier Segarra 82937a103d Merge branch 'dev' into 7180_bug_supplierListScroll
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 11:06:33 +00:00
Guillermo Bonet 7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 11:06:30 +00:00
Jon Elias f3b893de67 Merge branch 'dev' into 7139-changeColumnsInRouteSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-18 11:06:17 +00:00