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

855 Commits

Author SHA1 Message Date
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +02:00
William Buezas d2e178a41b resolve conflicts 2024-05-02 12:02:44 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:42:46 +00:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries 2024-05-02 14:34:54 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Javier Segarra ef63d0cb6a Merge remote-tracking branch 'origin/dev' into feature/ItemTax 2024-05-02 10:25:49 +02:00
Javier Segarra cd5389fb91 fix: i18n 2024-05-02 10:25:46 +02:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia 2024-05-02 07:44:20 +00:00
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -03:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors 2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
William Buezas 0b5aea76d9 Move translations 2024-04-29 09:39:04 -03:00
Javier Segarra 2f55272df7 fix: WorkerDescriptor 2024-04-29 11:23:50 +02:00
Javier Segarra 34c8874468 fix: i18n 2024-04-29 10:17:18 +02:00
Jon Elias b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration 2024-04-29 07:51:16 +00:00
Jon Elias 6ae38d2611 refactor: refs #6887 pending claim changes 2024-04-29 09:49:06 +02:00
William Buezas cf193b07c5 Item tax 2024-04-26 08:02:17 -03:00
Javier Segarra 2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1 2024-04-26 12:50:46 +02:00
Javier Segarra 94a948c933 fix: add socialName 2024-04-26 12:29:55 +02:00
Javier Segarra 7831a69aa9 fix: i18n and icon class 2024-04-26 11:03:40 +02:00
Javier Segarra 33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-26 07:47:24 +00:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 09:28:40 +02:00
Javier Segarra 3c033458d3 fix: minor changes 2024-04-26 09:02:51 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection 2024-04-26 06:58:53 +00:00
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 2024-04-26 08:34:05 +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 b4e3157887 feat #7271 i18n 2024-04-25 14:28:06 +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
William Buezas 726699bbc5 Item log 2024-04-24 10:38:00 -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 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
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 12:15:34 +02:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 06:25:14 +00: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
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
Pablo Natek 663c093a00 feat: refs #4988 agency e2e 2024-04-22 18:17:01 +02:00
William Buezas 78561c5f42 Item types 2024-04-22 08:34:38 -03:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-22 07:38:07 +02:00
William Buezas 9212e53905 resolve conflicts 2024-04-19 12:48:07 -03:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Javier Segarra fb26219354 refs #7190 feat: useTokenConfig 2024-04-19 12:09:04 +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
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys 2024-04-18 13:14:23 -03:00
William Buezas 5f01e5c705 change es translations 2024-04-18 09:09:22 -03:00
William Buezas 5addd0056d Add filter panel 2024-04-17 17:18:38 -03: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
William Buezas da06e7bc87 WIP 2024-04-17 08:13:34 -03: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
William Buezas ba2499db9d resolve conflicts 2024-04-16 12:11:57 -03:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00: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
Jon Elias b216112d2a refactor: refs #6425 fix failed tests 2024-04-16 11:42:43 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations 2024-04-16 11:00:38 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03: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
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design 2024-04-15 12:28:43 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -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 f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar 2024-04-12 08:13:58 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts 2024-04-12 11:44:56 +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
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
William Buezas 4a0ae8aa45 Item summary 2024-04-10 17:18:57 -03: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 c881fe6577 Resolve conflicts 2024-04-10 09:19:54 -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 c3835dfd7a resolve conflicts 2024-04-09 15:23:05 -03:00
William Buezas 0144aab7a5 Mini fix 2024-04-09 08:51:00 -03: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
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00: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
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup 2024-04-08 05:18:34 +00: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 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
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim 2024-04-04 14:12:16 +02:00
Javier Segarra 0ad722381e #6425 fix quotes in yml file 2024-04-04 13:38:25 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Jon Elias 94b177c9a2 fix: refs #6425 fix yml format 2024-04-03 14:33:47 +02: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
William Buezas fc87bb8293 Add page title name 2024-04-02 13:04:28 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier 2024-03-28 07:17:28 +00:00
William Buezas 37465ffa4a resolve conflicts 2024-03-27 11:23:54 -03:00
William Buezas b546b63352 resolve conflicts 2024-03-27 10:11:20 -03:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor 2024-03-27 10:02:18 +00: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
William Buezas 0a74b2a96e QCalendar implementation WIP 2024-03-26 15:38:06 -03:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium 2024-03-26 08:55:01 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor 2024-03-26 06:41:39 +00: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
Jon Elias 84a25acf22 refactor: refs #6988 used global translations 2024-03-25 11:42:29 +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
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-22 10:17:36 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-21 15:31:15 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Jon Elias 7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-03-21 12:23:45 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal 2024-03-21 12:14:54 +01:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log 2024-03-21 08:01:57 -03:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker 2024-03-20 16:55:09 +00:00
Carlos Satorres 798ffa7de3 refs #6905 fix 2024-03-20 10:20:05 +01:00
Carlos Satorres 0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-20 09:38:14 +01:00
Carlos Satorres 89fc147ad8 refs #6905 fix traduction 2024-03-20 09:38:11 +01:00
Kevin Martinez cf25476a5d Create worker log 2024-03-18 21:04:52 -03:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx 2024-03-18 08:39:10 -05:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER 2024-03-15 03:12:46 +00:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
William Buezas 6baaebf6bd WIP 2024-03-14 09:48:04 -03:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
 2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER 2024-03-14 10:55:02 +00:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 08:54:21 +01:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
William Buezas 4925bed845 resolve conflicts 2024-03-13 11:31:55 -03:00
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales 2024-03-13 15:06:02 +01:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
carlosfonseca 38d3d49ecb Solucion a comentarios 34 2024-03-12 16:24:27 -05:00
William Buezas bd5eb1a1c3 remove assignPDA translation 2024-03-12 11:34:38 -03:00
William Buezas 632049c13b Assign button change 2024-03-12 11:31:32 -03:00
William Buezas dad2711311 fix translation 2024-03-12 08:13:27 -03:00
William Buezas 029fc043de Change title translation 2024-03-12 08:08:20 -03:00
William Buezas 319295f2c2 Workers PDA 2024-03-11 16:53:33 -03:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-11 09:32:30 +01:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-07 15:57:54 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/components/ui/VnPaginate.vue
 2024-03-06 23:19:47 -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
William Buezas 992ada0984 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-05 18:21:00 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres adc290da6d refs #6935 restyle card 2024-03-04 12:26:14 +01:00
Jorge Penadés b5edc98732 fix: refs #5186 add all fields basic data & summary 2024-03-01 12:12:44 +01:00
Jorge Penadés c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-02-29 15:52:43 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module 
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
 2024-02-28 21:27:01 -03:00
William Buezas a0f9c811ff resolve conflicts 2024-02-28 12:56:13 -03:00
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-27 08:23:02 +01:00
Alex Moreno c8a4854df9 refs #5509 fix(vnDms): fix issues 2024-02-27 08:22:38 +01:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
Alex Moreno 4988df882c refs #5509 fix: transaltions 2024-02-26 15:06:49 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList 2024-02-26 14:17:02 +01:00
Kevin Martinez 185de3c931 Add roadmap stops 2024-02-23 00:46:57 -03:00
William Buezas 1b67b7ab36 Customer description corrections and creation of tickets create view 2024-02-22 10:38:15 -03:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-22 09:11:36 +01:00
Jorge Penadés 1af5b270a0 fear: refs #5186 WIP parking section 2024-02-21 10:26:20 +01:00
carlosfonseca 01d68734b6 Correccion de conflictos 2024-02-20 12:15:27 -05:00
Kevin Martinez 616d8519fa Fix translations 2024-02-20 08:14:31 -03:00
Kevin Martinez 0a03ef69ea Create roadmap basic data page 2024-02-20 08:00:17 -03:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
Kevin Martinez 45d7b021a6 Create roadmap create page 2024-02-20 07:58:14 -03:00
Kevin Martinez 8ffa3b7626 Create roadmap list page 2024-02-20 07:57:59 -03:00
Kevin Martinez e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00
Kevin Martinez 988362ab69 Fix route ticket sms event 2024-02-19 10:02:48 -03:00
Kevin Martinez 76dd84fd87 Create route logs 2024-02-19 09:58:33 -03:00
Kevin Martinez 67f862ebe3 Create route tickets 2024-02-19 09:57:49 -03:00
carlosfonseca bb10714824 Solucion a comentarios 13 2024-02-19 05:24:26 -05:00
carlosfonseca d0cf13d0af Solucion a comentarios 12 2024-02-16 13:29:36 -05:00
carlosfonseca ebd1ee07f4 Solucion a comentarios 11 2024-02-16 13:12:57 -05:00
William Buezas 2f08b64215 merge with dev 2024-02-15 09:20:28 -03:00
carlosfonseca ab20ec1738 Solucion a comentarios 8 2024-02-14 12:21:00 -05:00
carlosfonseca c0a9835e80 Solucion a comentarios 5 2024-02-12 20:37:51 -05:00
carlosfonseca 3cf3687b84 Correccion de comentarios3 2024-02-12 13:54:17 -05:00
Carlos Satorres 7aab50ffff Merge branch 'dev' into 6795-claimRefact 2024-02-12 16:46:51 +00:00
Alex Moreno aa4d5bffc3 refs #5509 feat: VnDms & VnDmsList 2024-02-12 15:06:20 +01:00
William Buezas df620566ef Invoice out globals corrections 2024-02-12 08:11:44 -03:00
Alex Moreno cb6ba483d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 14:43:50 +01:00
William Buezas 399f47b17c merge with salix-front dev branch and resolve conflicts 2024-02-09 08:59:46 -03:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Carlos Satorres d13bf60ea3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact 2024-02-09 09:08:56 +01:00
William Buezas c67f4cf858 Thermograph create form and general improvements 2024-02-08 23:30:08 -03:00
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 17:30:47 +00:00
Carlos Satorres 2f081841f9 refs #6795 fix claims 2024-02-08 13:59:37 +01:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
 2024-02-07 22:38:57 -03:00
Jorge Penadés c162f34ee5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:23 +01:00
William Buezas 018f251f3d small improvements 2024-02-06 15:00:25 -03:00
William Buezas 087d22e77d Mejoras y cosas faltantes 2024-02-06 14:10:52 -03:00
William Buezas 0ff70a378d Travel termographs and general improvements 2024-02-06 14:08:44 -03:00
William Buezas 7b542dc3bb WIP 2024-02-06 14:06:24 -03:00
William Buezas c9bd3d413a Travel termographs WIP 2024-02-06 14:06:15 -03:00
William Buezas 71e2cdebe4 WIP 2024-02-06 14:05:57 -03:00
William Buezas f6b0404cb4 multiple changes 2024-02-06 08:33:06 -03:00
Alex Moreno 7b68f15781 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-05 12:54:58 +01:00
William Buezas 248e02f530 WIP 2024-02-05 08:25:35 -03:00
William Buezas a88b1137dc Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2024-02-02 14:11:36 -03:00
William Buezas dc554f03d0 merge with salix-front dev 2024-02-02 14:11:12 -03:00
William Buezas 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
Jorge Penadés 3d6f9f9dd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-02 14:06:34 +01:00
Alex Moreno e1e5bbccc6 Merge branch 'dev' into 5834_billingDataSwift 2024-02-02 07:18:04 +00:00
William Buezas aa40a3b0f5 resolve conflicts with dev 2024-01-31 11:27:08 -03:00
carlosfonseca 7b3ff319d4 Desarrollo de tarjetas varias en el modulo de clientes en el summary 2024-01-31 07:32:34 -05:00
Javier Segarra f3e7d8ceb1 refs #5834 feat: i18n 2024-01-31 08:54:49 +01:00
William Buezas 3cfef87efb upload file form WIP 2024-01-30 21:54:14 -03:00
William Buezas b440545ac9 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TravelSubmodules 2024-01-29 16:33:56 -03:00
William Buezas 6096123c6e Mejoras y cosas faltantes 2024-01-29 16:33:39 -03:00
William Buezas f911a644e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-29 12:40:25 -03:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard 2024-01-29 13:59:51 +00:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
William Buezas 8cc92f127c merge with dev 2024-01-27 16:10:15 -03:00
William Buezas 9757fdf70a Travel termographs and general improvements 2024-01-27 16:08:02 -03:00
William Buezas a01b80703e Create child submodules feature 2024-01-27 12:08:56 -03:00
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00
William Buezas 93a4409c26 More entries corrections 2024-01-25 16:24:32 -03:00
William Buezas c43e7011a4 WIP 2024-01-25 08:53:24 -03:00
William Buezas 0c385d9a6f WIP 2024-01-22 11:22:22 -03:00
Carlos Satorres b226e59228 refs #6339 tests 2024-01-22 11:39:13 +01:00
William Buezas a888472ad2 Fix tooltip label in supplier agency term 2024-01-19 11:34:07 -03:00
William Buezas 5d0290f585 Fix QFile label translation in entry buys 2024-01-19 11:29:43 -03:00
William Buezas 1c689ce966 Travel termographs WIP 2024-01-19 09:24:57 -03:00
William Buezas d4a89895b4 WIP 2024-01-18 11:19:23 -03:00
William Buezas f66af0e663 Merge pull request 'Create Route module' (#73) from feature/routes into dev 
Reviewed-on: hyervoni/salix-front-mindshore#73
 2024-01-18 13:22:20 +00:00
Kevin Martinez 661e9d4368 Create route summary 2024-01-18 08:45:41 -04:00
Carlos Satorres 339d6609aa refs #6339 clipboard 2024-01-18 13:33:14 +01:00
William Buezas 553dfceca8 Merge pull request 'feature/ApplyFilterSectionToEntryList' (#76) from feature/ApplyFilterSectionToEntryList into dev 
Reviewed-on: hyervoni/salix-front-mindshore#76
 2024-01-18 12:22:47 +00:00
William Buezas 161bfab443 Add subfilter to entry list view and entry descriptor improvements 2024-01-18 08:58:04 -03:00
William Buezas d818dd745a merge with dev and resolve conflicts 2024-01-17 17:37:12 -03:00
William Buezas 3671a7b449 Entry descriptor 2024-01-17 10:45:58 -03:00
Kevin Martinez a68f53d9f7 Add route form 2024-01-17 09:04:10 -04:00
William Buezas e6c59866d1 Entry notes submodule 2024-01-17 08:15:55 -03:00
William Buezas 64a4a800f7 Entry buys import 2024-01-16 16:11:23 -03:00
William Buezas 596904c4f8 Entry submodules: Log, Basic data, Buys (WIP) 2024-01-16 13:26:12 -03:00
William Buezas 129cacb88b Merge pull request 'feature/ms-115-EntryListView' (#68) from feature/ms-115-EntryListView into dev 
Reviewed-on: hyervoni/salix-front-mindshore#68
 2024-01-14 23:57:12 +00:00
William Buezas f64ac5c70d Entry summary 2024-01-12 17:02:52 -03:00
Kevin Martinez 3d98bf578e Create route list 2024-01-12 10:03:18 -04:00
William Buezas 2b6faf8186 merge with dev 2024-01-11 14:59:18 -03:00
William Buezas 627226d3cd Entry list 2024-01-11 14:58:22 -03:00
William Buezas 19d793a939 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-11 09:33:22 -03:00
Alex Moreno bc46435299 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-11 12:09:16 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
William Buezas 53a832ae6a supplier consumption submodule 2024-01-10 09:54:23 -03:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01:00
William Buezas 5511e365aa WIP 2024-01-09 10:46:27 -03:00
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-09 07:47:55 +01:00
William Buezas 865a13aafa Submodulos de suppliers: Accounts, Contacts y Addresses 2024-01-08 16:16:42 -03:00
William Buezas 8a2a6fe1c9 Cambiar traducción de fiscalData 2024-01-08 11:51:20 -03:00
William Buezas 473e96ffb4 wip 2024-01-08 11:32:42 -03:00
Pablo Natek eca2413630 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-08 07:23:28 +00:00
Alex Moreno 741ce4c274 refs #6062 fix: invoiceOuts translation 2024-01-08 08:00:06 +01:00
William Buezas edb1c1c71a Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SupplierSubmodules 2024-01-05 08:27:23 -03:00
Pablo Natek 11a37b7716 Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-04 14:47:46 +00:00
William Buezas 3ba4e56204 merge with dev 2024-01-04 11:19:40 -03:00
carlosfonseca ead8bb4992 Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas 2024-01-03 14:53:01 -05:00
Kevin Martinez 733baa1310 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
 2024-01-03 06:51:38 -04:00
Jorge Penadés a1b6698819 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-01-03 11:34:07 +01:00
Javier Segarra e05a49e7b7 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-03 08:22:20 +00:00
Javier Segarra b00b2941c7 refs #6098 perf: define locale equivalences in i18n folder 2024-01-03 09:18:35 +01:00
Javier Segarra ac660fadd7 refs #6098 feat: add translate for copyToken 2024-01-03 09:17:28 +01:00
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03:00
carlosfonseca 677660f5cc Se hacen maquetado general de menu izquierdo en summary de clientes 2024-01-02 06:54:15 -05:00
William Buezas 9b9ac4dfe1 PR fixes 2024-01-02 08:47:38 -03:00
William Buezas a2c96d276e Supplier Basic data, Billing data and Fiscal data 2024-01-02 08:17:04 -03:00
carlosfonseca 31467a2bef Correccion de conflicto 2024-01-02 03:17:23 -05:00
William Buezas d476d504e1 Merge pull request 'Extended List big modifications and column add column filter component' (#48) from feature/ms-100-ExtendedListColumnFilter into dev 
Reviewed-on: hyervoni/salix-front-mindshore#48
 2023-12-31 01:17:18 +00:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
William Buezas 8b24ac9fe4 change suppliers submodules titles casing 2023-12-29 14:43:20 -03:00
William Buezas 2edaf71e40 change suppliers submodules titles casing 2023-12-29 14:19:44 -03:00
William Buezas c4c344f07a Add descriptor and submodules to supplier card left menu 2023-12-29 14:00:32 -03:00
William Buezas 1ab31a1e51 Extended List big modifications and column add column filter component 2023-12-29 11:08:11 -03:00
carlosfonseca 9ede2912f3 Correccion, elimine sin darme cuenta 2023-12-28 10:36:47 -05:00
carlosfonseca eebefca919 Correccion de conflictos 2023-12-28 10:31:15 -05:00
carlosfonseca 5729204a3b Se crea tabla y filtros de morosos en clientes 2023-12-28 10:25:23 -05:00
William Buezas 59e2e20827 Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev 
Reviewed-on: hyervoni/salix-front-mindshore#45
 2023-12-28 15:07:33 +00:00
Jorge Penadés 232827ef48 WIP: corrective section created: refs #4466 2023-12-28 16:02:04 +01:00
Kevin Martinez 4de1b52c30 Implement orders no results 2023-12-27 08:08:19 -04:00
Kevin Martinez b22fcddcd3 Create order lines 2023-12-26 17:45:54 -04:00
William Buezas 893b1bb4c8 Add department basic data 2023-12-26 16:15:46 -03:00
Carlos Fonseca 5e1e49e253 Merge pull request 'Se crea tabla de notificaciones, tarjeta por identificador y filtros' (#44) from features/ms_93_customer_notifications_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#44
 2023-12-26 13:56:09 +00:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
carlosfonseca 899b9536b6 Se crea tabla de notificaciones, tarjeta por identificador y filtros 2023-12-22 08:29:21 -05:00
William Buezas 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03:00
Kevin Martinez 36344d112b Create order volume 2023-12-22 00:34:18 -04:00
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms 2023-12-21 18:59:13 +01:00
Kevin Martinez bcfb34475b Merge branch 'dev' into feature/order 2023-12-20 13:58:51 -04:00
Carlos Fonseca 19ab09ee08 Merge pull request 'Se crea tabla y filtros de extended list' (#37) from features/ms_64_extended_list into dev 
Reviewed-on: hyervoni/salix-front-mindshore#37
 2023-12-20 17:16:16 +00:00
Jorge Penadés f3a1800cb0 fix breadcrumbs & header: refs #5835 2023-12-20 15:43:09 +01:00
Kevin Martinez 612fe9d605 Add translation 2023-12-19 09:58:18 -04:00
Kevin Martinez a65db2f4cf Create order catalog section 2023-12-19 09:15:54 -04:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
William Buezas d309f04a8f Merge with dev 2023-12-18 12:00:26 -03:00
carlosfonseca b34a5f1d89 Se crea tabla y filtros de extended list 2023-12-18 09:41:10 -05:00
William Buezas 0b80e8cacc Add left menu to travel card 2023-12-14 08:42:52 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
 2023-12-14 07:08:58 -04:00
William Buezas 2eac632b32 resolve conflicts 2023-12-13 13:44:25 -03:00
Alex Moreno a149928015 refs #6062 fix: invoiceIn translation 2023-12-13 14:44:56 +01:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
William Buezas cded128c4c WIP 2023-12-12 08:45:08 -03:00
Jorge Penadés 2c5dc276b2 refs #5835 2023-12-12 09:01:32 +01:00
Kevin Martinez 9a477c2c25 Create order page 2023-12-11 10:47:16 -04:00
Jorge Penadés 61955268f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 12:36:07 +01:00
Jorge Penadés ea12508fff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-11 08:27:07 +01:00
William Buezas ec9e8ec4e0 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2023-12-07 14:54:58 -03:00
William Buezas d91c6ff11f new requested changes 2023-12-07 14:54:53 -03:00
Kevin Martinez 4fd2b05137 Fix shelving pages 2023-12-07 13:33:11 -04:00
Jorge Penadés 479c782492 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-12-07 16:25:13 +01:00
Jorge Penadés 97789f2cdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-12-07 15:51:58 +01:00
Jorge Penadés 2f63a7f1fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-12-07 15:49:53 +01:00
William Buezas f8031734fa resolve conflicts 2023-12-05 12:27:53 -03:00
William Buezas e64960d234 Extra community 2023-12-05 12:25:25 -03:00
carlosfonseca ce72b52e88 Reubicacion de textos i18n a global 2023-12-04 12:54:40 -05:00
Jorge Penadés b43985b9db refs #5835 refactor 2023-12-04 15:26:19 +01:00
Jorge Penadés a3d6275b2f refs #6545 counters created 2023-12-04 10:38:35 +01:00
William Buezas 9b6ec56011 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ms-23-ExtraCommunity 2023-12-01 09:42:47 -03:00
Kevin Martinez f6067a6803 Merge branch 'dev' into feature/shelving 2023-12-01 08:25:47 -03:00
William Buezas dc29c51cf4 merge with dev 2023-12-01 08:17:47 -03:00
Kevin Martinez 11a029289b Merge branch 'dev' into feature/shelving 2023-12-01 08:16:17 -03:00
William Buezas 5bab462aa4 New general improvements 2023-11-30 17:46:07 -03:00
Kevin Martinez 524e89319e Implement shelving logs 2023-11-30 15:57:54 -03:00
carlosfonseca 820ebe00af Se cambia nombre y se implementa en todos los componentes 2023-11-30 11:37:42 -05:00
William Buezas db81ab8acf Cambios solicitados 2023-11-29 14:21:26 -03:00
William Buezas 62a806b813 WIP 2023-11-29 09:07:44 -03:00
Kevin Martinez 008dfd1be8 Fix merge conflicts 2023-11-28 11:58:42 -03:00
Carlos Fonseca cc79d699f6 Merge pull request 'Add csv download feature and add descriptors' (#15) from feature/ms-29-NegativeBasesDetails into dev 
Reviewed-on: hyervoni/salix-front-mindshore#15
 2023-11-28 13:26:38 +00:00
William Buezas 7646934431 Add csv download feature and add descriptors 2023-11-28 10:11:24 -03:00
Jorge Penadés 0282f8dde8 refs #5835 rate fixed & options descriptor created 2023-11-28 12:05:39 +01:00
Kevin Martinez d65f331d1f Merge branch 'dev' into feature/ms-18-shelving-list 2023-11-28 00:16:37 -03:00
William Buezas c1c0dbf1f8 Details 2023-11-27 18:11:06 -03:00
William Buezas df599f1e8d add header options menu in travel summary 2023-11-25 21:19:22 -03:00
William Buezas 4eb57ab90e resolve conflicts when pulling dev 2023-11-25 20:04:20 -03:00
William Buezas e8b1d0fe7e travel WIP 2023-11-25 19:02:26 -03:00
Jorge Penadés bc2256a021 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-migrateInvoiceIn 2023-11-24 09:25:29 +01:00
Kevin Martinez bffe6b0664 Add create shelving page 2023-11-23 20:27:06 -03:00
Kevin Martinez 8e0ee45901 Create Shelving list module 
Adds shelving list, preview and update
 2023-11-23 01:17:23 -03:00
William Buezas d0cb96ce23 merge with dev 2023-11-22 15:26:59 -03:00
William Buezas 78a5c3895e resolve conflict 2023-11-22 15:19:37 -03:00
William Buezas 14788b7f7c Suppliers list and suppliers create view 2023-11-22 15:05:12 -03:00
Carlos Fonseca 199bf3fdda Merge pull request 'Se hacen las mejoras en las tarjetas y menu lateral' (#5) from features/ms_15_mejoras_tarjeta_buscador into dev 
Reviewed-on: hyervoni/salix-front-mindshore#5
 2023-11-22 15:35:34 +00:00
carlosfonseca 737d3020fe Se hacen las mejoras en las tarjetas y menu lateral 2023-11-22 09:33:47 -05:00
Joel Crespo 010ddd01a6 fix i18n headers 2023-11-22 07:32:20 -03:00
Joel Crespo 5246427e8d The negative bases view was created for issued invoices. 2023-11-22 07:15:07 -03:00
William Buezas c3b9f013f6 form integration and view content 2023-11-20 14:58:41 -03:00
Joel Crespo 97f732d3cf wip 2023-11-20 13:06:14 -03:00
William Buezas 505052d84d [WIP] global invoices 2023-11-16 16:44:35 -03:00
Jorge Penadés 46ee2a0075 ref #5835 fix test 2023-11-09 13:26:03 +01:00
Jorge Penadés c31b4fa770 ref #5835 e2e & unit tests done 2023-11-09 10:29:28 +01:00
Carlos Satorres 08060d276a refs #6157 fix arraydata, and internal error 2023-11-03 13:41:10 +01:00
Jorge Penadés 112e057cfa ref #5835 invoiceIn created 2023-10-31 08:56:51 +01:00
Jorge Penadés 3e5c079c00 ref #6104 merge confilcts 2023-10-30 16:20:31 +01:00
Carlos Satorres 6dc1767b56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-19 14:00:03 +02:00
Carlos Satorres f230fcbca2 refs #6157 claimAction 2023-10-17 17:32:47 +02:00
Alex Moreno 468ed95702 refs #6067 feat: add transalation 2023-10-02 14:58:42 +02:00
Jorge Penadés dd09683802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-29 08:30:42 +02:00
Jorge Penadés d0de690dc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-09-28 13:55:38 +02:00
Jorge Penadés 36a0f36f8a ref #6104 fix conflicts 2023-09-27 14:05:37 +02:00
Alex Moreno 149e611ae3 Merge branch 'dev' into 5673-claim-development 2023-09-26 12:59:46 +00:00
Jorge Penadés 79fc503a01 ref #6104 recreate vnlog 2023-09-18 14:35:21 +02:00
Guillermo Bonet 394a7f7bb7 Merge branch 'master' into 5995-improvedExternalCmr 2023-09-18 05:17:30 +00:00
Guillermo Bonet 71c6b865b6 refs #5995 Improved external CMR 2023-09-01 12:11:56 +02:00
Jorge Penadés 3a3ae14dc5 ref #6175 VnLinkPhone and MicroSIP icon created 2023-08-31 09:05:21 +02:00
Guillermo Bonet 6786ac97e4 refs #5995 Improved external CMR 2023-08-30 12:53:18 +02:00
Alex Moreno a09b4ff548 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 10:48:27 +02:00
Jorge Penadés 330db88ccc refs #6105 replaced css by QuasarComponents 2023-08-24 14:56:26 +02:00
Alex Moreno 6c8329ec53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-18 09:01:04 +02:00
Alex Moreno a307486fcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-17 09:01:07 +02:00
Jorge Penadés b7e9aee1d5 refs 5987 var-colors 2023-08-17 08:50:10 +02:00
Alex Moreno 4207e564be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-14 14:17:52 +02:00
Alex Moreno c64ae1ccee refs #5990 feat(summarys): redesigned 2023-08-14 13:52:25 +02:00
Jorge Penadés 4318641bc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5987-redisgnCards 2023-08-11 08:11:22 +02:00
Guillermo Bonet 96cfea8a41 Merge branch 'test' into dev 2023-08-11 07:48:25 +02:00
Guillermo Bonet e875dcb064 refs #5995 Bug i18n fixed 2023-08-11 06:28:38 +02:00
Jorge Penadés a194ec745b refs 5987 index cards and light mode 2023-08-10 13:20:32 +02:00
Alex Moreno d9dd0a4931 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2023-08-10 11:02:36 +02:00
Alex Moreno 13dc57a89c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2023-08-10 11:00:35 +02:00
Guillermo Bonet 9f29a64d4a refs #5995 Changed transitions 2023-08-10 08:37:15 +02:00