0
0
Fork 0
Commit Graph

2692 Commits

Author SHA1 Message Date
Jon Elias a605c90a55 Merge pull request 'refactor: refs replace warehouse with ticket' () from 7139-changeColumnsInRouteSummary into dev
Reviewed-on: 
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
William Buezas b52b70041c resolve pnpm lock conflicts and change some colors 2024-04-18 08:33:23 -03:00
Guillermo Bonet a8ac00f7e4 Merge pull request 'feat: refs Disabled QCheckbox entry isBooked' () from 6724-disableEntryBooked into dev
Reviewed-on: 
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 ' - Error Supplier List Scroll NOT working' () from 7180_bug_supplierListScroll into dev
Reviewed-on: 
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 fixed error in translation 2024-04-18 12:45:45 +02:00
Jon Elias 3233210300 Merge pull request 'fix: refs fixed vitest config to avoid testing problems' () from 6425-changedVitestConfig into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-18 10:42:50 +00:00
Jon Elias c60558420f fix: refs 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 ' - addFieldInRoutes' () from 7130-addFieldInRoutes into dev
Reviewed-on: 
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 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 ' - input_clearable_hover' () from 6907_fix_input_clearable_hover into dev
Reviewed-on: 
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 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
Javier Segarra 817a8fcc71 Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 06:06:01 +00:00
Alex Moreno 180637fefc Merge pull request '7226-testToMaster_2416' () from 7226-testToMaster_2416 into master
Reviewed-on: 
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-18 05:41:10 +00:00
Alex Moreno ebd02987b9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-17 16:34:06 +02:00
Alex Moreno 873d528e0d Merge pull request 'Waste breakdown' () from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-17 12:52:16 +00:00
Jon Elias 79a90c1163 fix: refs fix conflicts 2024-04-17 13:48:56 +02:00
William Buezas 5551189f2f resolve conflicts 2024-04-17 08:46:37 -03:00
Javier Segarra 13214582ac Merge pull request 'Item create view' () from hyervoni/salix-front-mindshore:feature/ItemCreate into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-17 11:42:50 +00:00
William Buezas f5d8e94a24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemCreate 2024-04-17 08:41:13 -03:00
Javier Segarra 95cd795e7b Merge pull request 'feat(lilium): refs Undo rollback salix-back' () from 6930_undo_rollback into dev
Reviewed-on: 
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-17 11:38:29 +00:00
Javier Segarra 5d7cee38bd feat(lilium): refs Undo rollback salix-back 2024-04-17 11:26:35 +00:00
William Buezas 1dfaef2ffa Resolve conflicts 2024-04-17 08:26:12 -03:00
Javier Segarra 55dd401064 Merge pull request ' - Revert/Undo rollback' () from 6930_undo_rollback into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-17 11:04:48 +00:00
Alex Moreno 52a0be449d feat: refs redesign 2024-04-17 10:58:07 +02:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-17 10:53:18 +02:00
Javier Segarra 37ad84f239 perf(lilium): refs Improve setToken fn 2024-04-17 10:09:44 +02:00
Javier Segarra b95d44c05d feat(lilium): refs Undo rollback lilium 2024-04-17 10:07:44 +02:00
Guillermo Bonet dca954850b Merge pull request 'feat: refs Changed groupingMode to enum' () from 6968-groupingModeRefactor into dev
Reviewed-on: 
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:46 +00:00
Guillermo Bonet b4462fcdb5 Merge branch 'dev' into 6968-groupingModeRefactor 2024-04-17 06:44:24 +00:00
Javier Segarra 248416b676 fix(lilium) SupplierList Scroll 2024-04-17 08:41:47 +02:00
William Buezas a397c6ed30 remove component import 2024-04-16 12:18:36 -03:00
William Buezas 813bab4e9d manage QCalendar customization classes from wrapper 2024-04-16 10:47:16 -03:00
William Buezas e36949ad07 resolve conflicts 2024-04-16 10:11:03 -03:00
William Buezas c82f4652f5 Move capitalize header week day to wrapper 2024-04-16 09:44:52 -03:00
William Buezas 256461a5bb Change current day colors 2024-04-16 09:41:03 -03:00
William Buezas a808491c5e use the color of calendar background for the border of panel card 2024-04-16 09:37:31 -03:00
Alex Moreno 892c5986c0 Merge pull request 'fix: refs fixed dev translations' () from 6425-fixDevTranslations into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-16 12:35:36 +00:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00:00
William Buezas 1577fb701b remove unused span 2024-04-16 09:30:17 -03:00