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

2769 Commits

Author SHA1 Message Date
Javier Segarra 320f6afd17 fix: CustomerDefaulter 2024-04-26 11:27:55 +02:00
Javier Casado 8864048a56 Merge branch 'dev' into 6641-myTeamFilterClaim 2024-04-26 09:14:54 +00:00
Javier Segarra 7831a69aa9 fix: i18n and icon class 2024-04-26 11:03:40 +02:00
Javier Segarra f169ca6778 fix: add button showPDF 2024-04-26 11:02:48 +02:00
Javier Segarra 93bbd0c222 fix: icons 2024-04-26 10:48:25 +02:00
Jon Elias e6dc7b9862 refactor: refs #6767 fix all conflicts 2024-04-26 09:47:44 +02:00
Javier Segarra 33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-26 07:47:24 +00:00
Alex Moreno 8f064e3338 warmFix: replace VnSelectFilter to VnSelect 2024-04-26 09:37:02 +02:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 09:28:40 +02:00
Javier Segarra 36e99e2c6c fix: bug when save 2024-04-26 09:28:32 +02:00
Carlos Satorres 022fd6caa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-26 09:17:23 +02:00
Pablo Natek 7af802c306 Merge branch 'dev' into 4988-agencySection 2024-04-26 07:07:15 +00:00
Javier Segarra 3c033458d3 fix: minor changes 2024-04-26 09:02:51 +02:00
Carlos Satorres e64936da72 Merge branch 'dev' into 6976-supplierConsumption 2024-04-26 07:00:22 +00:00
Carlos Satorres 966831b6d3 refs #6976 fix pr 2024-04-26 09:00:42 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection 2024-04-26 06:58:53 +00:00
Carlos Satorres 1d9f4e30af Merge branch 'dev' into 6905-fixUserPanel 2024-04-26 06:54:39 +00:00
Javier Segarra 7f4155cde9 fix: replace VnSelectFilter by VnSelect 2024-04-26 08:54:26 +02:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Carlos Satorres 7fd053b842 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel 2024-04-26 08:36:15 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog 2024-04-26 08:34:05 +02:00
Carlos Satorres fc275d9274 refs #6976 remove logs 2024-04-26 08:29:34 +02:00
Pablo Natek d7bebfecb1 fix: fix translates 2024-04-26 08:28:42 +02:00
Jon Elias c56b6b2dbc refactor: better syntax 2024-04-26 08:22:08 +02:00
Javier Segarra 3116bf0944 Merge branch 'dev' into feature/ItemRequests 2024-04-26 06:21:36 +00:00
Jon Elias 443f4a4443 refactor: refs #7239 changed spanish translations 2024-04-26 07:49:28 +02:00
Javier Casado 6d5e0484cd Merge branch 'dev' into 6697-changeClaimQuantity 2024-04-26 05:32:32 +00:00
Pablo Natek 436f24b674 fix: translates 2024-04-25 17:11:30 +02:00
Pablo Natek f29f7a55a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 16:28:30 +02:00
Pablo Natek 5544676a1b fix: mistakes like console.log an disables 2024-04-25 16:18:06 +02:00
William Buezas 823351f76d Item botanical 2024-04-25 10:55:48 -03:00
Javier Segarra e5eb3010a3 fix: Change method because X updates row 2024-04-25 15:31:14 +02:00
Javier Segarra fb4170d83d fix Double request when update row 2024-04-25 15:25:20 +02:00
Javier Segarra 6e5ac0eeb9 fix: CustomerAdress layout 2024-04-25 14:44:32 +02:00
Javier Segarra f14d631051 feat #7271 ZoneDescriptor 2024-04-25 14:32:42 +02:00
Javier Segarra b1871c33fd feat #7271 Zone Components boilerplate 2024-04-25 14:30:16 +02:00
Javier Segarra b4e3157887 feat #7271 i18n 2024-04-25 14:28:06 +02:00
Javier Segarra 42591d0781 feat #7271 router 2024-04-25 14:27:56 +02:00
Alex Moreno 08a40e13f9 Merge branch 'dev' into 6764-rename-VnSelectFilter 2024-04-25 12:10:32 +00:00
Robert Ferrús 92e172fcaf feat: refs #7039 country change column country - name 2024-04-25 12:56:02 +02:00
Pablo Natek 914c3fb169 fix: test and console log 2024-04-25 12:40:17 +02:00
Pablo Natek d490d85ecc feat: agencyWorkCenter 2024-04-25 12:34:19 +02:00
Pablo Natek e184f70be5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 09:59:17 +02:00
Pablo Natek 897ddc44fe fix: search bar 2024-04-25 09:57:04 +02:00
jcasado 13d38c8b02 refactor: refs #6764 fix conflicts 2024-04-25 09:02:24 +02:00
Javier Segarra 68dba82763 Merge branch 'dev' into feature/ItemListFilter 2024-04-25 08:54:24 +02:00
jcasado c6c925a105 refs: #6764 fixConflicts 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 2024-04-25 08:34:40 +02:00
Javier Segarra ccc6885172 Fix: minor bugs, layout & vnlocation 2024-04-25 04:41:44 +00:00
William Buezas 969087a347 Remove unused things 2024-04-24 17:48:47 -03:00
William Buezas 84a9dc8319 Fix ItemDescriptor labels 2024-04-24 17:30:53 -03:00
William Buezas a6ebe9cf19 Item barcode 2024-04-24 12:54:38 -03:00
William Buezas 726699bbc5 Item log 2024-04-24 10:38:00 -03:00
William Buezas 934db32973 WIP 2024-04-24 10:31:33 -03:00
Javier Segarra e1f50f5daf fix: minorchanges 2024-04-24 15:05:10 +02:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e6c9a692f5 feat moduleName 2024-04-24 14:33:10 +02:00
Javier Segarra 51b432dfd0 fix icon 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 2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
Carlos Satorres 6961a048e5 refs #6905 fix bank select 2024-04-24 13:29:32 +02:00
Carlos Satorres 391ca36764 fix conflicts 2024-04-24 12:47:56 +02:00
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 12:15:34 +02:00
Javier Segarra a555d11663 fix: #7190 test 2024-04-24 12:15:12 +02:00
jcasado c9ab98471e refs #6697 fix changes 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
Jon Elias 82300fd292 refactor: refs #7239 changed french translations 2024-04-24 11:31:37 +02:00
jcasado 6391ed1360 refs #6697 changes claim 2024-04-24 11:26:32 +02:00
Javier Segarra 8bb3d48c81 Merge branch 'dev' into feature/FixedPrices 2024-04-24 07:37:39 +00:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
Jon Elias 39685c222f refactor: refs #6899 fixed css and minor changes 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 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 2024-04-24 08:48:43 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 06:25:14 +00:00
Alex Moreno 1206cc2292 warmFix: duplicated button after merge min 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 2024-04-24 08:02:19 +02:00
Javier Segarra 1ea74d0639 fix: minor updates 2024-04-24 07:55:01 +02:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary 2024-04-24 07:34:49 +02:00
Javier Segarra 5dc41f8236 Merge branch 'dev' into feature/ItemFamily 2024-04-24 07:01:46 +02:00
William Buezas 42fe189e9f Add module name in Item router file 2024-04-23 16:45:28 -03:00
William Buezas f3b5bf7f4b Item list filter 2024-04-23 15:34:52 -03:00
Javier Segarra e259a38214 Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:23:28 +02:00
William Buezas 672bc9ca9d Change form model popup buttons order 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 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 2024-04-23 09:10:28 -03:00
William Buezas b7ba664e45 WIP 2024-04-23 09:05:34 -03:00
Javier Segarra f959b5dc37 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-23 11:57:22 +00: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 2024-04-23 13:31:41 +02:00
jcasado 7f07b9780c refs: #6764 rename VnSelectFilter 2024-04-23 13:03:32 +02:00
Jorge Penadés c8b08b9e2d fix: refs #6480 fix workerCard 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 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 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 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 2024-04-23 10:06:57 +02:00
Javier Segarra 62c66ff952 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-23 08:04:13 +00:00
Jorge Penadés a3ce0440e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-23 09:53:38 +02:00
Alex Moreno 9cb662b6f5 Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar 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 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 2024-04-23 08:39:33 +02:00
Javier Segarra 6018d51642 perf: #7190 remove comments 2024-04-23 07:56:07 +02:00
Javier Segarra 74eec098ac Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-23 07:49:35 +02:00
Alex Moreno 20ec141237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-23 07:39:15 +02:00
Jon Elias 781e863aca Merge branch 'dev' into 7239-changeTranslations 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 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 2024-04-22 16:35:34 +02:00
William Buezas e11625e05f set columns default attrs to avoid repeating code 2024-04-22 11:30:16 -03:00
Alex Moreno 952d5bf543 fix(VnNotes): refs #6336 VnAvatar 2024-04-22 15:03:10 +02:00
Alex Moreno 72deeab2ef Merge branch 'dev' into warmFix_hasMoreData 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 2024-04-22 09:45:01 -03:00
William Buezas dce48b536d Change in newPrice assign 2024-04-22 09:42:28 -03:00
William Buezas 2105d7870b Refactor isBigger and isLower 2024-04-22 09:38:16 -03:00
William Buezas 1398a146ff Change restOfData to restOfItem 2024-04-22 09:07:48 -03:00
William Buezas 7dac6ba910 Remove unused imports 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 2024-04-22 08:34:38 -03:00
Jon Elias 2e493258fd Merge branch 'dev' into 7239-changeTranslations 2024-04-22 11:19:15 +00:00
Jon Elias dd74c7d507 refactor: refs #7239 changed translations 2024-04-22 13:17:22 +02:00
Jorge Penadés 1f391dc49b fix: skip 2024-04-22 13:17:05 +02:00
Jorge Penadés 80844e7869 fix: hasMoreData 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 2024-04-22 12:22:04 +02:00
Pablo Natek 6b4cb4ed12 feat: refs #4988 add agency section 2024-04-22 12:19:22 +02:00
Carlos Satorres d2ec47fe1c refs #6976 total Stems 2024-04-22 11:25:32 +02:00
Jon Elias 3b8761dc7c refactor: refs #6899 moved css to app.scss 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 2024-04-22 09:46:40 +02:00
Alex Moreno 918ce0dc86 fix(VnNotes): refs #6336 remove index in key 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 2024-04-22 08:57:26 +02:00
Alex Moreno 99af402281 fix(VnNotes): refs #6336 fix v-for key 2024-04-22 08:42:38 +02:00
Jon Elias 3c2f281e0a Merge branch 'dev' into 6899-endInvoiceOutMigration 2024-04-22 06:00:26 +00:00
Alex Moreno 3eb5041bf5 fix: refs #6590 remove unnecessary import 2024-04-22 07:50:34 +02:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-22 07:38:07 +02:00
Javier Segarra 2b24e18f75 FEAT: SETiNTERVAL WITH RENEWpERIOD 2024-04-22 07:37:35 +02:00
Javier Segarra edd1b66110 fix: merge toDateHourMin 2024-04-21 16:09:21 +02:00
William Buezas d5832eaf41 improvement 2024-04-19 12:52:45 -03:00
William Buezas 9212e53905 resolve conflicts 2024-04-19 12:48:07 -03:00
William Buezas 3f5c711fa1 Improvements 2024-04-19 12:26:49 -03:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Alex Moreno ae2737673d fix: hasMoreData 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 2024-04-19 12:31:47 +00:00
Jorge Penadés 7a4f975cc9 fix: refs #6480 fix warning 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 2024-04-19 13:33:47 +02:00
Jorge Penadés da6e121137 refactor: refs #6480 use VnCard 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
Javier Segarra aecea5f273 refs #7190 feat: renewToken 2024-04-19 12:26:43 +02:00
Javier Segarra fb26219354 refs #7190 feat: useTokenConfig 2024-04-19 12:09:04 +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 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 2024-04-19 06:09:58 +00:00
Jon Elias 6021e1e4ce refactor: refs #6899 changed comercial value in negativeBases table 2024-04-19 07:37:33 +02:00
Jon Elias 3f3b37fd4a refactor: refs #6767 fixed conflicts 2024-04-19 07:24:58 +02:00
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys 2024-04-18 13:14:23 -03:00
William Buezas a3cc6ed95b Add filter dates tooltip 2024-04-18 10:32:32 -03:00
Jorge Penadés dfdfb6ec93 feat: refs #6480 locale 2024-04-18 15:25:32 +02:00
Jon Elias 8fadccce92 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 12:48:02 +00:00
William Buezas 7165e48bff Add states translations 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 2024-04-18 14:10:41 +02:00
William Buezas 5f01e5c705 change es translations 2024-04-18 09:09:22 -03:00
William Buezas b52b70041c resolve pnpm lock conflicts and change some colors 2024-04-18 08:33:23 -03:00
Jorge Penadés f8da680e98 feat: refs #6480 setArrayData 2024-04-18 13:33:21 +02:00
Guillermo Bonet 9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked 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 2024-04-18 13:14:59 +02:00
Javier Segarra 82937a103d Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 11:06:33 +00:00
Guillermo Bonet 7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:06:30 +00:00
Jon Elias f3b893de67 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 11:06:17 +00:00
Jon Elias 1f0394b5fc refactor: refs #7139 fixed error in translation 2024-04-18 12:45:45 +02:00
Jon Elias c60558420f fix: refs #6425 fixed vitest config to avoid testing problems 2024-04-18 12:38:43 +02:00
Javier Segarra 7f63ea4e1c Actualizar src/composables/useArrayData.js 2024-04-18 09:37:01 +00:00
Javier Segarra 846c85ed1a Actualizar src/components/ui/VnPaginate.vue 2024-04-18 09:36:24 +00:00
Jorge Penadés 75975b631e feat: refs #6480 include SearchBar into VnCard 2024-04-18 11:32:03 +02:00
Jorge Penadés 90ed6ad09a fix: refs #6480 drop secondary acroos 2024-04-18 10:49:17 +02:00
Alex Moreno 69850d65e7 fix(VnNotes) refs #7226 use v-bind 2024-04-18 10:13:36 +02:00
Javier Segarra 43976e8ced fix minor bug to show 2024-04-18 07:37:19 +00:00
Alex Moreno e804af3512 Merge branch 'dev' into 7130-addFieldInRoutes 2024-04-18 07:25:32 +00:00
Jorge Penadés b71068ac64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-18 08:44:10 +02:00
Jon Elias 062d743896 refactor: refs #7139 replace warehouse with ticket 2024-04-18 08:20:20 +02:00
Javier Segarra 5382f306e2 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-18 06:18:02 +00:00
Alex Moreno 84dfd6d474 hotFix(workerDms): use undefined 2024-04-18 08:12:11 +02:00
Javier Segarra 817a8fcc71 Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 06:06:01 +00:00
Jon Elias ace55c554f refactor: refs #6899 corrected Lilium styles and functionalities 2024-04-18 08:03:57 +02:00
William Buezas 5addd0056d Add filter panel 2024-04-17 17:18:38 -03:00
William Buezas 2903c6a2bf table adjustments 2024-04-17 14:55:17 -03:00
Alex Moreno ebd02987b9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-17 16:34:06 +02:00
Jorge Penadés d6508f1930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-17 14:20:00 +02:00
Jon Elias 79a90c1163 fix: refs #7130 fix conflicts 2024-04-17 13:48:56 +02:00
William Buezas 5551189f2f resolve conflicts 2024-04-17 08:46:37 -03:00
William Buezas 1dfaef2ffa Resolve conflicts 2024-04-17 08:26:12 -03:00
Jon Elias 6839b5aac2 refactor: refs #6767 deleted <div class="col"> 2024-04-17 13:26:08 +02:00
William Buezas da06e7bc87 WIP 2024-04-17 08:13:34 -03:00
Alex Moreno 52a0be449d feat: refs #6336 redesign 2024-04-17 10:58:07 +02:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-17 10:53:18 +02:00
Javier Segarra 37ad84f239 perf(lilium): refs #6930 Improve setToken fn 2024-04-17 10:09:44 +02:00
Javier Segarra b95d44c05d feat(lilium): refs #6930 Undo rollback lilium 2024-04-17 10:07:44 +02:00
Guillermo Bonet b4462fcdb5 Merge branch 'dev' into 6968-groupingModeRefactor 2024-04-17 06:44:24 +00:00
Javier Segarra 248416b676 fix(lilium) #7180 SupplierList Scroll 2024-04-17 08:41:47 +02:00
William Buezas a397c6ed30 remove component import 2024-04-16 12:18:36 -03:00
William Buezas ba2499db9d resolve conflicts 2024-04-16 12:11:57 -03:00
William Buezas df2760ef60 Add dense attr to inputs 2024-04-16 11:49:59 -03:00
William Buezas 8e6538b369 Item request view 2024-04-16 11:47:15 -03:00
William Buezas 813bab4e9d manage QCalendar customization classes from wrapper 2024-04-16 10:47:16 -03:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
William Buezas c82f4652f5 Move capitalize header week day to wrapper 2024-04-16 09:44:52 -03:00
William Buezas 256461a5bb Change current day colors 2024-04-16 09:41:03 -03:00
William Buezas a808491c5e use the color of calendar background for the border of panel card 2024-04-16 09:37:31 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00:00
William Buezas 1577fb701b remove unused span 2024-04-16 09:30:17 -03:00
William Buezas 51eba2ea77 Add calendar wrapper 2024-04-16 09:28:48 -03:00
William Buezas 2ab7a45114 resolve conflicts 2024-04-16 08:49:34 -03:00
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Javier Segarra adb31497e5 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-16 10:20:25 +00:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests 2024-04-16 11:42:43 +02:00
Guillermo Bonet 7b29832966 feat: refs #6968 Changed groupingMode to enum 2024-04-16 11:12:23 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations 2024-04-16 11:00:38 +02:00
Robert Ferrús 81f29d815d Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 09:33:58 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús 130869dcdb Merge branch 'dev' into 6679-addCreateIcon 2024-04-16 07:30:27 +00:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
Robert Ferrús d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 08:04:23 +02:00
Pablo Natek c65c09c39c feat(agency): refs #4988 add agency router and sections 2024-04-16 07:45:33 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
William Buezas d9d868a6af Waste breakdown 2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes 2024-04-15 08:51:48 -03:00
William Buezas fcce2b5070 Add filter 2024-04-15 08:46:26 -03:00
Jorge Penadés b2211369ea fix: refs #6938 remove personal phone 2024-04-15 13:30:42 +02:00
Jorge Penadés 1e77e82784 fix: refs #6938 id filter 2024-04-15 13:28:10 +02:00
Robert Ferrús 058ddc8e9a feat: refs #6500 2024-04-15 13:18:39 +02:00
Javier Segarra e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-15 13:11:21 +02:00
Jorge Penadés 68069ba9c6 feat: refs #6938 hide personal phone 2024-04-15 12:48:07 +02:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design 2024-04-15 12:28:43 +02:00
Alex Moreno 6e0510f0bd feat(supplierSummary): refs #6898 use VnTitle 2024-04-15 08:58:39 +02:00
Alex Moreno 4efe09722f refs #6336 feat(claim): improvements 2024-04-15 08:40:15 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -03:00
William Buezas 2699040f0e Item request view 2024-04-12 16:50:41 -03:00
William Buezas 5f46ad225e Fix genus and specie value 2024-04-12 10:44:56 -03:00
William Buezas 92429295cd more translations 2024-04-12 10:44:25 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations 2024-04-12 10:32:19 -03:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones 2024-04-12 10:20:05 -03:00
William Buezas d38c85a0ef resolve conflicts 2024-04-12 09:39:34 -03:00
William Buezas b4d92d4f97 Fix Options item labels 2024-04-12 09:35:57 -03:00
Carlos Satorres ee80b1d617 refs #6976 changes table 2024-04-12 14:34:11 +02:00
Jon Elias 5cd32ec2fe Merge branch 'dev' into 6425-translationProposal 2024-04-12 12:21:41 +00:00
William Buezas 6019c7f7b2 Add remove chip button only if is manual 2024-04-12 08:41:45 -03:00
William Buezas 9283b190b0 Differentiate manual chips 2024-04-12 08:35:39 -03:00
Jorge Penadés a27bdc37d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes 2024-04-12 13:27:14 +02:00
William Buezas c4a8127a5b Add toggle right drawer button 2024-04-12 08:24:56 -03:00
William Buezas 0006761201 Use black background on WorkerDateLabel 2024-04-12 08:22:17 -03:00
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar 2024-04-12 08:13:58 -03:00
William Buezas 3d9d444bb4 remove filter field 2024-04-12 08:11:58 -03:00
William Buezas c12fd77218 Remove businessFk from FetchData 2024-04-12 08:10:14 -03:00
William Buezas f72ea07b09 WIP 2024-04-12 08:07:33 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts 2024-04-12 11:44:56 +02:00
Carlos Satorres 40a3815e85 refs #6111 clean code fix changes 2024-04-12 10:27:30 +02:00
Carlos Satorres b5aae63e15 refs #6976 supplier onUnmounted 2024-04-12 08:47:25 +02:00
Pablo Natek af9fd6ed73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-12 07:52:37 +02:00
William Buezas 73703dc778 Add translations 2024-04-11 18:07:02 -03:00
William Buezas 98f273cb93 WIP 2024-04-11 18:04:11 -03:00
jcasado ad8007fe6b refs #6641 add checkbox 2024-04-11 13:42:37 +02:00
William Buezas c032c83e7f Item create view 2024-04-11 08:40:41 -03:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary 2024-04-11 11:37:11 +00:00
Alex Moreno 3f8d97e2a3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-11 12:32:51 +02:00
Alex Moreno d99d934dab fix: refs #7199 e2e 2024-04-11 12:29:30 +02:00
Jorge Penadés 170747371a fix: refs #6480 css 2024-04-11 12:27:58 +02:00
Jorge Penadés bfa9dc9634 feat: refs #6480 include drawer 2024-04-11 12:23:00 +02:00
Jorge Penadés edf75c8cdd feat: refs #6480 check if hasContent or slots 2024-04-11 09:22:15 +02:00
Jorge Penadés 96d3073f67 Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" 
This reverts commit 984539b70f, reversing
changes made to d7ab6e8a02.
 2024-04-11 09:01:44 +02:00
Jorge Penadés 984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:42:17 +02:00
Jorge Penadés d7ab6e8a02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:41:52 +02:00
William Buezas 4a0ae8aa45 Item summary 2024-04-10 17:18:57 -03:00
Javier Segarra 5f502c2aad #6480: POC Claims 2024-04-10 20:52:45 +02:00
Robert Ferrús de18b56cb2 feat: refs #6679 add icon 2024-04-10 14:47:20 +02:00
Robert Ferrús f59ecbf94e Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-10 14:42:48 +02:00
Robert Ferrús 7f2d8ee1e5 feat: refs #6679 add icon 2024-04-10 14:42:43 +02:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 09:34:51 -03:00
William Buezas 99c576b16e Add actions again 2024-04-10 09:32:15 -03:00
Javier Segarra 478ebfd0ea Merge branch 'dev' into 6679-addCreateIcon 2024-04-10 12:22:19 +00:00
Carlos Satorres 0cc672d75a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-10 14:20:19 +02:00
William Buezas c881fe6577 Resolve conflicts 2024-04-10 09:19:54 -03:00
Carlos Satorres 904f647a5b refs #7172 fix vnSelectFilter 2024-04-10 14:16:20 +02:00
William Buezas e676933942 Update worker dms remove 2024-04-10 08:59:05 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 08:46:00 -03:00
William Buezas 9ae79a5631 Add translation again 2024-04-10 08:43:57 -03:00
William Buezas e8486099fc Resolve conflicts 2024-04-10 08:37:52 -03:00
William Buezas e4a8c45053 Change workweeks colod and capitalize 2024-04-10 08:32:04 -03:00
Robert Ferrús a350de9119 Merge branch 'dev' into 6679-addCreateIcon 2024-04-10 11:30:21 +00:00
William Buezas 39af4278a6 Add delete model to worker dms 2024-04-10 08:27:30 -03:00
Robert Ferrús 933e6b88b1 feat: refs #6679 add icon 2024-04-10 13:24:20 +02:00
Carlos Satorres 2eaa184fe0 refs #6111 fix trad remove logs 2024-04-10 13:20:56 +02:00
Jorge Penadés 14d9147cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-10 13:02:22 +02:00
Jon Elias 6a203f593f Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-04-10 12:53:45 +02:00
Jon Elias eb91c0b1c2 Merge branch 'dev' into 6425-translationProposal 2024-04-10 12:53:44 +02:00
Jon Elias e3e6c74afa Merge branch 'dev' into 7186-tabIndexVATExpenses 2024-04-10 07:36:17 +00:00
jcasado c640ba1298 fix set 2024-04-10 09:31:38 +02:00
jcasado 70c9f1dea4 refs #7179 changes pr 2024-04-10 09:29:26 +02:00
Jon Elias 09ceefb7c5 style: refs #7186 fixed style 2024-04-10 08:49:54 +02:00
Jon Elias f9de26933a refactor: refs #7186 fill-icon change 2024-04-10 08:00:36 +02:00
William Buezas e88194eb88 Update worker dms model prop 2024-04-09 16:00:12 -03:00
William Buezas fc4a69b2c6 resolve conflicts in worker routes 2024-04-09 15:28:11 -03:00
William Buezas c3835dfd7a resolve conflicts 2024-04-09 15:23:05 -03:00
William Buezas 9bffc9bb25 classes and size improvements 2024-04-09 15:20:29 -03:00
William Buezas faa8d05313 Change saturday and sunday days color 2024-04-09 14:48:51 -03:00
William Buezas c573019038 Sizes and spacings 2024-04-09 14:13:40 -03:00
William Buezas 9ea0a62046 Add border and change background color 2024-04-09 14:03:18 -03:00
William Buezas dfcf6e35d5 Change WorkerEventLabels separations 2024-04-09 11:06:07 -03:00
William Buezas 3e5a5dfe1c remove import 2024-04-09 10:53:07 -03:00
William Buezas 9c3407846b Fix translation 2024-04-09 10:30:40 -03:00
Jorge Penadés 83bf8183f0 fix: refs #6992 warning console & formModel hook 2024-04-09 15:12:54 +02:00
Jorge Penadés 6349a3e790 feat: refs #6992 comments 2024-04-09 15:08:54 +02:00
jcasado d8ef199b14 refs #7179 remove code 2024-04-09 14:55:27 +02:00
William Buezas 881c6e2f7f Improve translations 2024-04-09 09:54:23 -03:00
William Buezas fb4f35a378 Rename WorkerDateLabel and change colors 2024-04-09 09:21:35 -03:00
William Buezas 0941d74d52 Move default value assignment 2024-04-09 09:14:41 -03:00
William Buezas 196679b9e9 Change v-if variable 2024-04-09 09:07:46 -03:00
William Buezas e4166c85fa Move add absences text to a i18n variable 2024-04-09 09:05:15 -03:00
William Buezas b05c28f571 Add chaining to holiday detail and holiday type 2024-04-09 08:57:39 -03:00
William Buezas 0144aab7a5 Mini fix 2024-04-09 08:51:00 -03:00
Jon Elias 15d4b54dda refactor: refs #7186 fixed changes 2024-04-09 13:34:45 +02:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id 2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes 2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view 2024-04-09 08:18:18 -03:00
Jon Elias 65626446fd refactor: refs #7186 fixed style and tab 2024-04-09 13:01:29 +02:00
Jorge Penadés 50bce40613 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 10:09:41 +02:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
Jorge Penadés fdfa99c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 09:55:44 +02:00
Robert Ferrús cd3024c0a1 feat: refs #6679 add icon 2024-04-09 09:17:49 +02:00
Jon Elias f988923b4b Merge branch 'dev' into 6973-UpdateVnLocationLabel 2024-04-09 06:48:06 +00:00
Jon Elias b7788512bc refactor: refs #6973 fix requested changes 2024-04-09 08:41:44 +02:00
Jon Elias 3bededcd94 refactor: refs #6973 updated label and updated cypress test 2024-04-09 07:47:40 +02:00
William Buezas 64ff5e4446 Add pagination and table actions 2024-04-08 11:40:44 -03:00
Jorge Penadés 16548dadef feat: refs #6992 add test 2024-04-08 16:38:36 +02:00
Jorge Penadés 8de3ea16a6 fix: refs #6992 add queryParams 2024-04-08 15:15:18 +02:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Carlos Satorres f60670cb87 refs #7172 change vnselectfilter 2024-04-08 10:49:53 +02:00
Jorge Penadés dfac40adb3 feat: refs #6480 vnCard 2024-04-08 10:27:37 +02:00
Jorge Penadés 4fa311120d feat: refs #6480 hide if no content 2024-04-08 10:11:50 +02:00
Javier Segarra f2d513766e fix_merge_worker_submoduls 2024-04-08 07:03:42 +00:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup 2024-04-08 05:18:34 +00:00
William Buezas 4b6038d1d2 Last changes 2024-04-06 14:10:08 -03:00
Carlos Satorres a78e86a0b9 refs #6111 routeList fix 2024-04-05 14:25:32 +02:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-04-05 09:11:23 -03:00
William Buezas 52611beaf1 Changes in isHimSelf computed and FormPopup buttons order 2024-04-05 08:57:25 -03:00
William Buezas 4701714aa9 merge with dev 2024-04-05 08:42:13 -03:00
Carlos Satorres da24b4d836 refs #6111 onMounted 2024-04-05 13:39:43 +02:00
Carlos Satorres cddef039d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList 2024-04-05 13:29:59 +02:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
William Buezas 03be831ee5 remove package-lock.json 2024-04-05 08:24:55 -03:00
William Buezas dae08c322d visual adjustments 2024-04-05 08:04:34 -03:00
Guillermo Bonet 1a15ccec2c fix: refs #6636 Call getEnumValues method 2024-04-05 11:01:48 +02:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Alex Moreno e14993c114 minor changes 2024-04-05 09:12:49 +02:00
Carlos Satorres ce02d21b3b refs #6111 fix routeList 2024-04-05 08:50:33 +02:00
Guillermo Bonet 9310d863aa fix: refs #6636 Icon save and reset 2024-04-05 07:39:05 +02:00
Guillermo Bonet 58b9eb1c78 feat: refs #6636 Requested changes 2024-04-05 07:29:25 +02:00
Guillermo Bonet 8d7670cc85 Merge branch 'dev' into 6636-pickup 2024-04-05 05:24:31 +00:00
William Buezas ec2604b9ab Fix customer samples create preview 2024-04-04 14:28:51 -03:00
William Buezas 87f376464b Wait to render teleport until subtoolbar is shown 2024-04-04 13:48:57 -03:00
William Buezas 5ae54d557b Fix form model beforeRouteLeave 2024-04-04 13:27:50 -03:00
William Buezas cb55115cd2 Remove unused component 2024-04-04 12:02:43 -03:00
William Buezas 1cff622898 Fix customer balance calculation 2024-04-04 11:55:43 -03:00
William Buezas 82f259be32 Add focus to amount input in customer unpaid 2024-04-04 11:30:09 -03:00
William Buezas 78dc3c1c9a Move data fetching to main component 2024-04-04 11:20:30 -03:00
Jon Elias 59a631b19e Merge branch 'dev' into 6894-invoiceInChangeFilters 2024-04-04 12:32:40 +00:00
William Buezas fd5ea8f6f5 WIP 2024-04-04 09:27:17 -03:00
Jon Elias 97b7c2469a refactor: refs #6894 changed filter fields and checked functionality 2024-04-04 14:13:34 +02:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim 2024-04-04 14:12:16 +02:00
William Buezas 580af396d1 Change buttons group 2024-04-04 08:45:03 -03:00
William Buezas 503efb79c9 WIP 2024-04-04 08:39:52 -03:00
Javier Segarra 0ad722381e #6425 fix quotes in yml file 2024-04-04 13:38:25 +02:00
Guillermo Bonet b21c54f20d Merge branch 'test' into dev 2024-04-04 11:31:20 +02:00
Guillermo Bonet d98e5d78ff hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:17:13 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
William Buezas 0f6c6cde91 Improve visually WorkerDateLabel 2024-04-03 17:32:22 -03:00
Pablo Natek be42593368 Merge branch 'dev' into 7128-copyStyles 2024-04-03 19:10:38 +00:00
William Buezas 95b19d35e7 Change form model popup buttons order 2024-04-03 13:50:25 -03:00
William Buezas 60b146196f add calendar short-weekday-label 2024-04-03 13:48:41 -03:00
Alex Moreno dec71dbf62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-03 16:29:40 +02:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Pablo Natek c0ed8da0b7 remove space 2024-04-03 15:02:31 +02:00
Carlos Satorres 0cfcda7062 refs #6111 fix visibleColumns 2024-04-03 15:00:36 +02:00
Pablo Natek fb6a2c8097 feat: refs #4988 add agencyList and searchBar 2024-04-03 14:59:51 +02:00
Jon Elias 94b177c9a2 fix: refs #6425 fix yml format 2024-04-03 14:33:47 +02:00
William Buezas 64b1083619 Add today date 2024-04-03 09:28:38 -03:00
Jon Elias 3e423867e3 fix: refs #6425 fix yml format 2024-04-03 13:12:00 +02:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
Jon Elias 9a160d9248 refactor: refs #6425 merged changes 2024-04-03 12:57:23 +02:00
Jon Elias cb31c2baa2 refs: #6425 merge conflicts 2024-04-03 12:56:56 +02:00
jcasado cd49ebe7a6 refs #6697 fix claimQuantity 2024-04-03 12:54:14 +02:00
Jon Elias fb795f65ee refactor: refs #6425 test changes 2024-04-03 09:49:15 +02:00
Pablo Natek 6c39c7da97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-03 08:40:15 +02:00
Pablo Natek f404243d63 feat(route): refs # agency add agencyList 2024-04-03 08:38:26 +02:00
William Buezas fc87bb8293 Add page title name 2024-04-02 13:04:28 -03:00
William Buezas 507c979cc2 Remove unused reactive import 2024-04-02 12:48:14 -03:00
William Buezas 3569afdb85 Update fetch-data name 2024-04-02 12:46:50 -03:00
William Buezas 71b2f7c8dc Remove col divs 2024-04-02 12:43:32 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
William Buezas 94644de4fa VnSmsDialog adapt style and add tooltip 2024-04-02 10:44:02 -03:00
William Buezas 835174612c Make value comparision not strict 2024-04-02 10:09:28 -03:00
William Buezas 026588c03d WorkerTimeForm set initial data 2024-04-02 09:30:59 -03:00
William Buezas 772959ff81 Improve getLocales code 2024-04-02 09:13:12 -03:00
Pablo Natek f18cefd999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles 2024-04-02 14:12:58 +02:00
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Pablo Natek c66be3c2b5 feat #7128 fix styles 2024-04-02 14:04:09 +02:00
Kevin Martinez 47a588fff4 Update WorkerCalendarItem 2024-04-02 09:00:15 -03:00
William Buezas 107eaea704 Remove unused variable in CustomerSummaryTableActions 2024-04-02 08:57:22 -03:00
William Buezas 3e124581c4 Remove route import in CustomerCard 2024-04-02 08:37:52 -03:00
Carlos Satorres 9833a5946a refs #6111 create visible columns 2024-04-02 12:48:39 +02:00
Pablo Natek 148224344d feat(style): refs #7128 add style 2024-04-02 10:46:27 +02:00
Jon Elias 1316fe3896 Merge branch 'dev' into 7130-addFieldInRoutes 2024-04-02 05:14:15 +00:00
William Buezas 6bb0d30284 Move Worker Time control componente to Card folder 2024-04-01 21:19:55 -03:00
William Buezas bafb938e23 VnSmsDialog add default value to template prop as empty string 2024-03-28 17:10:07 -03:00
William Buezas 3cb045936b Replace Customer File management dateTime formatting with new utils 2024-03-28 16:25:02 -03:00
William Buezas 73ea49df63 Replace Customer Greuges dateTime formatting with new utils 2024-03-28 16:21:49 -03:00
William Buezas 093c367d7e Replace Customer Mandates dateTime formatting with new utils 2024-03-28 16:18:36 -03:00
William Buezas fb59ac1f2f Remove single quotes and colon 2024-03-28 16:15:44 -03:00
William Buezas f6b8a73ae2 Improve Customer Notes classes definition 2024-03-28 16:13:39 -03:00
William Buezas e1f8b7217a Replace Customer Notes dateTime formatting with new utils 2024-03-28 16:11:01 -03:00
William Buezas c856adc8d0 Replace customer samples dateTime formatting with new utils 2024-03-28 16:07:20 -03:00
William Buezas d8dc969614 Fix date utils 2024-03-28 16:06:27 -03:00
William Buezas 998561badd Change customer unpaid initial date 2024-03-28 15:58:07 -03:00
William Buezas 239daceca6 Apply changes in Worker PBX 2024-03-28 13:45:35 -03:00
William Buezas cb238476e7 Components reubication and change calendar selected date color 2024-03-28 09:47:39 -03:00
William Buezas 1fc6eed1d5 Clean props when switching between edit and create mode in WorkerTimeForm 2024-03-28 08:31:55 -03:00
Jon Elias 37d869d1d5 refactor: refs #7130 requested changes 2024-03-28 12:19:55 +01:00
Jorge Penadés 7020fab851 fix: refs #6951 drop hook & change selector 2024-03-28 09:46:18 +01:00
Jon Elias 2b1fe6fd77 Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier 2024-03-28 08:31:57 +01:00
Jon Elias b2691a35e1 refactor: refs #6514 fixed tranlation 2024-03-28 08:31:56 +01:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier 2024-03-28 07:17:28 +00:00
Javier Segarra da93b9cca8 updates 2024-03-28 07:20:54 +01:00
William Buezas 0d6d18b8c8 Apply VnDmsList component and add docuware action 2024-03-27 20:33:35 -03:00
Kevin Martinez 0dee7e8cc9 Create worker calendar submodule 2024-03-27 16:51:44 -03:00
William Buezas 37465ffa4a resolve conflicts 2024-03-27 11:23:54 -03:00
carlosfonseca 8cf14929e3 Se implementa nuevo componente para la gestion de notas 2024-03-27 08:52:31 -05:00
William Buezas b546b63352 resolve conflicts 2024-03-27 10:11:20 -03:00
Carlos Satorres e651e116e7 refs #7147 add value 2024-03-27 13:36:51 +01:00
William Buezas 112112b069 Small change 2024-03-27 09:13:53 -03:00
Carlos Satorres c0c94ff924 refs #6111 fix qtable, actions, scroll 2024-03-27 13:09:10 +01:00
William Buezas de912b266c Finish calendar integration 2024-03-27 08:26:28 -03:00
Jorge Penadés 5126b6aed8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:48:56 +01:00
Jorge Penadés 0d74c7f6c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:18:41 +01:00
Jorge Penadés 20102a89ab feat: refs #6893 improve VnSearchbar & create tests 2024-03-27 11:14:54 +01:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor 2024-03-27 10:02:18 +00:00
Jorge Penadés 375461abd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 08:35:24 +01:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 08:30:37 +01:00
Jon Elias 6df1d0cf99 feat: #7130 added "served" field to RouteList table and added to the filter too. 2024-03-27 07:55:50 +01:00
carlosfonseca 081d4bf5fc Solucion a comentarios 4 2024-03-26 23:11:41 -05:00
carlosfonseca 1d37b91e09 Solucion a comentarios 3 2024-03-26 17:17:40 -05:00
William Buezas 0a74b2a96e QCalendar implementation WIP 2024-03-26 15:38:06 -03:00
Jon Elias 9f24f1f97c refactor: refs #6993 merged conflicts 2024-03-26 09:44:54 +01:00
Jon Elias 2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:35:23 +01:00
Jorge Penadés a0dcd6aee1 feat: refs #6893 replace id & redirect to Card or list 2024-03-26 09:11:53 +01:00
Jon Elias 50b116627b Merge branch '6993-HideAllPagination' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:10:00 +01:00
Jon Elias 4a7cb8fe8d refactor: refs #6993 fixed conflict 2024-03-26 09:09:58 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium 2024-03-26 08:55:01 +01:00
Jorge Penadés b46760116f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-26 08:34:15 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor 2024-03-26 06:41:39 +00:00
carlosfonseca 627d3bbe85 Se implementan las correcciones a los comentarios 2024-03-25 16:00:47 -05:00
Jorge Penadés 4216839d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-25 14:58:11 +01:00
William Buezas 5964189a83 Implement WorkerDateLabel 2024-03-25 10:41:10 -03:00
Kevin Martinez 5e089e616e Merge branch 'dev' into feature/worker-log 2024-03-25 12:00:06 +00:00
Alex Moreno c335accffb refs #6905 fix translation and warnings 2024-03-25 12:42:48 +01:00
Jon Elias 3e0f151570 refactor: refs #6988 fixed error 2024-03-25 12:36:50 +01:00
Alex Moreno fc5dbdfbb3 Merge branch 'dev' into 6971-MoveBtnToSubtoolbar 2024-03-25 10:48:12 +00:00
Jon Elias 84a25acf22 refactor: refs #6988 used global translations 2024-03-25 11:42:29 +01:00
Jon Elias 842fc3f98a Merge branch 'dev' into 6837-moveSearchById 2024-03-25 10:24:39 +00:00
Jon Elias b7b6d55d1c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor 2024-03-25 10:06:54 +01:00
Jon Elias bf0e2d3bf6 refactor: refs #6971 fixed request changes 2024-03-25 09:52:04 +01:00
Carlos Satorres 3ed3093fd9 Merge branch 'dev' into 6905-userPanelConfig 2024-03-25 08:50:42 +00:00
Alex Moreno bd51306fd9 Merge branch 'dev' into 6837-moveSearchById 2024-03-25 08:40:28 +00:00
Jon Elias a530e44179 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar 2024-03-25 09:26:45 +01:00
Jorge Penadés f49c091461 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-25 08:50:18 +01:00
Jorge Penadés 962c4edd92 Merge branch 'dev' into 6951-cloneTicket 2024-03-25 07:45:04 +00:00
Kevin Martinez 3d1e34a5b0 Create worker date label 2024-03-24 16:05:04 -03:00
William Buezas 71a4a20f20 Disable text area when is not himself 2024-03-22 18:38:18 -03:00
William Buezas 6f97ee1aeb improvements 2024-03-22 18:33:25 -03:00
William Buezas f1faf18523 General improvements 2024-03-22 14:10:00 -03:00
Jorge Penadés 2bb95fa568 rafactor: refs #6951 actions descriptor & update changelog 2024-03-22 16:31:10 +01:00
Jorge Penadés c911dc5cc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6951-cloneTicket 2024-03-22 15:39:10 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary 2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker 2024-03-22 08:30:54 -05:00
Jon Elias 4678085575 Merge branch 'dev' into 6837-moveSearchById 2024-03-22 12:48:30 +00:00