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

12508 Commits

Author SHA1 Message Date
Benjamin Esteve 5bb5957a1f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:45:40 +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 b7a511f44e Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:31:23 +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 c451c90de4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-25 12:54:38 +01:00
Alex Moreno 6dffa78235 fix(useDescriptorStore): correct file path for descriptor proxy imports 2025-03-25 12:47:43 +01:00
Benjamin Esteve ec013d34d7 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 11:00:44 +00:00
Alex Moreno c0e9efc5d8 fix(useDescriptorStore): simplify async component import logic 2025-03-25 11:54:14 +01:00
Benjamin Esteve cf7765c5bb Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 10:41:54 +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
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
Benjamin Esteve 69138f9cf7 Merge branch '8683-vnSelectSortByOptionLabel' of https: refs #8683//gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-25 10:02:15 +01:00
Benjamin Esteve af04dd64e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8683-vnSelectSortByOptionLabel 2025-03-25 10:01:50 +01:00
Benjamin Esteve b7376648cf Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 08:45:00 +00:00
Jon Elias 96c0739af8 Merge branch 'dev' into 8326-UnifyCardTitles 2025-03-25 08:23:49 +00:00
Alex Moreno cd0a79b444 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-25 08:49:13 +01:00
Benjamin Esteve c83fc01847 Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 07:46:50 +00:00
Alex Moreno ca4e02a2bf chore: update changelog 2025-03-25 08:39:19 +01:00
Alex Moreno be44ba939a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-25 08:13:25 +01:00
Alex Moreno c6b36a64cb Merge pull request 'fix: refs #8602 disable use-like option in EntryBuys component' (!1632) from 8602-warmFix into test 
Reviewed-on: verdnatura/salix-front#1632
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 06:36:22 +00:00
PAU ROVIRA ROSALENY 97ceffc96c Merge pull request 'feat: #8237 changed observation type to be SalesPerson by default' (!1623) from 8237-defaultObservationType into dev 
Reviewed-on: verdnatura/salix-front#1623
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-25 06:16:16 +00:00
PAU ROVIRA ROSALENY b0fbbddb06 Merge branch 'dev' into 8237-defaultObservationType 2025-03-25 05:54:45 +00:00
Alex Moreno 4223680b60 Merge branch 'test' into 8602-warmFix 2025-03-25 05:30:37 +00:00
Pablo Natek 8da61655e2 fix: refs #8602 disable use-like option in EntryBuys component 2025-03-24 23:02:05 +01:00
Carlos Andrés 535fe011f6 feat: refs #8529 add isDeductible column and localization for InvoiceIn summary 2025-03-24 17:51:29 +01:00
Carlos Andrés 34abab09bb Merge branch 'dev' into 8529-InvoiceIn-deductible-TAX-lines 2025-03-24 15:05:34 +00:00
Alex Moreno 9e96e4ecf1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-24 15:10:47 +01:00
Alex Moreno 075f81a104 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-24 15:10:38 +01:00
Alex Moreno a2594d2ab0 Merge pull request 'feat: implement onBeforeSave function to handle form data updates' (!1629) from hotFix_claim_basicData into master 
Reviewed-on: verdnatura/salix-front#1629
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-24 14:10:27 +00:00
PAU ROVIRA ROSALENY 4197e7bbde Merge branch 'dev' into 8237-defaultObservationType 2025-03-24 13:54:07 +00:00
Alex Moreno c58dcab452 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-24 14:53:25 +01:00
Alex Moreno 95b566993a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-24 14:53:13 +01:00
Alex Moreno ec456b5ac8 Merge branch 'master' into hotFix_claim_basicData 2025-03-24 13:52:52 +00:00
PAU ROVIRA ROSALENY e27fdf5d06 Merge branch 'dev' into 8237-defaultObservationType 2025-03-24 13:52:21 +00:00
Jorge Penadés e36d36e2d5 Merge pull request 'feat: refs #6919 enhance filter in AccountSummary component to include entity ID' (!1628) from 6919-hotfix-whereClause into master 
Reviewed-on: verdnatura/salix-front#1628
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-24 13:37:06 +00:00
Alex Moreno 6a97c368e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-24 14:27:54 +01:00
Alex Moreno 88c61c8a85 fix: warmFix quasar build async function 2025-03-24 14:27:18 +01:00
Carlos Andrés b681b10eb7 Merge branch 'dev' of https: refs #8529//gitea.verdnatura.es/verdnatura/salix-front into 8529-InvoiceIn-deductible-TAX-lines 2025-03-24 14:14:14 +01:00
PAU ROVIRA ROSALENY ca6ae9175d Merge branch '8237-defaultObservationType' of https://gitea.verdnatura.es/verdnatura/salix-front into 8237-defaultObservationType 2025-03-24 14:07:09 +01:00
PAU ROVIRA ROSALENY 2a560e9548 Merge branch '8237-defaultObservationType' of https: refs #8237//gitea.verdnatura.es/verdnatura/salix-front into 8237-defaultObservationType 2025-03-24 14:07:02 +01:00
PAU ROVIRA ROSALENY 293d51b741 feat: refs #8237 #8237 modified fetch to find default select value by "code" 2025-03-24 14:06:38 +01:00
Jon Elias 80dc4ef409 Merge branch 'dev' into 8326-UnifyCardTitles 2025-03-24 13:06:28 +00:00
Alex Moreno e1ef6f87f3 feat: implement onBeforeSave function to handle form data updates 2025-03-24 14:01:43 +01:00