7299_testToMaster #351

Merged

alexm merged 321 commits from 7299_testToMaster into master 2024-05-07 05:36:02 +00:00

Conversation 0 Commits 321 Files Changed 153 +13215 -4198

321 Commits

Author	SHA1	Message	Date
Alex Moreno	6a03038c3a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-30 07:58:56 +02:00
Alex Moreno	5378ed6f2e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-04-29 10:34:48 +02:00
Javier Segarra	22356966e1	Merge pull request 'Customer Fix: minor bugs, layout & vnlocation' (!325) from 6590_fix_CustomerAdressEdit into test ... Reviewed-on: #325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:00:41 +00:00
Javier Segarra	6e5ac0eeb9	fix: CustomerAdress layout	2024-04-25 14:44:32 +02:00
Javier Segarra	ccc6885172	Fix: minor bugs, layout & vnlocation	2024-04-25 04:41:44 +00:00
Alex Moreno	b265f9f705	Merge pull request '7253-devToTest_2418' (!315) from 7253-devToTest_2418 into test ... Reviewed-on: #315 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-23 08:12:46 +00:00
Pablo Natek	833f5e48a8	Merge pull request 'tests cypress' (!314) from fixCypressE2E into dev ... Reviewed-on: #314 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 07:39:59 +00:00
Pablo Natek	f85c44e1e2	Merge branch 'dev' into fixCypressE2E	2024-04-23 07:39:01 +00:00
Jon Elias	23ae47b5a5	fix e2e and skip claim photo	2024-04-23 09:38:03 +02:00
Alex Moreno	efbaa63e29	Merge pull request 'fix(VnNotes): refs #6336 VnAvatar' (!313) from 6336_fix_vn_notes_VnAvatar into dev ... Reviewed-on: #313 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-23 07:24:41 +00:00
Alex Moreno	9cb662b6f5	Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar	2024-04-23 07:22:34 +00:00
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: #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	952d5bf543	fix(VnNotes): refs #6336 VnAvatar	2024-04-22 15:03:10 +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: #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: #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: #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
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
Robert Ferrús	5feb4a21a5	Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev ... Reviewed-on: #276 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-16 07:38:35 +00:00
Robert Ferrús	81f29d815d	Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-16 09:33:58 +02:00
Robert Ferrús	87ae6870a9	feat: refs #6679 add icon	2024-04-16 09:33:56 +02:00
Robert Ferrús	130869dcdb	Merge branch 'dev' into 6679-addCreateIcon	2024-04-16 07:30:27 +00:00
Jorge Penadés	c2048afb53	Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev ... Reviewed-on: #290 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-16 06:38:56 +00:00
Robert Ferrús	d178d7dc6a	feat: refs #6679 add icon	2024-04-16 08:04:57 +02:00
Robert Ferrús	d70da976c2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-16 08:04:23 +02:00
Guillermo Bonet	46fa06cf1e	feat: refs #6724 Restriction QCheckbox entry isBooked	2024-04-16 07:14:00 +02:00
Guillermo Bonet	de68af5e13	feat: refs #6724 Disabled QCheckbox entry isBooked	2024-04-15 14:17:23 +02:00
William Buezas	d9d868a6af	Waste breakdown	2024-04-15 09:02:35 -03:00
William Buezas	c50741b4bf	Remove single quotes	2024-04-15 08:51:48 -03:00
Jorge Penadés	b2211369ea	fix: refs #6938 remove personal phone	2024-04-15 13:30:42 +02:00
Jorge Penadés	1e77e82784	fix: refs #6938 id filter	2024-04-15 13:28:10 +02:00
Robert Ferrús	058ddc8e9a	feat: refs #6500	2024-04-15 13:18:39 +02:00
Javier Segarra	e1716b9ea4	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-04-15 13:11:21 +02:00
Jorge Penadés	68069ba9c6	feat: refs #6938 hide personal phone	2024-04-15 12:48:07 +02:00
Alex Moreno	f176312163	feat(VnNotes): refs #6336 better design	2024-04-15 12:28:43 +02:00
Alex Moreno	4efe09722f	refs #6336 feat(claim): improvements	2024-04-15 08:40:15 +02:00
William Buezas	beaffbf685	delete old i18n files and adapt branch to the new ones	2024-04-12 10:20:05 -03:00
William Buezas	d38c85a0ef	resolve conflicts	2024-04-12 09:39:34 -03:00
William Buezas	b4d92d4f97	Fix Options item labels	2024-04-12 09:35:57 -03:00
Jon Elias	32382622e4	Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev ... Reviewed-on: #250 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-12 12:22:23 +00:00
Jon Elias	5cd32ec2fe	Merge branch 'dev' into 6425-translationProposal	2024-04-12 12:21:41 +00:00
Javier Casado	372863e693	Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev ... Reviewed-on: #248 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-04-12 11:48:36 +00:00
Jorge Penadés	a27bdc37d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes	2024-04-12 13:27:14 +02:00
William Buezas	f2dc50d229	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar	2024-04-12 08:13:58 -03:00
William Buezas	3d9d444bb4	remove filter field	2024-04-12 08:11:58 -03:00
William Buezas	c12fd77218	Remove businessFk from FetchData	2024-04-12 08:10:14 -03:00
Jon Elias	f83de74f01	refs #6425 fix conflicts	2024-04-12 11:44:56 +02:00
William Buezas	73703dc778	Add translations	2024-04-11 18:07:02 -03:00
William Buezas	c032c83e7f	Item create view	2024-04-11 08:40:41 -03:00
Javier Casado	a66ece1683	Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev ... Reviewed-on: #279 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-04-11 11:38:59 +00:00
Javier Casado	6002800000	Merge branch 'dev' into 7179-changesClaimSummary	2024-04-11 11:37:11 +00:00
Alex Moreno	cc633acfd9	deploy: refs #7199 init version 2418	2024-04-11 12:34:23 +02:00
Alex Moreno	3f8d97e2a3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-04-11 12:32:51 +02:00
Alex Moreno	9be132b8a0	Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev ... Reviewed-on: #280 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-11 05:56:27 +00:00
Robert Ferrús	de18b56cb2	feat: refs #6679 add icon	2024-04-10 14:47:20 +02:00
Robert Ferrús	f59ecbf94e	Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon	2024-04-10 14:42:48 +02:00
Robert Ferrús	7f2d8ee1e5	feat: refs #6679 add icon	2024-04-10 14:42:43 +02:00
William Buezas	9dfe5f5e68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 09:34:51 -03:00
William Buezas	99c576b16e	Add actions again	2024-04-10 09:32:15 -03:00
Javier Segarra	478ebfd0ea	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 12:22:19 +00:00
William Buezas	c881fe6577	Resolve conflicts	2024-04-10 09:19:54 -03:00
William Buezas	eceb60f6e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-10 08:46:00 -03:00
William Buezas	e4a8c45053	Change workweeks colod and capitalize	2024-04-10 08:32:04 -03:00
Robert Ferrús	a350de9119	Merge branch 'dev' into 6679-addCreateIcon	2024-04-10 11:30:21 +00:00
Robert Ferrús	933e6b88b1	feat: refs #6679 add icon	2024-04-10 13:24:20 +02:00
Jon Elias	6a203f593f	Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-04-10 12:53:45 +02:00
Jon Elias	eb91c0b1c2	Merge branch 'dev' into 6425-translationProposal	2024-04-10 12:53:44 +02:00
jcasado	c640ba1298	fix set	2024-04-10 09:31:38 +02:00
jcasado	70c9f1dea4	refs #7179 changes pr	2024-04-10 09:29:26 +02:00
William Buezas	fc4a69b2c6	resolve conflicts in worker routes	2024-04-09 15:28:11 -03:00
William Buezas	c3835dfd7a	resolve conflicts	2024-04-09 15:23:05 -03:00
William Buezas	9bffc9bb25	classes and size improvements	2024-04-09 15:20:29 -03:00
William Buezas	faa8d05313	Change saturday and sunday days color	2024-04-09 14:48:51 -03:00
William Buezas	c573019038	Sizes and spacings	2024-04-09 14:13:40 -03:00
William Buezas	9ea0a62046	Add border and change background color	2024-04-09 14:03:18 -03:00
William Buezas	dfcf6e35d5	Change WorkerEventLabels separations	2024-04-09 11:06:07 -03:00
William Buezas	3e5a5dfe1c	remove import	2024-04-09 10:53:07 -03:00
William Buezas	9c3407846b	Fix translation	2024-04-09 10:30:40 -03:00
jcasado	d8ef199b14	refs #7179 remove code	2024-04-09 14:55:27 +02:00
William Buezas	881c6e2f7f	Improve translations	2024-04-09 09:54:23 -03:00
William Buezas	fb4f35a378	Rename WorkerDateLabel and change colors	2024-04-09 09:21:35 -03:00
William Buezas	0941d74d52	Move default value assignment	2024-04-09 09:14:41 -03:00
William Buezas	196679b9e9	Change v-if variable	2024-04-09 09:07:46 -03:00
William Buezas	e4166c85fa	Move add absences text to a i18n variable	2024-04-09 09:05:15 -03:00
William Buezas	b05c28f571	Add chaining to holiday detail and holiday type	2024-04-09 08:57:39 -03:00
William Buezas	0144aab7a5	Mini fix	2024-04-09 08:51:00 -03:00
jcasado	97ad1c7579	refs #7179 changes customer proxy and client Id	2024-04-09 13:32:01 +02:00
William Buezas	e51ea9996b	Item list view	2024-04-09 08:18:18 -03:00
Robert Ferrús	cd3024c0a1	feat: refs #6679 add icon	2024-04-09 09:17:49 +02:00
William Buezas	64ff5e4446	Add pagination and table actions	2024-04-08 11:40:44 -03:00
William Buezas	4da540fc9c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList	2024-04-08 08:47:56 -03:00
William Buezas	f12ec3c0c9	Add redirection to summary and open summary action	2024-04-08 08:47:29 -03:00
William Buezas	4b6038d1d2	Last changes	2024-04-06 14:10:08 -03:00
William Buezas	dae08c322d	visual adjustments	2024-04-05 08:04:34 -03:00
William Buezas	ec2604b9ab	Fix customer samples create preview	2024-04-04 14:28:51 -03:00
William Buezas	87f376464b	Wait to render teleport until subtoolbar is shown	2024-04-04 13:48:57 -03:00
William Buezas	5ae54d557b	Fix form model beforeRouteLeave	2024-04-04 13:27:50 -03:00
William Buezas	cb55115cd2	Remove unused component	2024-04-04 12:02:43 -03:00
William Buezas	1cff622898	Fix customer balance calculation	2024-04-04 11:55:43 -03:00
William Buezas	82f259be32	Add focus to amount input in customer unpaid	2024-04-04 11:30:09 -03:00
William Buezas	78dc3c1c9a	Move data fetching to main component	2024-04-04 11:20:30 -03:00
William Buezas	fd5ea8f6f5	WIP	2024-04-04 09:27:17 -03:00
William Buezas	503efb79c9	WIP	2024-04-04 08:39:52 -03:00
Javier Segarra	0ad722381e	#6425 fix quotes in yml file	2024-04-04 13:38:25 +02:00
William Buezas	0f6c6cde91	Improve visually WorkerDateLabel	2024-04-03 17:32:22 -03:00
William Buezas	60b146196f	add calendar short-weekday-label	2024-04-03 13:48:41 -03:00
William Buezas	4ee8c45fdc	resolve conflicts	2024-04-03 11:22:52 -03:00
Jon Elias	94b177c9a2	fix: refs #6425 fix yml format	2024-04-03 14:33:47 +02:00
William Buezas	64b1083619	Add today date	2024-04-03 09:28:38 -03:00
Jon Elias	3e423867e3	fix: refs #6425 fix yml format	2024-04-03 13:12:00 +02:00
William Buezas	bfee37b631	WIP	2024-04-03 08:08:54 -03:00
Jon Elias	9a160d9248	refactor: refs #6425 merged changes	2024-04-03 12:57:23 +02:00
Jon Elias	cb31c2baa2	refs: #6425 merge conflicts	2024-04-03 12:56:56 +02:00
Jon Elias	fb795f65ee	refactor: refs #6425 test changes	2024-04-03 09:49:15 +02:00
William Buezas	fc87bb8293	Add page title name	2024-04-02 13:04:28 -03:00
William Buezas	146d3e87db	Change calendar extension	2024-04-02 12:29:31 -03:00
William Buezas	94644de4fa	VnSmsDialog adapt style and add tooltip	2024-04-02 10:44:02 -03:00
Jon Elias	33c54042df	refactor: refs #6425 translation files in .yml format and minor changes	2024-04-02 14:12:01 +02:00
Kevin Martinez	47a588fff4	Update WorkerCalendarItem	2024-04-02 09:00:15 -03:00
William Buezas	107eaea704	Remove unused variable in CustomerSummaryTableActions	2024-04-02 08:57:22 -03:00
William Buezas	6028fd0c4d	empty commit test	2024-04-02 08:45:51 -03:00
William Buezas	3e124581c4	Remove route import in CustomerCard	2024-04-02 08:37:52 -03:00
Jon Elias	1316fe3896	Merge branch 'dev' into 7130-addFieldInRoutes	2024-04-02 05:14:15 +00:00
William Buezas	bafb938e23	VnSmsDialog add default value to template prop as empty string	2024-03-28 17:10:07 -03:00
William Buezas	3cb045936b	Replace Customer File management dateTime formatting with new utils	2024-03-28 16:25:02 -03:00
William Buezas	73ea49df63	Replace Customer Greuges dateTime formatting with new utils	2024-03-28 16:21:49 -03:00
William Buezas	093c367d7e	Replace Customer Mandates dateTime formatting with new utils	2024-03-28 16:18:36 -03:00
William Buezas	fb59ac1f2f	Remove single quotes and colon	2024-03-28 16:15:44 -03:00
William Buezas	f6b8a73ae2	Improve Customer Notes classes definition	2024-03-28 16:13:39 -03:00
William Buezas	e1f8b7217a	Replace Customer Notes dateTime formatting with new utils	2024-03-28 16:11:01 -03:00
William Buezas	c856adc8d0	Replace customer samples dateTime formatting with new utils	2024-03-28 16:07:20 -03:00
William Buezas	d8dc969614	Fix date utils	2024-03-28 16:06:27 -03:00
William Buezas	998561badd	Change customer unpaid initial date	2024-03-28 15:58:07 -03:00
Jon Elias	37d869d1d5	refactor: refs #7130 requested changes	2024-03-28 12:19:55 +01:00
Kevin Martinez	0dee7e8cc9	Create worker calendar submodule	2024-03-27 16:51:44 -03:00
Jon Elias	6df1d0cf99	feat: #7130 added "served" field to RouteList table and added to the filter too.	2024-03-27 07:55:50 +01:00
Kevin Martinez	3d1e34a5b0	Create worker date label	2024-03-24 16:05:04 -03:00
Javier Segarra	36a6554fb1	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-03-22 06:16:40 +00:00
William Buezas	aa8e052633	QCalendar implementation test	2024-03-21 11:15:18 -03:00
Javier Segarra	fedec76b62	refs #6907 feat: merge changes	2024-03-21 13:11:22 +01:00
Javier Segarra	18d4be0ea2	refs #6907 feat: merge changes	2024-03-21 12:33:28 +01:00
Jon Elias	7658573ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal	2024-03-21 12:23:45 +01:00
Jon Elias	63c6b523fb	refactor: refs #6425 new translation proposal	2024-03-21 12:14:54 +01:00
Javier Segarra	f5d6c45339	refs #6907 updates	2024-03-21 10:45:30 +01:00
Javier Segarra	4ffabaa4f2	Merge branch '6907_fix_input_clearable_hover' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-03-21 10:30:59 +01:00
Javier Segarra	85a78d847b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-03-21 10:30:51 +01:00
jcasado	2f27b8537c	refactor: #6946 add table and floating button	2024-03-20 12:50:47 +01:00
William Buezas	643e068863	remove tabs in docker-compose.yml	2024-03-15 10:51:20 -03:00
Javier Segarra	9ecb0643b6	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-03-15 09:27:09 +00:00
Javier Segarra	e0e5082e1e	refs #6321 perf: replace QIcon with clearable prop	2024-03-15 06:16:37 +01:00
Carlos Fonseca	f25e46cf08	Merge branch 'dev' into PR-CUSTOMER	2024-03-15 03:12:46 +00:00
carlosfonseca	da23ff7ca2	Correcciones generales	2024-03-14 22:11:38 -05:00
carlosfonseca	4a2a855f58	Correcciones generales customers 37	2024-03-14 11:54:22 -05:00
Carlos Fonseca	a3097a9223	Merge branch 'dev' into PR-CUSTOMER	2024-03-14 10:55:02 +00:00
William Buezas	4925bed845	resolve conflicts	2024-03-13 11:31:55 -03:00
William Buezas	fe737324ea	Fix unpaid bug	2024-03-13 11:14:11 -03:00
William Buezas	0f85bd25a2	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-03-13 10:15:46 -03:00
William Buezas	41e1bad44d	Handle more watchs route changes bugs	2024-03-13 10:15:32 -03:00
carlosfonseca	1e9b3f8f0e	Solucion a comentarios 36	2024-03-13 07:41:55 -05:00
William Buezas	91bd396eab	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-03-13 09:33:25 -03:00
William Buezas	0ba7ea86ed	Handle customer balance id null on route change exception	2024-03-13 09:33:07 -03:00
carlosfonseca	0aa5a051fb	Solucion a comentarios 35	2024-03-13 07:09:13 -05:00
William Buezas	09582ab6a8	WIP	2024-03-13 09:05:23 -03:00
carlosfonseca	38d3d49ecb	Solucion a comentarios 34	2024-03-12 16:24:27 -05:00
carlosfonseca	5ff90d127b	Solucion a comentarios 33	2024-03-10 21:20:19 -05:00
carlosfonseca	c844d26ccb	Solucion a comentarios 32	2024-03-07 20:45:52 -05:00
carlosfonseca	dc3b91032c	Solucion a comentarios 31	2024-03-07 09:21:20 -05:00
Javier Segarra	764ccbd151	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-03-07 14:25:33 +01:00
carlosfonseca	d74119f433	Solucion a comentarios 30	2024-03-05 11:14:56 -05:00
carlosfonseca	09a2af4124	Solucion a comentarios 29	2024-03-04 06:27:17 -05:00
carlosfonseca	f8b698e4e7	Solucion a comentarios 28	2024-02-29 13:32:28 -05:00
carlosfonseca	663010a0d4	Solucion a comentarios 27	2024-02-29 07:08:34 -05:00
William Buezas	49cd90d9ff	resolve customer extended list conflicts	2024-02-28 13:03:27 -03:00
William Buezas	a0f9c811ff	resolve conflicts	2024-02-28 12:56:13 -03:00
carlosfonseca	93015d9f98	Solucion a comentarios 26	2024-02-28 08:28:46 -05:00
carlosfonseca	e56aa6587f	Solucion a comentarios 25	2024-02-28 06:37:15 -05:00
carlosfonseca	0a33b8d92a	Solucion a comentarios 24	2024-02-27 11:38:58 -05:00
William Buezas	c767bcde7d	Add scroll on LeftMenu item expansion	2024-02-27 10:55:45 -03:00
Javier Segarra	88cf5160f8	refs #6907 test: update ClaimDevelopment spec	2024-02-27 11:31:46 +01:00
Javier Segarra	0e4936bd0f	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-27 09:31:55 +00:00
carlosfonseca	7eca27b8af	Solucion a comentarios 23	2024-02-26 09:58:38 -05:00
carlosfonseca	efb676e4a4	Solucion a comentarios 22	2024-02-26 06:59:33 -05:00
Javier Segarra	453a27ac70	Merge branch '6907_fix_input_clearable_hover' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-02-26 12:01:00 +01:00
Javier Segarra	5916cb29d4	refs #6722 test: improve	2024-02-26 12:00:57 +01:00
Javier Segarra	7b5f4230df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover	2024-02-26 10:42:22 +01:00
Javier Segarra	a7b87473b0	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-26 09:18:32 +00:00
Javier Segarra	1f46f534ec	refs #6907 test: update VnSearchBar spec	2024-02-26 10:17:25 +01:00
Javier Segarra	f596620cfc	refs #6907 feat: add click event inside input	2024-02-26 07:27:58 +01:00
Javier Segarra	9e9ad577f4	refs #6907 feat: add mask and today button	2024-02-26 07:23:04 +01:00
Javier Segarra	926f3b6950	refs #6907 feat: add mouseEvent VnInputDate	2024-02-26 07:22:34 +01:00
carlosfonseca	b12968f982	Solucion a comentarios 21	2024-02-25 22:28:56 -05:00
carlosfonseca	90ee50eab5	Solucion a comentarios 20	2024-02-22 18:01:38 -05:00
carlosfonseca	2c70a73b8e	Solucion a comentarios 19	2024-02-22 13:49:06 -05:00
carlosfonseca	9ae0874ccf	Solucion a comentarios	2024-02-22 10:44:29 -05:00
William Buezas	f69b25716d	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-02-22 10:38:30 -03:00
William Buezas	1b67b7ab36	Customer description corrections and creation of tickets create view	2024-02-22 10:38:15 -03:00
carlosfonseca	d9a1d62c74	Solucion a comentarios	2024-02-22 05:57:28 -05:00
carlosfonseca	980904a382	Solucion a comentarios 18	2024-02-22 05:46:56 -05:00
carlosfonseca	3bcd4984f5	Solucion a comentarios 17	2024-02-22 05:11:02 -05:00
Javier Segarra	c9cdb721d6	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-21 13:15:36 +00:00
Javier Segarra	b67a359068	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-21 12:25:49 +00:00
Javier Segarra	6227795100	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-21 12:18:42 +00:00
Javier Segarra	627fa12748	Merge branch 'dev' into 6907_fix_input_clearable_hover	2024-02-21 12:14:56 +00:00
Javier Segarra	f075041da3	refs #6907 fix: revert autofocus property	2024-02-21 09:21:22 +01:00
Javier Segarra	1e7c8e03df	refs #6907 feat: fix_input_clearable_hover	2024-02-21 09:19:06 +01:00
carlosfonseca	d06271b91d	Solucion a comentarios 16	2024-02-20 19:02:42 -05:00
William Buezas	a0d75e5b02	Remove unnecesary validate un CustomerNotificationsFilter	2024-02-20 16:10:41 -03:00
William Buezas	7c8b0a345e	Fix CustomerSummaryTableActions import	2024-02-20 16:02:32 -03:00
carlosfonseca	01d68734b6	Correccion de conflictos	2024-02-20 12:15:27 -05:00
carlosfonseca	a0e5549311	Solucion a comentarios 15	2024-02-20 11:43:01 -05:00
William Buezas	e48b094280	Merge pull request 'Customer contacts view' (#90) from bugfix/CustomerContacts into PR-CUSTOMER ... Reviewed-on: hyervoni/salix-front-mindshore#90	2024-02-20 12:52:33 +00:00
William Buezas	f1f0f9fffb	Customer contacts view	2024-02-20 09:48:09 -03:00
carlosfonseca	86199d8197	Solucion a comentarios 14	2024-02-19 11:27:24 -05:00
carlosfonseca	bb10714824	Solucion a comentarios 13	2024-02-19 05:24:26 -05:00
carlosfonseca	d0cf13d0af	Solucion a comentarios 12	2024-02-16 13:29:36 -05:00
carlosfonseca	ebd1ee07f4	Solucion a comentarios 11	2024-02-16 13:12:57 -05:00
carlosfonseca	17a0afda73	Solucion a comentarios 10	2024-02-15 21:42:29 -05:00
carlosfonseca	5e2c668fec	Solucion a comentarios 9	2024-02-14 19:17:18 -05:00
carlosfonseca	ab20ec1738	Solucion a comentarios 8	2024-02-14 12:21:00 -05:00
carlosfonseca	08e072100b	Solucion a comentarios 7	2024-02-13 21:10:10 -05:00
William Buezas	617200331d	remove unnecesary code	2024-02-13 14:58:51 -03:00
William Buezas	da5186f184	Show sample preview as v-html	2024-02-13 14:53:29 -03:00
carlosfonseca	d0e98010a5	Solucion a comentarios 6	2024-02-13 12:50:00 -05:00
carlosfonseca	c0a9835e80	Solucion a comentarios 5	2024-02-12 20:37:51 -05:00
carlosfonseca	6bf9b7c0c8	Se deshacen cambios que se hicieron el el commit 11eb597fa3	2024-02-12 14:09:26 -05:00
carlosfonseca	3cf3687b84	Correccion de comentarios3	2024-02-12 13:54:17 -05:00
carlosfonseca	11eb597fa3	Correccion de comentarios2	2024-02-08 20:24:48 -05:00
carlosfonseca	7f1c4690e8	Correccion de comentarios	2024-02-08 13:25:44 -05:00
carlosfonseca	fcdcfd9e97	Modulo customer completo	2024-02-07 06:20:08 -05:00
Carlos Fonseca	5127369e5c	Merge pull request 'Se termina desarrollo de las tarjetas gestion documental e impagado' (#88) from features/ms_164_file_management_card into dev ... Reviewed-on: hyervoni/salix-front-mindshore#88	2024-02-06 16:09:27 +00:00
Carlos Fonseca	f2a877557f	Merge branch 'dev' into features/ms_164_file_management_card	2024-02-06 16:06:14 +00:00
carlosfonseca	fd3eea70de	Se corrigen comentarios de PR	2024-02-06 11:04:37 -05:00
carlosfonseca	01ffe3adb7	Se termina desarrollo de las tarjetas gestion documental e impagado	2024-02-05 15:51:09 -05:00
William Buezas	a88b1137dc	Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev	2024-02-02 14:11:36 -03:00
William Buezas	dc554f03d0	merge with salix-front dev	2024-02-02 14:11:12 -03:00
Carlos Fonseca	94ca3318a3	Merge pull request 'Desarrollo de tarjetas varias en el modulo de clientes en el summary' (#86) from features/ms_160_contracts_opinion_credit_cards into dev ... Reviewed-on: hyervoni/salix-front-mindshore#86	2024-02-02 13:25:42 +00:00
carlosfonseca	b06e5b9252	Correcciones comentarios pr	2024-02-02 08:21:23 -05:00
carlosfonseca	9c351b6494	Tarjeta pago web sin contenido	2024-01-31 08:56:19 -05:00
carlosfonseca	7b3ff319d4	Desarrollo de tarjetas varias en el modulo de clientes en el summary	2024-01-31 07:32:34 -05:00
William Buezas	26a1b29070	mini fix in travel termograph create	2024-01-30 22:12:53 -03:00
William Buezas	f0778daaa6	Merge pull request 'feature/TravelSubmodules' (#83) from feature/TravelSubmodules into dev ... Reviewed-on: hyervoni/salix-front-mindshore#83 Reviewed-by: Carlos Fonseca <cfonseca@verdnatura.es>	2024-01-30 15:50:23 +00:00
William Buezas	b440545ac9	Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TravelSubmodules	2024-01-29 16:33:56 -03:00
William Buezas	6096123c6e	Mejoras y cosas faltantes	2024-01-29 16:33:39 -03:00
William Buezas	f911a644e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-01-29 12:40:25 -03:00
William Buezas	7eda82bf82	Improvements WIP	2024-01-29 10:57:43 -03:00
William Buezas	8cc92f127c	merge with dev	2024-01-27 16:10:15 -03:00
William Buezas	9757fdf70a	Travel termographs and general improvements	2024-01-27 16:08:02 -03:00
William Buezas	91cd4c35e8	TravelSummary improvements	2024-01-27 13:14:02 -03:00
William Buezas	cbd8af7fae	In TravelList show warehouses name instead warehouseFk	2024-01-27 10:49:49 -03:00
William Buezas	0c385d9a6f	WIP	2024-01-22 11:22:22 -03:00
William Buezas	1c689ce966	Travel termographs WIP	2024-01-19 09:24:57 -03:00
William Buezas	d4a89895b4	WIP	2024-01-18 11:19:23 -03:00