wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
2,632 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

2632 Commits

Author SHA1 Message Date
Jon Elias 450d4a0dc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fixCypressE2E 2024-04-23 09:20:11 +02:00
Jorge Penadés 5f05ab93df Merge pull request 'warmFix_hasMoreData' (!308) from warmFix_hasMoreData into dev 
Reviewed-on: verdnatura/salix-front#308
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-23 07:12:54 +00:00
Jon Elias d710d736ca tests cypress 2024-04-23 08:40:30 +02:00
Jorge Penadés 498b8b3315 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData 2024-04-23 08:39:33 +02:00
Alex Moreno 20ec141237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-23 07:39:15 +02:00
Jorge Penadés 3abc504158 fix: unit test 2024-04-22 16:35:34 +02:00
Javier Segarra 13a46be85b fix: tests 2024-04-22 15:18:15 +02:00
Alex Moreno 72deeab2ef Merge branch 'dev' into warmFix_hasMoreData 2024-04-22 13:01:28 +00:00
Javier Segarra 036dcaadd2 Merge pull request 'bugfix/SupplierConsumptionDateRanges' (!312) from hyervoni/salix-front-mindshore:bugfix/SupplierConsumptionDateRanges into dev 
Reviewed-on: verdnatura/salix-front#312
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-22 12:48:00 +00:00
William Buezas c9767e7b1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges 2024-04-22 09:45:01 -03:00
Alex Moreno 9d381a5c82 Merge pull request 'fix(VnNotes): refs #6336 fix v-for key' (!310) from 6336_fix_vn_notes_key into dev 
Reviewed-on: verdnatura/salix-front#310
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-04-22 12:09:19 +00:00
William Buezas 7dac6ba910 Remove unused imports 2024-04-22 09:02:35 -03:00
William Buezas 64fc02e33b Fix supplier consumption disabled buttons 2024-04-22 09:00:57 -03:00
Jorge Penadés 1f391dc49b fix: skip 2024-04-22 13:17:05 +02:00
Jorge Penadés 80844e7869 fix: hasMoreData 2024-04-22 12:53:09 +02:00
Alex Moreno 4a5285358c fix(VnNotes): refs #6336 restore index in key 2024-04-22 09:46:40 +02:00
Alex Moreno 918ce0dc86 fix(VnNotes): refs #6336 remove index in key 2024-04-22 09:38:38 +02:00
Jorge Penadés 9a3f714290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData 2024-04-22 08:57:26 +02:00
Alex Moreno 99af402281 fix(VnNotes): refs #6336 fix v-for key 2024-04-22 08:42:38 +02:00
Alex Moreno 3eb5041bf5 fix: refs #6590 remove unnecessary import 2024-04-22 07:50:34 +02:00
Javier Segarra c1f64b88b4 Merge pull request 'FIX Merge PR-CUSTOMER' (!309) from fix_Customer_merge into dev 
Reviewed-on: verdnatura/salix-front#309
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-22 05:04:51 +00:00
Javier Segarra edd1b66110 fix: merge toDateHourMin 2024-04-21 16:09:21 +02:00
Javier Segarra ea4f72abf9 Merge pull request 'PR-CUSTOMER' (!186) from hyervoni/salix-front-mindshore:PR-CUSTOMER into dev 
Reviewed-on: verdnatura/salix-front#186
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-19 15:55:52 +00:00
Jorge Penadés 4f5c8ef0f6 fix: tests 2024-04-19 16:15:10 +02:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
Alex Moreno ae2737673d fix: hasMoreData 2024-04-19 14:43:38 +02:00
Alex Moreno c638209f0e fix: hasMoreData 2024-04-19 14:39:20 +02:00
Alex Moreno dc4de8de7f Merge pull request 'refs #6336 feat(claim): improvements' (!288) from 6336-claim_changes_v3 into dev 
Reviewed-on: verdnatura/salix-front#288
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-19 09:20:55 +00:00
Alex Moreno 6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-19 09:36:10 +02:00
Jon Elias a605c90a55 Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!305) from 7139-changeColumnsInRouteSummary into dev 
Reviewed-on: verdnatura/salix-front#305
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-18 12:55:55 +00:00
Jon Elias 8fadccce92 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 12:48:02 +00:00
Guillermo Bonet a8ac00f7e4 Merge pull request 'feat: refs #6724 Disabled QCheckbox entry isBooked' (!292) from 6724-disableEntryBooked into dev 
Reviewed-on: verdnatura/salix-front#292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-04-18 11:19:05 +00:00
Guillermo Bonet 9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:18:22 +00:00
Javier Segarra 6ab7b4b68d Merge pull request '#7180 - Error Supplier List Scroll NOT working' (!298) from 7180_bug_supplierListScroll into dev 
Reviewed-on: verdnatura/salix-front#298
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 11:07:44 +00:00
Javier Segarra 82937a103d Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 11:06:33 +00:00
Guillermo Bonet 7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:06:30 +00:00
Jon Elias f3b893de67 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 11:06:17 +00:00
Jon Elias 1f0394b5fc refactor: refs #7139 fixed error in translation 2024-04-18 12:45:45 +02:00
Jon Elias 3233210300 Merge pull request 'fix: refs #6425 fixed vitest config to avoid testing problems' (!306) from 6425-changedVitestConfig into dev 
Reviewed-on: verdnatura/salix-front#306
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 10:42:50 +00:00
Jon Elias c60558420f fix: refs #6425 fixed vitest config to avoid testing problems 2024-04-18 12:38:43 +02:00
Javier Segarra 7f63ea4e1c Actualizar src/composables/useArrayData.js 2024-04-18 09:37:01 +00:00
Javier Segarra 846c85ed1a Actualizar src/components/ui/VnPaginate.vue 2024-04-18 09:36:24 +00:00
Jon Elias bb97acc261 Merge pull request '#7130 - addFieldInRoutes' (!259) from 7130-addFieldInRoutes into dev 
Reviewed-on: verdnatura/salix-front#259
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 09:34:31 +00:00
Alex Moreno 69850d65e7 fix(VnNotes) refs #7226 use v-bind 2024-04-18 10:13:36 +02:00
Javier Segarra 43976e8ced fix minor bug to show 2024-04-18 07:37:19 +00:00
Alex Moreno e804af3512 Merge branch 'dev' into 7130-addFieldInRoutes 2024-04-18 07:25:32 +00:00
Javier Segarra 19e5694e09 Merge pull request '#6907 - input_clearable_hover' (!198) from 6907_fix_input_clearable_hover into dev 
Reviewed-on: verdnatura/salix-front#198
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-18 06:42:28 +00:00
Jon Elias 062d743896 refactor: refs #7139 replace warehouse with ticket 2024-04-18 08:20:20 +02:00
Javier Segarra 5382f306e2 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-18 06:18:02 +00:00
Alex Moreno 84dfd6d474 hotFix(workerDms): use undefined 2024-04-18 08:12:11 +02:00