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

8302 Commits

Author SHA1 Message Date
Jorge Penadés 0a97d0504b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-autoComplete 2025-01-20 15:41:55 +01:00
Carlos Satorres a3fe097970 Merge pull request 'fix: refs #6898 hotfix filter' (!1252) from 6898-hotfixFiscalData into master 
Reviewed-on: verdnatura/salix-front#1252
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 12:52:41 +00:00
Carlos Satorres 77857e9d31 Merge branch 'master' into 6898-hotfixFiscalData 2025-01-20 12:47:27 +00:00
Carlos Satorres c7b24adc5a fix: refs #6898 hotfix filter 2025-01-20 13:39:56 +01:00
Javier Segarra 1f2746ac18 Merge pull request 'Remove space checkbox when is not hover' (!1002) from hotfix_checbox_css into master 
Reviewed-on: verdnatura/salix-front#1002
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-20 12:28:13 +00:00
Jorge Penadés bdae839e50 fix: refs #7936 toggle option 2025-01-20 12:56:40 +01:00
Javier Segarra c3203b18e7 Merge branch 'master' into hotfix_checbox_css 2025-01-20 11:17:58 +00:00
Carlos Satorres c333428389 Merge pull request 'fix: fix ticketSale quantity' (!1251) from hotfix-7356ticketSale into master 
Reviewed-on: verdnatura/salix-front#1251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-20 11:11:48 +00:00
Carlos Satorres a3cdb18535 fix: fix use-like 2025-01-20 12:04:59 +01:00
Jorge Penadés ae68f25c3c fix: refs #7936 rollback 2025-01-20 11:55:49 +01:00
Jorge Penadés ff95882e42 fix: refs #7936 rollback 2025-01-20 11:51:53 +01:00
Carlos Satorres a1254b25b4 fix: fix ticketSale quantity 2025-01-20 11:26:57 +01:00
Jorge Penadés 8843318b66 fix: refs #7936 update select model-value WIP 2025-01-20 10:10:45 +01:00
Jon Elias b447df7217 Merge pull request 'Hotfix: Redirect to Ticketsale when confirming an order' (!1245) from Hotfix-RedirectOrderToTicketSale into master 
Reviewed-on: verdnatura/salix-front#1245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-20 07:07:30 +00:00
Jon Elias ed0e4fadf8 Merge branch 'master' into Hotfix-RedirectOrderToTicketSale 2025-01-20 07:06:14 +00:00
Jon Elias 3b9ccab48c fix: redirect to Ticketsale when confirming an order 2025-01-20 08:01:46 +01:00
Javier Segarra 92311accb0 Merge branch 'master' into hotfix_checbox_css 2025-01-17 12:33:37 +01:00
Javier Segarra 04bbf9e9d7 Merge pull request 'HOTFIX: Add acl in description button' (!1231) from hotfix_ticketService_acl into master 
Reviewed-on: verdnatura/salix-front#1231
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-17 09:05:46 +00:00
Javier Segarra 3ab3f146d4 feat: add acl in description button 2025-01-16 12:45:24 +01:00
Jorge Penadés b89293a9a3 Merge pull request 'fix: refs #7936 allow negative values' (!1226) from 7936-hotfix-allowNegative into master 
Reviewed-on: verdnatura/salix-front#1226
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-16 11:37:55 +00:00
Alex Moreno 755fca504d Merge branch 'master' into 7936-hotfix-allowNegative 2025-01-16 11:06:49 +00:00
Pablo Natek cc7f16b635 Merge pull request 'fix: refs #8407 close date and time popups on keydown' (!1229) from 8407-fixVnInputDate into master 
Reviewed-on: verdnatura/salix-front#1229
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-16 11:01:35 +00:00
Pablo Natek 6c2fbea6d5 fix: refs #8407 close date and time popups on keydown 2025-01-16 11:59:08 +01:00
Jorge Penadés ee66704a92 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-allowNegative 2025-01-16 09:53:13 +01:00
Jorge Penadés e335322d5f fix: refs #7936 allow negative values 2025-01-16 09:45:15 +01:00
Jorge Penadés 6ca732986d Merge pull request 'hotfix: #7323 catch mail err' (!1225) from hotfix-7323-catchMailErr into master 
Reviewed-on: verdnatura/salix-front#1225
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-16 08:38:06 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err 2025-01-15 16:10:33 +01:00
Jon Elias 1f76d572ce Merge pull request 'Hotfix[CustomerDescriptor]: Fixed icons in descriptor' (!1217) from Hotfix-CustomerDescriptorIcons into master 
Reviewed-on: verdnatura/salix-front#1217
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-15 08:23:56 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 08:22:56 +00:00
Pablo Natek 4183ad3fa0 Merge pull request 'fix: update SIM serial number binding in WorkerPda.vue' (!1221) from hotFixWorkerPda into master 
Reviewed-on: verdnatura/salix-front#1221
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 07:25:18 +00:00
Pablo Natek a7fd073886 fix: update SIM serial number binding in WorkerPda.vue 2025-01-15 08:23:44 +01:00
Javier Segarra 17f067144c Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 07:18:34 +00:00
Carlos Satorres 27f8a95e6f Merge pull request 'fix: hotfix 7366 6943' (!1215) from hotfix-7366-6943CreditBillingDataAWB into master 
Reviewed-on: verdnatura/salix-front#1215
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 07:00:43 +00:00
Carlos Satorres 621d038133 Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB 2025-01-15 06:31:54 +00:00
Alex Moreno dd41141cf1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-15 07:11:51 +01:00
Jon Elias 9f0d9bca29 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 05:03:43 +00:00
Jon Elias 35e4f91154 fix: fixed icons in descriptor 2025-01-15 05:59:47 +01:00
Javier Segarra ed483baef6 Merge pull request 'Hotfix: VnLocation' (!1211) from hotfix_vnLocation_selectValue into master 
Reviewed-on: verdnatura/salix-front#1211
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-14 11:01:50 +00:00
Javier Segarra 6f50d44772 Merge branch 'master' into hotfix_vnLocation_selectValue 2025-01-14 11:00:38 +00:00
Carlos Satorres 64fcf3c824 fix: hotfix 7366 6943 2025-01-14 11:36:46 +01:00
Alex Moreno 30e501610d fix: parallelism 2025-01-14 09:09:26 +01:00
Javier Segarra 8b7337f9ee fix: vnlocation 2025-01-14 08:37:10 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it 2025-01-14 08:16:44 +01:00
Alex Moreno bce40834a5 Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1207
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-14 06:32:35 +00:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
Alex Moreno dbafd5d689 build: refs #8389 changelog 2025-01-13 15:24:20 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 14:49:02 +01:00
Jon Elias 07ecd93fe0 Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test 
Reviewed-on: verdnatura/salix-front#1203
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 13:33:35 +00:00
Jorge Penadés a32ec49efd Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master 
Reviewed-on: verdnatura/salix-front#1205
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 11:25:23 +00:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00