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

8079 Commits

Author SHA1 Message Date
Jorge Penadés d701bf0713 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-12 11:55:56 +01:00
Jorge Penadés aeee861147 feat: refs #7936 show country code & isVies fields 2024-12-12 11:20:54 +01:00
Alex Moreno 3984327b51 feat: refs #8197 working rightMenu 2024-12-12 11:03:28 +01:00
Carlos Satorres 59b034d0b4 Merge pull request 'fix: fix department filter' (!1075) from fix-6389departmentFilter into dev 
Reviewed-on: verdnatura/salix-front#1075
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 10:03:24 +00:00
Jorge Penadés c5f4e8decd fix: refs #7936 exclude disabled els on tab 2024-12-12 10:56:42 +01:00
Carlos Satorres ac3ca3e243 fix: fix department filter 2024-12-12 10:51:13 +01:00
Carlos Satorres b022ede6a9 Merge pull request 'fix: refs #6389 ipt' (!846) from 6389-changesMonitor into dev 
Reviewed-on: verdnatura/salix-front#846
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 09:28:52 +00:00
Jorge Penadés 242597b68c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-12 09:58:27 +01:00
Carlos Satorres e628a6c445 Merge branch 'dev' into 6389-changesMonitor 2024-12-12 08:48:28 +00:00
Carlos Satorres dc9dad69a2 Merge branch 'master' into hotfix-irpfDaysOnWard 2024-12-12 08:36:49 +00:00
Pablo Natek c043a7d99a Merge branch 'dev' into 7301-itemLastEntries 2024-12-12 08:34:39 +00:00
Carlos Satorres 79c1709618 Merge pull request 'fix: refs #7031 add test e2e' (!1049) from 7031-zonePrice into dev 
Reviewed-on: verdnatura/salix-front#1049
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-12 08:33:55 +00:00
Carlos Satorres 964cf68b9c Merge branch 'dev' into 7031-zonePrice 2024-12-12 08:32:17 +00:00
Pablo Natek d4bb5a063f Merge branch 'dev' into 7301-itemLastEntries 2024-12-12 08:31:51 +00:00
Pablo Natek 8bccb959ed fix: refs #7301 unnecessary console logs from ItemLastEntries.vue 2024-12-12 09:31:33 +01:00
Jon Elias cd9b433a45 Merge pull request 'FIX: added restore ticket function in TicketDescriptorMenu' (!1072) from Fix-TicketDescriptorMenuOption into dev 
Reviewed-on: verdnatura/salix-front#1072
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 08:28:37 +00:00
Jorge Penadés eb55c08dbd Merge pull request 'feat: refs #8113 add mapKey prop to VnPaginate and integrate into useArrayData for enhanced data mapping' (!1071) from 8113-mapArrayData into beta 
Reviewed-on: verdnatura/salix-front#1071
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 08:25:52 +00:00
Carlos Satorres b3f22e35a6 Merge pull request 'fix: hotfix date' (!1045) from hotfix-6898SupplierConsumption into master 
Reviewed-on: verdnatura/salix-front#1045
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 08:20:36 +00:00
Carlos Satorres 46262ad451 Merge branch 'master' into hotfix-6898SupplierConsumption 2024-12-12 08:19:45 +00:00
Carlos Satorres 5b0e36fa4e fix: change number 2024-12-12 09:18:32 +01:00
Pablo Natek 52cacd8c16 Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix-front into 7301-itemLastEntries 2024-12-12 09:03:09 +01:00
Carlos Satorres 842a3775f1 fix: clean 2024-12-12 08:56:43 +01:00
Carlos Satorres 2283e65402 fix: clean 2024-12-12 08:56:25 +01:00
Carlos Satorres 745222c143 Merge branch 'hotfix-irpfDaysOnWard' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-irpfDaysOnWard 2024-12-12 08:53:33 +01:00
Carlos Satorres 96df567b1d fix: clean 2024-12-12 08:53:31 +01:00
Guillermo Bonet 75e5fc47a8 Merge branch '7882-osrm' of https://gitea.verdnatura.es/verdnatura/salix-front into 7882-osrm 2024-12-12 08:15:00 +01:00
Guillermo Bonet 06329ef857 feat: refs #7882 Added distribution point 2024-12-12 08:14:58 +01:00
Jon Elias ba300ec065 Merge branch 'Fix-TicketDescriptorMenuOption' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketDescriptorMenuOption 2024-12-12 08:04:07 +01:00
Jon Elias e01f1fe5d2 refactor: deleted log 2024-12-12 08:04:06 +01:00
Jon Elias d7d1e4d691 Merge branch 'dev' into Fix-TicketDescriptorMenuOption 2024-12-12 06:52:31 +00:00
Jon Elias 983c86ffa5 feat: added restore ticket function in ticket descriptor menu 2024-12-12 07:35:20 +01:00
Alex Moreno c61934e127 Merge branch 'master' into hotfix-irpfDaysOnWard 2024-12-12 06:28:16 +00:00
PAU ROVIRA ROSALENY bc41eabcf3 refactor: refs #8288 changed invoice out spanish translation 2024-12-12 07:19:38 +01:00
Javier Segarra fb1f3e4f24 Merge pull request 'hotfix-quitSaveOnEnter' (!1069) from hotfix-quitSaveOnEnter into master 
Reviewed-on: verdnatura/salix-front#1069
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-11 21:54:01 +00:00
Javier Segarra bae148174a Merge branch 'master' into hotfix-quitSaveOnEnter 2024-12-11 21:51:52 +00:00
Jorge Penadés e075e13076 feat: refs #7936 add dueDated field 2024-12-11 17:42:31 +01:00
Jorge Penadés 4ec78aa1c0 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix-front into 7936-improveInvoiceIn 2024-12-11 17:21:45 +01:00
Jorge Penadés 2a6717d059 feat: refs #8113 add mapKey prop to VnPaginate and integrate into useArrayData for enhanced data mapping 2024-12-11 15:04:31 +01:00
Alex Moreno 9e8c967567 fix(VnSearchbar): hotFix rollback 2024-12-11 15:01:28 +01:00
Jon Elias 36c447772f Merge pull request 'Hotfix: fixed filter when searching by id' (!1063) from Hotfix-TicketFilter into master 
Reviewed-on: verdnatura/salix-front#1063
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-11 13:35:55 +00:00
Jon Elias f74cd30a4e Merge branch 'Hotfix-TicketFilter' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-TicketFilter 2024-12-11 14:03:57 +01:00
Jon Elias b635010972 perf: if searchtext condition 2024-12-11 14:03:56 +01:00
Jon Elias 2262ef9594 Merge branch 'master' into Hotfix-TicketFilter 2024-12-11 12:39:06 +00:00
Jon Elias 1da3b1081a Merge pull request 'Hotfix: fixed events panel function' (!1067) from Hotfix-ZoneEventsMissingFunction into master 
Reviewed-on: verdnatura/salix-front#1067
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-11 12:38:56 +00:00
Jon Elias c61ad16681 feat: added logic to avoid other filter params when searching on vnsearchbar 2024-12-11 13:38:04 +01:00
Jorge Penadés 740cca2b93 fix: not trigger submit on enter 2024-12-11 13:03:18 +01:00
Carlos Satorres 3d666338ce fix: refs #6389 front add packing filter 2024-12-11 11:50:37 +01:00
Guillermo Bonet f9f29500e9 Merge branch 'dev' into 7882-osrm 2024-12-11 10:42:33 +00:00
Guillermo Bonet f04d675f6b feat: refs #7882 Added longitude & latitude 2024-12-11 11:41:58 +01:00
Jorge Penadés f4d7982228 fix: remove useless code 2024-12-11 11:34:08 +01:00