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

662 Commits

Author SHA1 Message Date
Javi Gallego 345e9532e6 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-03-12 16:16:29 +01:00
Jose Antonio Tubau 579b15e6d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8630-refactorRouteSectionsAndLocalizations 2025-03-12 08:33:50 +01:00
Alex Moreno 5cfeef5528 Merge branch 'dev' into 8630-refactorRouteSectionsAndLocalizations 2025-03-07 11:23:36 +00:00
Javi Gallego d1d4da1183 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-03-05 12:55:41 +01:00
Jose Antonio Tubau b4e3653453 Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket 2025-03-05 10:17:59 +00:00
Alex Moreno 966d59e52d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-05 11:17:10 +01:00
Jorge Penadés 5195e7bafc feat(SupplierList): refs #8718 add nickname alias to localization and update column filter 2025-03-04 15:02:03 +01:00
Javi Gallego bccda8fba6 refactor: refs #6802 replace salesPerson references with department in claims and tickets 2025-03-04 11:47:07 +01:00
Jose Antonio Tubau 8b370c4a50 feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor 2025-03-03 09:25:02 +01:00
Javi Gallego 05ff68624f Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-03-01 12:41:03 +01:00
Jose Antonio Tubau aa53b415dc Merge branch 'dev' of https: refs #8630//gitea.verdnatura.es/verdnatura/salix-front into 8630-refactorRouteSectionsAndLocalizations 2025-02-28 11:43:29 +01:00
Alex Moreno 29aade8c3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-28 11:11:17 +01:00
Carlos Satorres 518ec2f49b fix: refs #6553 workerBusiness v3 2025-02-28 10:32:09 +01:00
Javi Gallego 15ac8c36c7 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-27 07:52:12 +01:00
Jon Elias 87d25c55b4 Merge branch 'dev' into fix-workerSections 2025-02-26 11:28:51 +00:00
Javi Gallego 5506532095 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-26 08:47:12 +01:00
Jon Elias a99faf17bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 11:57:43 +01:00
Carlos Satorres 8fac1775b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix-workerSections 2025-02-25 09:54:26 +01:00
Alex Moreno c67ae3e17e Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" 
This reverts commit 223a1ea449.
 2025-02-25 09:53:02 +01:00
Carlos Satorres e1851d9b5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix-workerSections 2025-02-25 09:47:11 +01:00
Alex Moreno b9b5bd4c8a Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" 
This reverts commit 223a1ea449.
 2025-02-25 09:40:46 +01:00
Jon Elias c84225aed5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into Warmfix-AccountDescriptorMenu 2025-02-25 08:07:40 +01:00
Javier Segarra 223a1ea449 revert 1015acefb7 
revert Merge branch 'test' into master
 2025-02-24 15:52:21 +00:00
Jon Elias 7f1be98b74 fix: fixed account descriptor menu and created e2e 2025-02-24 16:20:28 +01:00
Carlos Satorres 471fd00d8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix-workerSections 2025-02-24 11:59:40 +01:00
Javi Gallego ef2f34c431 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-20 15:44:34 +01:00
Jose Antonio Tubau 5cc332cf5f Merge branch 'dev' into 8630-refactorRouteSectionsAndLocalizations 2025-02-20 08:14:24 +00:00
Alex Moreno ae0158d529 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-20 08:51:22 +01:00
Javier Segarra 874fbb48f5 feat: refactor canProceed 2025-02-19 22:16:02 +01:00
Jose Antonio Tubau a36d83547b refactor: refs #8630 add vehicle translations and enhance route list columns 2025-02-18 14:47:55 +01:00
PAU ROVIRA ROSALENY 88167d8c2d Merge branch 'dev' into 8497-travelAvailabled 2025-02-17 13:50:43 +00:00
PAU ROVIRA ROSALENY e2c4954a11 feat: refs #8497 added availabled on travel module 2025-02-17 14:49:46 +01:00
Guillermo Bonet e6f6577fc1 Merge branch 'test' into dev 2025-02-17 13:33:16 +01:00
Javier Segarra 3d7cb05661 fix: replace labels 2025-02-16 03:34:00 +01:00
Javi Gallego 2ff59b2ab2 feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations 2025-02-14 14:00:56 +01:00
Carlos Satorres 744d56e318 fix: fix sctions 2025-02-14 13:28:39 +01:00
Javi Gallego cb408636ff Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-14 09:52:24 +01:00
Pablo Natek 65e48f6194 feat: refs #6897 refactor VnColor and EntryList components; update FormModelPopup button visibility 2025-02-12 19:43:45 +01:00
Javi Gallego 520db66ac6 Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-12 08:03:32 +01:00
Pablo Natek 7b2240b01d Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor 2025-02-11 12:24:15 +01:00
Javier Segarra 4bd9e69bf1 Merge branch 'dev' into 6321_negative_tickets 2025-02-11 08:43:22 +00:00
Pablo Natek ce89d4a31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor 2025-02-11 08:15:30 +01:00
Javier Segarra cdf600cbd0 fix: replace i18n 2025-02-10 11:04:42 +01:00
Pablo Natek af2cbda077 Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor 2025-02-09 18:28:33 +01:00
Javier Segarra 63af730838 Merge branch 'dev' into 6321_negative_tickets 2025-02-07 21:42:21 +00:00
Javi Gallego 5a75a1551e Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos 2025-02-07 15:58:44 +01:00
Jorge Penadés d9897b3ea2 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-02-07 10:05:30 +01:00
Javier Segarra 14c7ec2e39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets 2025-02-07 07:54:21 +01:00
Alex Moreno 1a420abfb2 Merge branch 'dev' of https: refs #8322//gitea.verdnatura.es/verdnatura/salix-front into 8322-Supplier 2025-02-07 07:39:47 +01:00
Javier Segarra 220fb057e6 feat: refs #6321 requested changes 2025-02-06 18:00:18 +01:00