0
0
Fork 0
Commit Graph

12677 Commits

Author SHA1 Message Date
Pablo Natek 9f9f4555dc Merge pull request 'feat: refs #8638 add AWB field to travel and entry forms, update translations and styles' (!1620) from 8638-entryUpgradesForInvoiceInFixes into test
Reviewed-on: verdnatura/salix-front#1620
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 12:52:12 +00:00
Alex Moreno 0c67c31537 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-24 13:09:30 +01:00
Jorge Penadés ae228b7ed5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-hotfix-whereClause 2025-03-24 12:42:03 +01:00
Benjamin Esteve 3587be3997 refactor: refs #8790 update SMS delay message and localization keys 2025-03-24 12:41:40 +01:00
Jorge Penadés 798371682c feat: refs #6919 enhance filter in AccountSummary component to include entity ID 2025-03-24 12:39:40 +01:00
Benjamin Esteve 0cfbd7906d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText 2025-03-24 12:28:55 +01:00
Benjamin Esteve 15436d6dff Merge branch '8683-vnSelectSortByOptionLabel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-24 12:27:29 +01:00
Benjamin Esteve 259ac39d6d Merge branch 'dev' of https: refs #8683//gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-24 12:27:16 +01:00
Benjamin Esteve 43701bd586 refactor: refs #8118 simplify dropdown change event handling in ClaimSummary and TicketSummary components 2025-03-24 12:24:49 +01:00
Jorge Penadés 5591369ba1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-24 12:24:00 +01:00
Pablo Natek dd1ec72bee Merge branch 'test' into 8638-entryUpgradesForInvoiceInFixes 2025-03-24 11:19:25 +00:00
Benjamin Esteve 3c980a311a Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 12:09:08 +01:00
Benjamin Esteve b960dd776f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 12:09:02 +01:00
Benjamin Esteve 03e5e6387a Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-24 11:08:45 +00:00
Jon Elias 2143001c7c Merge branch '8326-UnifyCardTitles' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles 2025-03-24 12:08:27 +01:00
Jon Elias 53f6f5278f refactor: refs #8326 requested changes 2025-03-24 12:08:24 +01:00
Jose Antonio Tubau 9a786f3d4b Merge pull request 'test: refs #8621 add e2e tests for cmrList' (!1500) from 8621-createCmrListE2eTest into dev
Reviewed-on: verdnatura/salix-front#1500
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-03-24 11:08:04 +00:00
Benjamin Esteve 0cfda5e8f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 12:07:58 +01:00
Benjamin Esteve 658dc8af0e Merge branch '8790-smsPredefinedText' of https://gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText 2025-03-24 12:07:11 +01:00
Benjamin Esteve 01089497ad Merge branch 'dev' of https: refs #8790//gitea.verdnatura.es/verdnatura/salix-front into 8790-smsPredefinedText 2025-03-24 12:07:10 +01:00
Javier Segarra 344ea9353e Merge branch 'dev' into 8621-createCmrListE2eTest 2025-03-24 10:46:37 +00:00
Jorge Penadés c852f963e9 Merge pull request 'fix: refs #8581 update invoiceInSerial test to correctly compare totals after filtering' (!1625) from 8581-fixInvoiceInSerialE2e into dev
Reviewed-on: verdnatura/salix-front#1625
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 10:31:56 +00:00
Jorge Penadés 2fabff05be feat: refs #8388 add hasFile property handling in VnDms component 2025-03-24 11:15:59 +01:00
Jorge Penadés 028477ecbe feat: refs #8388 add hasFile prop to VnDms component 2025-03-24 11:12:15 +01:00
Jorge Penadés 97003e19ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-24 10:54:27 +01:00
Jorge Penadés 4caca33606 fix: refs #8581 update invoiceInSerial test to correctly compare totals after filtering 2025-03-24 10:44:01 +01:00
Javier Segarra d008b23bdc Merge pull request '#8779 - TicketList e2e inter' (!1624) from warmifx_ticketList_e2e into test
Reviewed-on: verdnatura/salix-front#1624
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2025-03-24 09:22:45 +00:00
Jorge Penadés 13c547dd6a Merge branch '8118-createComponentVnDropdown' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 10:02:37 +01:00
Jorge Penadés 56c5494bb2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8118-createComponentVnDropdown 2025-03-24 10:02:26 +01:00
Benjamin Esteve b850dfe36c Merge branch 'dev' into 8790-smsPredefinedText 2025-03-24 08:33:21 +00:00
Benjamin Esteve ac3bc5558d Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-24 08:33:00 +00:00
Benjamin Esteve a98a2012a2 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-24 08:32:44 +00:00
Alex Moreno 9ea935638b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-24 09:30:10 +01:00
Alex Moreno 61cc8f0813 fix: remove unused VnIconLink component from VnLog.vue 2025-03-24 09:30:09 +01:00
Javier Segarra 2bdebc1e0d test: waitSpinner() when load dialog 2025-03-24 09:27:35 +01:00
Jon Elias 072e4d4fa3 Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-24 08:25:13 +00:00
PAU ROVIRA ROSALENY 3fa0ff5b3d Merge branch 'dev' into 8237-defaultObservationType 2025-03-24 08:24:05 +00:00
Javier Segarra f9f331e566 Merge pull request '#8131 - Filter fields style equals' (!1598) from 8131-filer-style into dev
Reviewed-on: verdnatura/salix-front#1598
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-03-24 08:22:54 +00:00
PAU ROVIRA ROSALENY 933736e06b feat: refs #8237 changed observation type to be SalesPerson by default 2025-03-24 09:22:51 +01:00
Javier Segarra 0fd36279fd Merge branch 'dev' into 8131-filer-style 2025-03-24 08:01:49 +00:00
Benjamin Esteve d427d4f215 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-24 07:58:49 +00:00
Benjamin Esteve 700931714c Merge branch 'dev' into 8790-smsPredefinedText 2025-03-24 07:58:39 +00:00
Benjamin Esteve 4747314342 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-24 07:57:43 +00:00
Jose Antonio Tubau 76e24eb1cf Merge branch 'dev' into 8621-createCmrListE2eTest 2025-03-24 08:54:51 +01:00
Alex Moreno a788fb970a Merge pull request '#8463 - CardDescriptor_useCard' (!1597) from 8463-CardDescriptor_useCard into dev
Reviewed-on: verdnatura/salix-front#1597
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-03-24 07:47:48 +00:00
Benjamin Esteve add1ecea55 Merge branch 'dev' into 8790-smsPredefinedText 2025-03-24 07:45:01 +00:00
Benjamin Esteve c116804006 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-24 07:44:15 +00:00
Benjamin Esteve 16279518f7 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-24 07:44:02 +00:00
Javier Segarra 977bd7341d Merge branch 'dev' into 8131-filer-style 2025-03-24 07:38:18 +00:00
Alex Moreno 72753cf685 Merge branch 'dev' into 8463-CardDescriptor_useCard 2025-03-24 07:26:02 +00:00