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

8558 Commits

Author SHA1 Message Date
Jon Elias e42a2c8bce Merge branch 'dev' into 8220-ItemsE2E 2024-12-16 09:25:26 +00:00
Jon Elias a2b3a493fd perf: refs #8220 use searchbar selector in e2e tests 2024-12-16 10:24:31 +01:00
Jorge Penadés 6e655b37a1 fix: refs #7957 rollback 2024-12-16 10:22:01 +01:00
Jorge Penadés a6815f4e3d fix: refs #7957 rollback 2024-12-16 10:21:20 +01:00
Jorge Penadés 51ed58465d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2024-12-16 10:15:22 +01:00
Pablo Natek 1658e4f0e9 Merge branch '8004-liliumStyleRemake' of https://gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-12-16 09:52:42 +01:00
Pablo Natek fb8997b3df fix: refs #8004 update label for daysOnward in TravelFilter component and add translations 2024-12-16 09:52:40 +01:00
Alex Moreno 18fd41b82b refactor: refs #8197 adapt AccountAlias 2024-12-16 09:47:46 +01:00
Alex Moreno 5d744ca456 feat: refs #8197 better leftMenu and VnCardMain improvements 2024-12-16 09:41:50 +01:00
Robert Ferrús b84e8a4a2b Merge branch 'dev' into 8001-expeditionGrafana 2024-12-16 07:48:37 +00:00
Jose Antonio Tubau dadf3206e0 feat: refs #8293 add zone filter 2024-12-16 08:42:37 +01:00
Jose Antonio Tubau c4db8f7818 feat: refs #8293 include zone data in each record 2024-12-16 08:41:28 +01:00
Guillermo Bonet 96ec1ca86b Merge pull request 'feat: refs #7882 Added longitude & latitude' (!1070) from 7882-osrm into dev 
Reviewed-on: verdnatura/salix-front#1070
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-16 06:59:06 +00:00
Jon Elias a4062f188b refactor: refs #8219 requested changes 2024-12-16 07:46:36 +01:00
Jon Elias 56308f40f2 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2024-12-16 07:45:36 +01:00
Jon Elias ad38bad945 fix: refs #8219 merge conflicts 2024-12-16 07:45:35 +01:00
Alex Moreno 1b1aa8e488 Merge branch 'master' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-VnCardMain 2024-12-16 07:32:25 +01:00
Guillermo Bonet b1cf0c2365 Merge branch 'dev' into 7882-osrm 2024-12-16 06:14:25 +00:00
Carlos Satorres 7ce92cc64b Merge branch 'master' into hotfix-irpfDaysOnWard 2024-12-16 06:06:59 +00:00
Jorge Penadés 0cce5b93cd refactor: refs #7957 remove blank 2024-12-13 17:20:28 +01:00
Jorge Penadés 981f3e90c1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2024-12-13 16:27:11 +01:00
Jon Elias 43c24e0383 fix: refs #8201 added onDataSaved emi to refetch when cahnges are made 2024-12-13 14:20:17 +01:00
Jorge Penadés cb0422d83f feat: refs #7957 open in new tab 2024-12-13 14:16:27 +01:00
Javier Segarra 601111ee9f Merge pull request 'fix_orderCatalog_reload' (!1085) from fix_orderCatalog_reload into dev 
Reviewed-on: verdnatura/salix-front#1085
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-13 13:01:34 +00:00
Javier Segarra 9e45775457 Merge branch 'dev' into fix_orderCatalog_reload 2024-12-13 12:38:05 +00:00
Javier Segarra c7e841bdad Merge branch 'fix_orderCatalog_reload' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_orderCatalog_reload 2024-12-13 13:33:11 +01:00
Javier Segarra 5caf82fad7 fix: get total from api 2024-12-13 13:32:40 +01:00
Jon Elias 74bf536db1 Merge pull request 'fix_orderCatalog_reload' (!1081) from fix_orderCatalog_reload into dev 
Reviewed-on: verdnatura/salix-front#1081
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-13 11:46:16 +00:00
Jon Elias f4aa30c43e Merge branch 'dev' into fix_orderCatalog_reload 2024-12-13 11:45:10 +00:00
Javier Segarra b18de7df4e perf: #6896 REMOVE COMMENTS 2024-12-13 12:17:54 +01:00
Javier Segarra 608f881eab Merge pull request 'feat: hide menus' (!1083) from hotfix-hideMenu into master 
Reviewed-on: verdnatura/salix-front#1083
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 11:07:53 +00:00
Jorge Penadés d0e6c2c567 feat: hide menus 2024-12-13 11:45:56 +01:00
Jose Antonio Tubau 228100853c Merge pull request 'feat: refs #7072 added test to computed fn total' (!1078) from 7072-createVnDiscountSpec into dev 
Reviewed-on: verdnatura/salix-front#1078
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 10:33:58 +00:00
Javier Segarra b3170108e0 feat: update quantity 2024-12-13 10:50:32 +01:00
Javi Gallego 21b4913e19 feat: refs #7235 update invoice out global form to fetch config based on serial type 2024-12-13 08:33:05 +01:00
Jose Antonio Tubau f3bdcae3b1 Merge branch 'dev' into 7072-createVnDiscountSpec 2024-12-13 07:20:36 +00:00
Jon Elias 1a0789b77f refactor: refs #8201 deleted log 2024-12-13 08:05:03 +01:00
Jon Elias 35cef37d4f fix: refs #8201 use arrayData to fix the error 2024-12-13 08:04:05 +01:00
PAU ROVIRA ROSALENY 456dde73c1 Merge pull request '#8288 changed invoice out spanish translation' (!1074) from 8288-changeInvoiceOutTranslation into dev 
Reviewed-on: verdnatura/salix-front#1074
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-13 06:26:42 +00:00
PAU ROVIRA ROSALENY a4f1967329 Merge branch 'dev' into 8288-changeInvoiceOutTranslation 2024-12-13 06:14:50 +00:00
Guillermo Bonet e6195a8529 Merge branch 'dev' into 7882-osrm 2024-12-13 06:00:26 +00:00
Javier Segarra bd15d2e73a feat: remove re-fetch when add element 2024-12-13 06:56:22 +01:00
Javier Segarra 696be32fa6 feat: remove search after category 2024-12-13 06:54:40 +01:00
Jose Antonio Tubau d601caf95b Merge branch 'dev' into 7050-testCrudModel 2024-12-12 15:48:52 +00:00
Jose Antonio Tubau 6895780c09 feat: refs #7072 added test to computed fn total 2024-12-12 16:26:01 +01:00
Jose Antonio Tubau 0706c9d58e fix: refs #7050 delete import added by mistake 2024-12-12 16:04:57 +01:00
Jose Antonio Tubau 77f4949ba6 feat: refs #7050 7050 add object check 2024-12-12 15:53:56 +01:00
Jose Antonio Tubau c164c39a2d feat: refs #7050 7050 add test to isEmpty() 2024-12-12 15:52:36 +01:00
Jose Antonio Tubau 1b05c10b50 Merge pull request 'ShowDptoLink' (!1076) from showDeptLink into dev 
Reviewed-on: verdnatura/salix-front#1076
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-12 14:35:41 +00:00
Jose Antonio Tubau 1d37d0dfb4 Merge branch 'dev' into showDeptLink 2024-12-12 13:50:42 +00:00