2729 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	c1f64b88b4	Merge pull request 'FIX Merge PR-CUSTOMER' (!309) from fix_Customer_merge into dev ... Reviewed-on: #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: #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
Jorge Penadés	7a4f975cc9	fix: refs #6480 fix warning	2024-04-19 13:52:19 +02:00
Jorge Penadés	bd539449a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-19 13:33:47 +02:00
Jorge Penadés	da6e121137	refactor: refs #6480 use VnCard	2024-04-19 13:33:29 +02:00
Jorge Penadés	c3db9e17a8	fix: refs #6480 reactive summary	2024-04-19 13:30:07 +02:00
Jorge Penadés	e38b53ca25	fix: refs #6480 reactive descriptor	2024-04-19 13:12:14 +02:00
Jorge Penadés	3fb155e697	fix: refs #6480 reactivity	2024-04-19 11:57:04 +02:00
Jorge Penadés	2450d5bf7a	reafacto: refs #6480 slots	2024-04-19 11:40:52 +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
Jorge Penadés	de0468bb99	fix: refs #6480 summary reactivity	2024-04-19 10:32:52 +02:00
Jorge Penadés	b352dcde21	fix: refs #6480 summary data-key	2024-04-19 09:42:42 +02:00
Jorge Penadés	ff36f82333	fix: refs #6480 disable popup on no observe changes	2024-04-19 09:39:17 +02: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
Jorge Penadés	9887d59808	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-19 09:01:37 +02:00
Jorge Penadés	dfdfb6ec93	feat: refs #6480 locale	2024-04-18 15:25:32 +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
Jorge Penadés	246944d2a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-18 14:10:41 +02:00
William Buezas	b52b70041c	resolve pnpm lock conflicts and change some colors	2024-04-18 08:33:23 -03:00
Jorge Penadés	f8da680e98	feat: refs #6480 setArrayData	2024-04-18 13:33:21 +02: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
Jorge Penadés	75975b631e	feat: refs #6480 include SearchBar into VnCard	2024-04-18 11:32:03 +02:00
Jorge Penadés	90ed6ad09a	fix: refs #6480 drop secondary acroos	2024-04-18 10:49:17 +02: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
Jorge Penadés	b71068ac64	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard	2024-04-18 08:44:10 +02: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
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' (!303) from 7226-testToMaster_2416 into master ... Reviewed-on: #303 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-18 05:41:10 +00:00