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

7769 Commits

Author SHA1 Message Date
Guillermo Bonet e6195a8529 Merge branch 'dev' into 7882-osrm 2024-12-13 06:00:26 +00: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
Jose Antonio Tubau d35c37bfdf fix: addLocales 2024-12-12 14:47:21 +01:00
Jose Antonio Tubau 013c07e51f feat: addDptoLink 2024-12-12 14:39:07 +01:00
Pablo Natek d72b507fd4 Merge pull request 'feat: refs #7301 add exclude inventory supplier from list' (!982) from 7301-itemLastEntries into dev 
Reviewed-on: verdnatura/salix-front#982
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 13:23:30 +00:00
Pablo Natek 87bdf532a8 Merge branch 'dev' into 7301-itemLastEntries 2024-12-12 13:11:45 +00: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
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
Carlos Satorres e628a6c445 Merge branch 'dev' into 6389-changesMonitor 2024-12-12 08:48:28 +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
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
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
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 5b5a935021 Merge pull request '#8002 addSupportService' (!894) from xxxx-addSupportService into dev 
Reviewed-on: verdnatura/salix-front#894
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-11 09:49:39 +00:00
Jorge Penadés 273c879879 Merge branch 'dev' into xxxx-addSupportService 2024-12-11 09:39:59 +00:00
Carlos Satorres 0ecc103fc2 fix: refs #6389 front 2024-12-11 09:59:05 +01:00
Carlos Satorres 7697caa85a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-12-11 06:49:38 +01:00
Alex Moreno 4fc9ad3f76 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-10 13:40:47 +01:00
Javier Segarra ee445aca83 Merge pull request 'perf: emit options from VnSelectProvince' (!1062) from hotfix_improve_cp into master 
Reviewed-on: verdnatura/salix-front#1062
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-12-10 12:24:00 +00:00
Javier Segarra 854e72fe51 perf: emit options from VnSelectProvince 2024-12-10 13:17:31 +01:00
Alex Moreno 4a6f859a86 fix(RouteExtendedList): fix cloneRoutes 2024-12-10 13:15:03 +01:00
Alex Moreno b2fe1a6b6a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-10 11:29:06 +01:00
Javier Segarra b97ee919a6 Merge pull request 'Hotfix: Bugs detected after 24.50' (!1060) from hotfix_minor_24-50 into master 
Reviewed-on: verdnatura/salix-front#1060
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-10 08:49:07 +00:00
Javier Segarra 256caa2eb5 fix: replace useNotify by useQuasar 2024-12-10 08:35:04 +01:00
Javier Segarra 8dcf272942 fix: #8282 CustomerSummary email icon 2024-12-10 08:34:48 +01:00
Alex Moreno dd33dfc766 fix(VnSelect): hotFix handleKeyDown add next focus 2024-12-10 07:49:59 +01:00
Alex Moreno 051482fd23 Merge pull request '8282-testToMaster' (!1057) from 8282-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1057
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-12-10 06:23:35 +00:00
Alex Moreno ff8561d0c2 chore: refs #8282 add changelog 2024-12-09 15:24:18 +01:00
Alex Moreno 629531cce4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-09 14:32:42 +01:00
Alex Moreno cd4b2a92dc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-09 14:17:41 +01:00
Jorge Penadés 2fb179803c refactor: add useCau composable 2024-12-09 13:42:00 +01:00
Jon Elias 91afc3ddab Merge pull request '#7283: Fix Item module' (!1042) from Fix-Items-Module into dev 
Reviewed-on: verdnatura/salix-front#1042
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-09 12:29:54 +00:00
Jon Elias d4682248fd Merge branch 'Fix-Items-Module' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-Items-Module 2024-12-09 13:24:36 +01:00
Jon Elias 1de74dec8e fix: fix conflicts 2024-12-09 13:24:34 +01:00
Jon Elias bf68eab480 Merge pull request '#8194 created VnSelectWorker component' (!977) from 8194-VnSelectWorker into dev 
Reviewed-on: verdnatura/salix-front#977
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-09 12:04:18 +00:00
Jon Elias 853bb9e5aa Merge branch 'dev' into 8194-VnSelectWorker 2024-12-09 12:02:16 +00:00