0
0
Fork 0
Commit Graph

12668 Commits

Author SHA1 Message Date
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
Javier Segarra ed95f0fad9 Merge pull request 'Add serve comand in README.md' (!1635) from update_readme into dev
Reviewed-on: verdnatura/salix-front#1635
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 15:00:42 +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
Javier Segarra 77543ff690 Merge branch 'dev' into update_readme 2025-03-25 13:40:28 +00:00
Pablo Natek 77f0e7b492 Merge pull request 'fix: update default DMS code and improve filter handling in various components' (!1637) from someHotFixes into master
Reviewed-on: verdnatura/salix-front#1637
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 13:32:41 +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
Alex Moreno a6bd91c918 Merge pull request 'refactor: refs #8683 enhance sorting logic in VnSelect component' (!1522) from 8683-vnSelectSortByOptionLabel into dev
Reviewed-on: verdnatura/salix-front#1522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 13:14:59 +00: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 1e5932882c Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 12:45:41 +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
Jon Elias f5bbada06b Merge pull request '#8326 Unify card names' (!1518) from 8326-UnifyCardTitles into dev
Reviewed-on: verdnatura/salix-front#1518
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 12:43:44 +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 55d6784987 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 12:31:20 +00:00
Benjamin Esteve 20b006e07b Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 12:31:18 +00:00
Jon Elias b4c467960e Merge branch '8326-UnifyCardTitles' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles 2025-03-25 13:11:23 +01: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 298f99a175 Merge branch 'dev' into update_readme 2025-03-25 12:04:24 +00:00
Alex Moreno f01aa32be7 Merge branch 'dev' into 8772-align_linkPhone 2025-03-25 12:03:19 +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
Javier Segarra 79e6530d39 docs: add production serving instructions to README 2025-03-25 12:23:49 +01:00
Benjamin Esteve 95b31dac4f Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 11:00:52 +00:00
Benjamin Esteve 97ed21f250 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 11:00:51 +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 75f31871d1 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 10:41:32 +00:00
Benjamin Esteve 969963fd5a Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 10:41:23 +00:00
Javier Segarra a519014685 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front 2025-03-25 11:41:07 +01:00
Javier Segarra af5a850311 fix: remove create prop departmentFk 2025-03-25 11:41:04 +01:00
Alex Moreno 9446202dee fix: update file path in useDescriptorStore to remove leading slash 2025-03-25 11:30:09 +01:00
Benjamin Esteve 710aeb1ac2 Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 10:12:56 +00:00
Benjamin Esteve acd7539ee7 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 10:12:44 +00:00
Benjamin Esteve 44ec056cfa Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 10:12:41 +00:00
Alex Moreno 4631c8717f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 10:09:34 +00:00
Carlos Andrés 68e37aca9f Merge pull request 'feat: refs #8529 invoiceIn move deductible field from head to lines' (!1399) from 8529-InvoiceIn-deductible-TAX-lines into dev
Reviewed-on: verdnatura/salix-front#1399
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-03-25 09:50:59 +00:00
Javier Segarra aa869f2bd8 Merge pull request 'HOTFIX: use store instead formData' (!1634) from hotfix_ticket_basicdata into master
Reviewed-on: verdnatura/salix-front#1634
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-25 09:22:33 +00:00
Carlos Andrés e3926cd7c0 Merge branch 'dev' into 8529-InvoiceIn-deductible-TAX-lines 2025-03-25 09:17:31 +00:00
Javier Segarra 0014356b33 fix: use store instead formData 2025-03-25 10:08:58 +01:00