0
0
Fork 0
Commit Graph

9210 Commits

Author SHA1 Message Date
Alex Moreno ebdc835d97 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 14:41:55 +01:00
Alex Moreno bca84c54af fix: update filter in EntryCard to include route parameter 2025-03-26 14:19:09 +01:00
Alex Moreno 671d553e93 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 13:26:01 +01:00
Jon Elias bbcdb1c361 Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-26 11:22:56 +00:00
Jon Elias 97a143fa4d Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-26 10:21:23 +00:00
Benjamin Esteve c20dd788d9 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 09:45:10 +00:00
Jorge Penadés c3299d967b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-26 10:10:39 +01:00
Alex Moreno 1b280ef9fc refactor: rename cardDescriptor to vnDescriptor in localization files 2025-03-26 10:03:53 +01:00
Alex Moreno 4e83c31d35 feat: refs #6994 create ParkingDescriptorProxy to VnLog 2025-03-26 09:59:11 +01:00
Pablo Natek 1a1b399606 fix: move warning badge condition to the correct position in getBadgeAttrs function 2025-03-26 09:57:40 +01:00
Benjamin Esteve bd1a38fd0e Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 08:30:21 +00:00
Benjamin Esteve c85c84e50a Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 08:10:55 +00:00
Alex Moreno e4bb2938e2 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 08:07:23 +00:00
Alex Moreno 74b8bbc189 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 07:53:39 +00:00
Pablo Natek 117bc84ec9 Merge branch 'master' into ccRoundedFix 2025-03-26 07:42:47 +00:00
Benjamin Esteve ee0b5558ad Merge branch 'dev' into 8790-smsPredefinedText 2025-03-26 07:40:58 +00:00
Benjamin Esteve c35b8fa293 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 07:38:34 +00:00
Alex Moreno 209a3caac9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 08:32:00 +01:00
Alex Moreno bbc03ddcad fix: remove duplicated department selection from MonitorTicketFilter 2025-03-26 08:30:20 +01:00
Pablo Natek df396c08ea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into ccRoundedFix 2025-03-26 07:48:23 +01:00
Pablo Natek 02e29c167a feat: add rounded CC field to travel summary and translations 2025-03-26 07:46:39 +01:00
Alex Moreno 9666570cdd Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 06:29:21 +00:00
Alex Moreno be5550c31d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 07:22:36 +01:00
Jorge Penadés 73c6b7dea9 fix: refs #8388 update tooltip message in InvoiceInSummary to include total taxable base 2025-03-25 17:34:10 +01:00
Jorge Penadés 4e728cfa40 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-25 17:32:34 +01:00
Jon Elias dc34bc70ad Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-25 15:05:52 +00:00
Jon Elias ef3a2c0ee9 refactor: refs #7358 use location.hostname 2025-03-25 15:10:57 +01:00
Alex Moreno 492f77be08 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-25 13:44:34 +00:00
Jon Elias 611e65a353 Merge branch '7358-AddChipInNavbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7358-AddChipInNavbar 2025-03-25 14:20:40 +01:00
Jon Elias 90f6486fc1 refactor: refs #7358 use QBadge instead of QChip 2025-03-25 14:20:38 +01:00
Pablo Natek 31205d40d3 fix: update default DMS code and improve filter handling in various components 2025-03-25 14:01:29 +01:00
Benjamin Esteve 6e1a0266fd Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 12:45:43 +00:00
Benjamin Esteve 5bb5957a1f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:45:40 +00:00
Benjamin Esteve 15a55cfe26 Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 12:45:39 +00:00
Benjamin Esteve 70c0e9d1ff Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 12:31:26 +00:00
Benjamin Esteve b7a511f44e Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:31:23 +00:00
Benjamin Esteve 20b006e07b Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 12:31:18 +00:00
Jon Elias 8c870f177d fix: refs #8326 conflicts 2025-03-25 13:11:22 +01:00
Alex Moreno 63759d5b6c Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-25 12:06:13 +00:00
Alex Moreno 8bc68dd731 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-25 12:02:07 +00:00
Alex Moreno c451c90de4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-25 12:54:38 +01:00
Alex Moreno 77df2d40ec fix(VnLog): refs #6994 simplify value binding and improve descriptor handling 2025-03-25 12:51:21 +01:00
Alex Moreno 6dffa78235 fix(useDescriptorStore): correct file path for descriptor proxy imports 2025-03-25 12:47:43 +01:00
Benjamin Esteve 95b31dac4f Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 11:00:52 +00:00
Benjamin Esteve ec013d34d7 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 11:00:44 +00:00
Benjamin Esteve 2a3151b7ab Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 11:00:37 +00:00
Alex Moreno c0e9efc5d8 fix(useDescriptorStore): simplify async component import logic 2025-03-25 11:54:14 +01:00
Benjamin Esteve 693b4f30e2 Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 10:42:13 +00:00
Benjamin Esteve cf7765c5bb Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 10:41:54 +00:00
Benjamin Esteve 969963fd5a Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 10:41:23 +00:00