2500 Commits

All Branches

Search

Author	SHA1	Message	Date
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: #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: #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: #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: #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: #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: #259 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-18 09:34:31 +00: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: #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
Javier Segarra	817a8fcc71	Merge branch 'dev' into 7180_bug_supplierListScroll	2024-04-18 06:06:01 +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' (!291) from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev ... Reviewed-on: #291 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 #7130 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' (!285) from hyervoni/salix-front-mindshore:feature/ItemCreate into dev ... Reviewed-on: #285 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 #6930 Undo rollback salix-back' (!301) from 6930_undo_rollback into dev ... Reviewed-on: #301 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 11:38:29 +00:00
Javier Segarra	5d7cee38bd	feat(lilium): refs #6930 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 '#6930 - Revert/Undo rollback' (!299) from 6930_undo_rollback into dev ... Reviewed-on: #299 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-17 11:04:48 +00:00
Alex Moreno	52a0be449d	feat: refs #6336 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 #6930 Improve setToken fn	2024-04-17 10:09:44 +02:00
Javier Segarra	b95d44c05d	feat(lilium): refs #6930 Undo rollback lilium	2024-04-17 10:07:44 +02:00
Guillermo Bonet	dca954850b	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!295) from 6968-groupingModeRefactor into dev ... Reviewed-on: #295 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) #7180 SupplierList Scroll	2024-04-17 08:41:47 +02:00
William Buezas	a397c6ed30	remove component import	2024-04-16 12:18:36 -03:00
Alex Moreno	892c5986c0	Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev ... Reviewed-on: #294 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
Alex Moreno	5d6a10050e	Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev ... Reviewed-on: #270 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-16 12:26:20 +00:00
William Buezas	2ab7a45114	resolve conflicts	2024-04-16 08:49:34 -03:00
Javier Segarra	adb31497e5	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-04-16 10:20:25 +00:00
Jon Elias	b216112d2a	refactor: refs #6425 fix failed tests	2024-04-16 11:42:43 +02:00
Guillermo Bonet	7b29832966	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:12:23 +02:00
Jon Elias	73c5a5b7d2	fix: refs #6425 fixed dev translations	2024-04-16 11:00:38 +02:00