969 Commits

Author	SHA1	Message	Date
Jorge Penadés	ebcb356230	Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData	2024-12-02 13:42:14 +01:00
Jon Elias	35201cb2d3	fix: refs #6242 conflicts	2024-11-29 10:41:17 +01:00
Jon Elias	b590c91892	Merge branch 'dev' of https: refs #6242//gitea.verdnatura.es/verdnatura/salix-front into 6242-AddHasRoundingField	2024-11-29 10:41:05 +01:00
Robert Ferrús	9e75d16976	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-29 08:56:19 +00:00
Robert Ferrús	68c691587d	feat: refs #8001 change request	2024-11-29 09:55:22 +01:00
Guillermo Bonet	bf8b9e4283	Merge branch 'test' into dev	2024-11-29 09:48:43 +01:00
Guillermo Bonet	8428c7a205	fix: refs #7920 Changed shelving option value	2024-11-29 09:48:09 +01:00
Robert Ferrús	3c026c9b28	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-29 07:39:33 +00:00
Robert Ferrús	87b5af7060	feat: refs #8001 change request	2024-11-29 08:38:38 +01:00
Alex Moreno	50796df06a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-29 07:28:06 +01:00
Javier Segarra	280a70a145	fix: remove message when setWeigth ticket	2024-11-28 14:05:04 +01:00
Jon Elias	4193710123	Merge branch 'master' into Hotfix-ZoneEventsExclusion	2024-11-28 12:43:41 +00:00
Javier Segarra	07274002cf	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-28 12:33:07 +00:00
Robert Ferrús	8b26cc61a5	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-28 09:44:43 +00:00
Pablo Natek	a7e798a7ad	Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake	2024-11-28 08:52:36 +01:00
Alex Moreno	a251e348a8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-28 08:41:56 +01:00
Javier Segarra	38d8dbab8e	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-27 18:28:20 +00:00
Javier Segarra	844d72a2e3	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-27 18:20:41 +00:00
Jon Elias	e94c99662d	Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion	2024-11-27 12:53:08 +01:00
Jon Elias	e764f4066f	fix: ticket notes translation and deleted useless code	2024-11-27 12:53:07 +01:00
Javier Segarra	dc156e44b6	Merge branch 'master' into hotfix_ticketSale_enter	2024-11-27 07:40:24 +00:00
Javier Segarra	e3bdea2197	fix: ticketSale keyup.enter	2024-11-27 01:15:16 +01:00
Javier Segarra	ff91ca2dfe	feat: remove More options separator	2024-11-26 23:57:10 +01:00
Javier Segarra	cf34204f82	Merge branch 'master' into hotfix_8217_updateCustomerCredit	2024-11-26 23:21:05 +01:00
Alex Moreno	9086b7d48d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-26 14:20:08 +01:00
Javier Segarra	0e9fe82d3d	Merge branch 'master' into hotfix_addressSelect_optionFormat	2024-11-26 12:23:39 +01:00
Pablo Natek	9078417746	feat: refs #8004 merge dev	2024-11-26 10:13:37 +01:00
Alex Moreno	2076072eeb	fix(TicketSale): set old quantity when error	2024-11-26 09:21:51 +01:00
Alex Moreno	8fbf7fed43	fix(TicketSale): throw error when it should	2024-11-26 09:05:46 +01:00
Javier Segarra	c3510aea60	feat: add Options Style in AddressList from TicketCrete	2024-11-26 00:18:42 +01:00
Javier Segarra	a45bf4c83b	perf: remove comments	2024-11-24 08:49:03 +01:00
Alex Moreno	26c1394321	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-22 10:52:51 +01:00
Alex Moreno	367f660508	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-22 10:52:30 +01:00
Alex Moreno	bf29be1c5f	fix: remove all try catch(err) (error) console.error	2024-11-22 08:39:46 +01:00
Alex Moreno	8cbf40f465	fix(TicketSummary): observationTypes use .description	2024-11-22 07:45:49 +01:00
Alex Moreno	3b03f0dfee	fix(TicketNotes): observationTypes use .description	2024-11-22 07:43:59 +01:00
Robert Ferrús	c6d0dbc318	Merge branch 'dev' into 8001-expeditionGrafana	2024-11-22 05:38:52 +00:00
Carlos Andrés	242bf6f318	Merge branch 'dev' into 8087-nuevosCamposTravel	2024-11-21 11:45:20 +00:00
Javier Segarra	81d7b9f04f	Merge branch 'dev' into 8162-E2ETickets	2024-11-21 08:20:29 +00:00
Alex Moreno	9e41459da4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-21 07:59:53 +01:00
Alex Moreno	6b8470d6e1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-21 07:59:42 +01:00
William Buezas	8e411125bf	test: refs #8162 more tests and change data-testid for data-cy	2024-11-20 18:58:08 -03:00
Carlos Andrés	c21785b1f6	Merge branch '8087-nuevosCamposTravel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel	2024-11-20 14:29:56 +01:00
Carlos Andrés	16133faca7	feat: refs #8087 refs#8087 Redadas en travel	2024-11-20 14:29:53 +01:00
Javi Gallego	2a1cc49499	fix: ticketDescriptor	2024-11-20 13:15:40 +01:00
Carlos Andrés	317e9ad034	Merge branch 'dev' into 8087-nuevosCamposTravel	2024-11-20 12:14:50 +00:00
Jon Elias	2b235e93e7	feat: refs #8194 created VnSelectWorker component and use it in Lilium	2024-11-20 11:25:17 +01:00
Pablo Natek	8b5a2cd159	Merge branch 'dev' into 8138-add-component-ticketProblems	2024-11-20 05:02:13 +00:00
Jorge Penadés	8e9e8a8c78	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8166-fixAdvanceTickets	2024-11-19 15:46:05 +01:00
Jorge Penadés	73b7fa7704	feat: refs #8166 show notification	2024-11-19 15:43:55 +01:00
Jorge Penadés	e54eb50265	fix: refs #8166 show zone error	2024-11-19 15:35:57 +01:00
Alex Moreno	fdafeee39d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-11-19 14:49:22 +01:00
Carlos Andrés	5da6e9b2ca	Merge branch 'dev' of https: refs #8087//gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel	2024-11-19 14:04:13 +01:00
Pablo Natek	479c428edf	Merge branch '8138-add-component-ticketProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into 8138-add-component-ticketProblems	2024-11-19 13:51:23 +01:00
Pablo Natek	3824f5d124	fix: refs #8138 move component from ui folder	2024-11-19 13:51:19 +01:00
Carlos Andrés	8c20b8736b	feat: refs #8087 refs#8087 Redadas en travel	2024-11-19 11:10:37 +01:00
Jorge Penadés	efcf3be585	feat: refs #6919 sync ticket	2024-11-19 10:11:33 +01:00
Jorge Penadés	5b9f9d38a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData	2024-11-19 09:34:11 +01:00
Alex Moreno	e7b431e9ec	fix(VnPaginate): disable pagination	2024-11-19 09:32:35 +01:00
Pablo Natek	6ab31fa2d2	Merge branch 'dev' into 8138-add-component-ticketProblems	2024-11-19 07:02:32 +00:00
Pablo Natek	e119bf5bfc	feat: refs #8138 add component ticket problems	2024-11-19 07:59:14 +01:00
Alex Moreno	afaf2df2ee	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-19 07:56:04 +01:00
Jorge Penadés	a44ea9384a	Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData	2024-11-18 16:25:51 +01:00
William Buezas	28bfda869a	refactor: refs #8162 remove comment	2024-11-18 10:47:57 -03:00
Alex Moreno	f3ca51aab4	Merge branch 'master' into hotfix-orderTickets	2024-11-18 12:30:22 +00:00
Carlos Satorres	d3993442b6	fix: hotfix OrderTickets	2024-11-18 13:26:27 +01:00
Javier Segarra	2f06eea8ea	Merge branch 'dev' into 8162-E2ETickets	2024-11-18 12:03:10 +00:00
Alex Moreno	dd490888cf	merge test in dev	2024-11-18 11:23:36 +01:00
Javier Segarra	f52095a2fc	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:57:49 +01:00
Alex Moreno	383f51c1b2	refactor(TicketDescritporMenu): url isEditable	2024-11-18 10:57:26 +01:00
Javier Segarra	0c36d385ec	Merge branch 'test' into solveConflicts_test_to_dev	2024-11-18 10:50:42 +01:00
Alex Moreno	09aad5914f	feat(TicketSummary): add ticketDescritporMenu	2024-11-18 10:49:30 +01:00
Alex Moreno	b74c1d1823	Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped	2024-11-18 09:12:28 +00:00
Alex Moreno	48513868b1	Merge branch 'master' into hotFix_arrayData_store_data	2024-11-18 09:04:21 +00:00
Alex Moreno	e230cc61a0	fix(TicketBasicData): getShipped, getLanded & bad try catch	2024-11-18 09:18:06 +01:00
William Buezas	d8c1bd5b16	test: refs #8162 more tests	2024-11-17 15:24:46 -03:00
Jon Elias	1dc2f54f61	Merge branch 'master' into Hotfix-SalesMana	2024-11-15 13:31:53 +00:00
Jon Elias	89661397fb	Merge branch 'master' into Hotfix-TicketList	2024-11-15 11:09:20 +00:00
Jon Elias	1fc2ae0689	Merge branch 'master' into Hotfix-TicketList	2024-11-15 10:53:53 +00:00
Jon Elias	eb287696fa	fix: fixed state column in ticket list	2024-11-15 11:49:46 +01:00
Javier Segarra	4d8432feb5	revert: #6943 address star feature	2024-11-15 11:46:55 +01:00
Javier Segarra	87ba74bcfc	perf: #6943 Create ticket from client	2024-11-15 11:39:43 +01:00
Jon Elias	141cb32cae	Merge branch 'master' into Hotfix-SalesMana	2024-11-15 07:23:59 +00:00
Jon Elias	354f2ce055	fix: deleted duplicate VnUsesMana	2024-11-15 08:21:29 +01:00
Jorge Penadés	565ec15589	feat: refs #6919 improve vn-card logic	2024-11-14 17:30:54 +01:00
Javier Segarra	61cd8c49c6	Merge branch 'dev' into warmFix_customerDescriptorActions	2024-11-14 12:22:33 +00:00
Alex Moreno	73c6dcfdd1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-11-14 12:20:17 +01:00
Javier Segarra	ecf131ba78	feat: move buttons to DescriptorMenu	2024-11-14 12:06:12 +01:00
Alex Moreno	94c7ee3ae3	fix: arrayData store shared	2024-11-14 10:36:42 +01:00
Jon Elias	540e0348a1	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-11-13 14:10:08 +01:00
Jon Elias	244c23be1d	fix: allow decimal numbers when creating a purchase request	2024-11-13 13:40:19 +01:00
William Buezas	4bfbd1925e	test: refs #8162 ticket list e2e tests	2024-11-11 15:18:29 -03:00
Carlos Andrés	fc73149dcf	feat: refs #8087 refs#8087 Redadas en travel	2024-11-11 14:20:39 +01:00
Jorge Penadés	0cf6ee7590	feat: refs #6583 add icon	2024-11-07 16:14:25 +01:00
Jorge Penadés	1dcdc54ab8	feat: refs #6583 add destination opt filter	2024-11-06 13:45:02 +01:00
Jon Elias	8be4210138	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress	2024-10-29 13:21:56 +01:00
Jon Elias	476ef1dedd	feat: refs #7206 added inactive label and corrected minor errors	2024-10-29 13:14:42 +01:00
Jon Elias	1ff77abaf5	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-29 08:26:16 +00:00
Robert Ferrús	6878a79c44	Merge branch 'dev' into 8001-expeditionGrafana	2024-10-29 07:03:50 +00:00
Jon Elias	ac3013205e	Merge branch 'dev' into 7970-NotifySaleChanges	2024-10-28 11:46:02 +00:00
Jon Elias	639e08406e	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-28 11:22:23 +00:00
Alex Moreno	ffee9fb27c	Merge branch 'dev' into fix_itemType-redirection	2024-10-28 09:14:21 +00:00
Alex Moreno	cca255507a	fix: itemType redirection and fix filters	2024-10-28 09:57:25 +01:00
Robert Ferrús	d16f4f3154	Merge branch 'dev' into 8001-expeditionGrafana	2024-10-28 08:13:10 +00:00
Jon Elias	454be43884	Merge branch 'dev' into 7970-NotifySaleChanges	2024-10-28 07:17:06 +00:00
Jon Elias	ca6547e174	feat: refs #7970 notify changes	2024-10-28 07:48:11 +01:00
Jorge Penadés	1da86900e6	fix: refs #7524 e2e & worker module	2024-10-27 13:43:38 +01:00
Alex Moreno	c127fee467	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-25 13:08:37 +02:00
Alex Moreno	c1e4c45318	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-25 13:08:26 +02:00
Jon Elias	9ba16e4116	Merge branch 'Hotfix-RecalculatePriceReload' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-RecalculatePriceReload	2024-10-25 06:48:11 +02:00
Jon Elias	994237260e	refactor: changed name of emitted event	2024-10-25 06:48:09 +02:00
Carlos Satorres	67a5d10a5e	Merge branch 'dev' into 7283-itemMigration	2024-10-24 13:10:23 +00:00
Alex Moreno	fd72f4dd45	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-24 14:45:34 +02:00
Jon Elias	7a4e43a025	Merge branch 'master' into Hotfix-RecalculatePriceReload	2024-10-24 12:13:48 +00:00
Carlos Satorres	92ff8c188e	Merge branch 'dev' into 7283-itemMigration	2024-10-24 11:39:33 +00:00
Robert Ferrús	3ab4574155	feat: refs #8001 ticketExpeditionGrafana	2024-10-24 13:35:57 +02:00
Jon Elias	e18d129b32	fix: refs #6242 merge conflicts	2024-10-24 12:56:33 +02:00
Jorge Penadés	c9cfb2b1cf	fix: refs #7524 changes	2024-10-24 12:29:46 +02:00
Jon Elias	c9e82f2caf	refactor: deleted log	2024-10-24 12:04:54 +02:00
Jon Elias	b02199eb07	fix: reload window when price is recalculated	2024-10-24 12:03:49 +02:00
Jorge Penadés	f1350dece5	fix: refs #7524 changes	2024-10-24 11:43:29 +02:00
Jorge Penadés	2779e7ac8d	Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-warmfix-useVnTable	2024-10-24 10:29:55 +02:00
Jorge Penadés	d918b76010	chore: refs #7524 drop useless code	2024-10-24 10:24:28 +02:00
Jorge Penadés	6f57d9e490	refactor: refs #7524 use VnTable	2024-10-24 10:21:25 +02:00
Alex Moreno	de7f55c589	Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-24 07:56:00 +02:00
Alex Moreno	f26976b744	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-24 07:49:01 +02:00
Jorge Penadés	1bfede4a55	fix: refs #8083 drop useless code	2024-10-23 16:13:32 +02:00
Jorge Penadés	4e31566ddd	fix: refs #8083 drop useless code	2024-10-23 16:13:04 +02:00
Jorge Penadés	33ee1ea01b	fix: refs #8083 drop useless code	2024-10-23 16:11:58 +02:00
Jorge Penadés	126bb3f039	feat: refs #8083 insert	2024-10-23 16:10:14 +02:00
Jorge Penadés	9673f7be1e	fix: refs #8083 update rightly	2024-10-23 15:17:06 +02:00
Alex Moreno	2420c6dee2	Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify	2024-10-23 13:14:30 +02:00
Jon Elias	76ed5150a5	Merge branch 'dev' into Fix_OrderModuleProblems	2024-10-23 11:05:14 +00:00
Jon Elias	03f2da8169	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-10-23 12:14:50 +02:00
Carlos Satorres	84dae53d66	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-23 07:53:02 +02:00
Alex Moreno	aaf749db6c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-22 15:08:11 +02:00
Jorge Penadés	033d6bddbe	fix: refs #8083 move expeditions	2024-10-22 14:43:43 +02:00
Jorge Penadés	da4c1e9c12	fix: refs #8083 add order	2024-10-22 14:36:30 +02:00
Jorge Penadés	9f3c834ce4	Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState	2024-10-22 14:24:41 +02:00
Jorge Penadés	b1a511ff6f	fix: refs #8083 delete btn & redirect	2024-10-22 14:21:03 +02:00
Alex Moreno	dd2dc86eea	fix: refs #8039 o not handle unnecessary errors	2024-10-22 14:05:15 +02:00
Jorge Penadés	f751408de2	feat: refs #8083 add change state btn	2024-10-22 13:22:43 +02:00
Javier Segarra	fff3310658	fix: refs #7283 tooltips !Item	2024-10-22 12:09:32 +02:00
Jon Elias	5b116a7301	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems	2024-10-22 11:31:45 +02:00
Jorge Penadés	0fbd5f45e1	fix: refs #7524 select department	2024-10-21 14:29:29 +02:00
Jon Elias	cd4b17048c	Merge branch 'dev' into Fix-TicketsModule	2024-10-21 11:40:02 +00:00
Jon Elias	df3b4e7a18	refactor: refs #7132 deleted useless code	2024-10-21 13:07:07 +02:00
Jon Elias	1d41647022	Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations	2024-10-21 12:57:32 +02:00
Jon Elias	e5cd9d4b8f	refactor: refs #7132 global translations files changed	2024-10-21 12:56:09 +02:00
Jorge Penadés	a4358ec0ed	chore: refs #7524 refactor order	2024-10-21 12:36:16 +02:00
Jorge Penadés	2b2ccbc6a1	feat: refs #7524 myTeam filter & default params	2024-10-21 12:14:54 +02:00
Alex Moreno	f2147311d3	fix(TicketBasicData_zone): refs #6233 add acls and fix get zones	2024-10-21 08:41:19 +02:00
Jon Elias	11092866b8	fix: merge conflicts	2024-10-18 13:33:28 +02:00
Jon Elias	89cb9aacec	refactor: refs #7132 1st wave of changes in global translations files	2024-10-18 12:54:21 +02:00
Jon Elias	7d78ce7781	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:29:17 +00:00
Jon Elias	58e88f605c	refactor: refs #7132 delete duplicate translations' keys	2024-10-18 08:04:52 +02:00
Jon Elias	f6051ae15c	refactor: refs #6242 modified front to show ticket problems	2024-10-17 07:32:06 +02:00
Pablo Natek	7f1ae16270	fix: refs #8004 fix conflict	2024-10-16 06:20:41 +02:00
Jon Elias	d416a34560	refactor: use docuware in ticket descriptor menu	2024-10-15 08:48:30 +02:00
Alex Moreno	d87e8ec4ae	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-15 08:01:22 +02:00
Jorge Penadés	4b78c1acd0	fix: refs #7524 dynamic	2024-10-14 12:00:05 +02:00
Pablo Natek	321b8dd9f9	fix: refs #8004 some style issues on all list	2024-10-11 11:01:58 +02:00
Jorge Penadés	cfe95df9e8	fix: refs #7524 use dynamic load	2024-10-10 09:46:07 +02:00
Javier Segarra	f16707756e	fix: change type vnput	2024-10-10 09:29:04 +02:00
Jon Elias	2dd3e09928	refactor: requested changes	2024-10-10 08:26:16 +02:00
Alex Moreno	b6778aaf17	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-08 12:24:39 +02:00
Javier Segarra	43da6ea1b8	Merge branch 'master' into hotfix_vnImg_zoom_resolution	2024-10-07 12:00:12 +00:00
Jon Elias	27dca7c35f	Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule	2024-10-07 13:29:46 +02:00
Jon Elias	afc52f6cea	fix: changes in sale and summary	2024-10-07 13:29:43 +02:00
Javier Segarra	0ed9fdd55d	fix: refs VnImg zoom resolution missing property	2024-10-07 13:02:40 +02:00
Alex Moreno	ef5ae0f723	refactor(ticketNotes): translations	2024-10-07 09:16:07 +02:00
Jon Elias	33d6d529c5	Merge branch 'dev' into Fix-TicketsModule	2024-10-07 07:11:52 +00:00
Jon Elias	bd3de77cbd	fix: changes in list and filter to fix section	2024-10-07 09:10:20 +02:00
Alex Moreno	426b7254d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:01:57 +02:00
Javier Segarra	04b2a4d9ce	perf: clean warnings	2024-10-05 00:31:41 +02:00
Javier Segarra	c3c2528342	feat: #7356 improve NotesSummary	2024-10-05 00:31:32 +02:00
Jon Elias	195747b5a0	feat: added click and transfer tickets and deleted useless code	2024-10-04 12:34:37 +02:00
Jon Elias	0650380b7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField	2024-10-02 11:29:54 +02:00
Javier Segarra	2ca99a51ae	fix: refs #7356 transfer ticket method	2024-10-01 15:12:22 +02:00
Jon Elias	7b63bb38f2	fix: deleted code	2024-10-01 12:34:39 +02:00
Javier Segarra	6e4677848f	Merge branch 'dev' into Fix-TicketSale	2024-10-01 09:53:34 +00:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Javier Segarra	2302e22f11	fix: solve conflicts from master to test	2024-09-30 15:00:05 +02:00
Jon Elias	76a77dcee9	fix: duplicate call	2024-09-30 14:35:10 +02:00
Jon Elias	1c99c01d1d	refactor: refs #7010 modified front	2024-09-26 14:12:59 +02:00
Jon Elias	56af4d3736	feat: refs #7010 added packing type field in customer summary and ticket list	2024-09-25 14:18:34 +02:00
Jon Elias	fdf6fd2bba	feat: refs #6242 added rounding field	2024-09-25 14:05:35 +02:00
Javier Segarra	fea760d2f9	Merge branch 'dev' into 6321_negative_tickets	2024-09-24 22:14:04 +02:00
Javier Segarra	38967931b9	feat: refs #6321 updates	2024-09-24 22:13:00 +02:00
Javier Segarra	d7f37eff32	feat: refs #6321 updates	2024-09-24 22:11:41 +02:00
Javier Segarra	7da3f132ea	feat: refs #6321 update	2024-09-24 13:54:58 +02:00
Jon Elias	f34e81038e	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-24 10:36:02 +02:00
Jon Elias	cd96003c0e	refactor: refs #7553 requested changes and added keyup.enter	2024-09-24 10:35:59 +02:00
Javier Segarra	55e017b0cc	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 18:39:09 +00:00
Jon Elias	3716507f93	perf: refs #7553 removeSales function	2024-09-23 13:51:20 +02:00
Javier Segarra	0829b6d0d2	fix: i18n en preparation label	2024-09-23 11:42:47 +00:00
Javier Segarra	279a100f8b	fix: i18n en preparation label	2024-09-23 10:25:44 +00:00
Javier Segarra	a52cdf8f94	fix: i18n en preparation label	2024-09-23 10:25:11 +00:00
Jon Elias	f025b4361e	refactor: refs #7553 last requested changes	2024-09-23 10:21:30 +02:00
Jon Elias	edea17340d	refactor: refs #7553 adjust ticket notes view in summary	2024-09-20 14:33:59 +02:00
Jon Elias	2c15f79a2d	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-20 09:08:13 +02:00
Jon Elias	44d98865fe	fix: refs #7553 requested changes	2024-09-20 09:04:31 +02:00
Javier Segarra	1550d79160	feat: add shortcut more buttons	2024-09-19 00:10:28 +02:00
Javier Segarra	08bec59a37	add_circle	2024-09-19 00:04:58 +02:00
Javier Segarra	d0eb1d97ac	fet: updates	2024-09-18 13:10:11 +02:00
Jon Elias	34f70d026e	feat: refs #7553 added new field in list and translations	2024-09-18 11:50:00 +02:00
Javier Segarra	01cc2d4e75	fet: updates	2024-09-17 16:42:22 +02:00
Javier Segarra	71236c0a01	fix: remove slot	2024-09-17 14:29:26 +02:00
Javier Segarra	8c6e399fd2	feat: remove comments	2024-09-17 14:06:14 +02:00
Javier Segarra	2c81ddb4aa	feat: updates	2024-09-17 11:41:29 +02:00
Javier Segarra	b5db786b06	feat: upodates	2024-09-16 12:15:15 +02:00
Javier Segarra	0a3703532e	feat: itemProposalProxy	2024-09-16 10:47:41 +02:00
Javier Segarra	8be1a42c53	Merge branch 'dev' into 6321_negative_tickets	2024-09-16 09:48:22 +02:00
Jon Elias	6f9e46f7a0	fix: refs #7553 deleted log	2024-09-13 13:01:07 +02:00
Jon Elias	c291ea267c	refactor: refs #7553 added clickable event in transfer sales like Salix	2024-09-13 12:07:45 +02:00
Jon Elias	4a0b92eded	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-13 09:05:26 +02:00
Jon Elias	bb1eb30a25	fix: refs #7553 changed fields in order in purchase request table	2024-09-12 13:22:53 +02:00
Jon Elias	b4c46dc153	refactor: refs #7553 modified ticketSummary QChips, deleted useless code	2024-09-12 13:13:56 +02:00
Javier Segarra	3892df250c	fix: #5938 grouped filter	2024-09-12 08:53:46 +00:00
Jon Elias	4a1f5e922c	refactor: refs #7553 align ticket sale qdrawer fields	2024-09-12 10:19:21 +02:00
Jon Elias	6a5f31ff1e	fix: refs #7553 fixed conflicts	2024-09-12 10:14:38 +02:00
Javier Segarra	d16786d3e1	feat: updates TicketTable	2024-09-12 08:40:19 +02:00
Alex Moreno	4a234dd875	fix: duplicate code	2024-09-12 08:31:57 +02:00
Alex Moreno	8bf7b729d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-12 08:26:10 +02:00
Javier Segarra	ff918b8a1c	feat: updates ItemProposal	2024-09-11 23:29:59 +02:00
Javier Segarra	9ec1c5ff4b	feat: updates ItemProposal	2024-09-11 23:17:38 +02:00
Javier Segarra	373ca0b3f1	feat:TicketLackTable updates	2024-09-11 14:25:10 +02:00
Jon Elias	18fc5e241c	fix: refs #7903 fixed ticket's search bar and keybinding tooltip	2024-09-11 14:07:31 +02:00
Javier Segarra	5e89bbe19e	fix: remove unnesed imports	2024-09-11 12:55:14 +02:00
Javier Segarra	c3108b4335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-11 12:48:38 +02:00
Javier Segarra	d6bb39236d	feat: implement VnTable	2024-09-11 12:43:24 +02:00
Javier Segarra	f02ca7437c	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 10:27:12 +00:00
Javier Segarra	b0a439c26c	fix: ticketLackList	2024-09-11 11:26:25 +02:00
Jon Elias	422907447b	refactor: refs #7553 merge conflicts	2024-09-11 10:27:08 +02:00
Jon Elias	d1138529b2	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-11 10:26:52 +02:00
Jon Elias	ff7bcfb00a	refactor: refs #7553 modified ticket sale to create a row in the table	2024-09-11 10:16:42 +02:00
Jorge Penadés	2d5602e784	Merge branch 'dev' into 7663-setWeight	2024-09-11 07:40:36 +00:00
Javier Segarra	78c5836431	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets	2024-09-11 08:50:39 +02:00
Javier Segarra	bcfa67baec	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-09-10 12:26:17 +02:00
Jon Elias	e7a89138ba	fix: refs #7553 fix conflicts	2024-09-10 11:47:38 +02:00
Jorge Penadés	5cc1d0cec4	chore: refs #7663 drop useless code	2024-09-10 10:04:40 +02:00
Jorge Penadés	f9adc49284	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-10 09:41:34 +02:00
Javier Segarra	67b2cd3a0b	feat: stateGroupedFilter	2024-09-09 14:58:26 +02:00
Jon Elias	6248a4117d	refactor: refs #7553 requested changes	2024-09-09 13:52:41 +02:00
Javier Segarra	52d8ff8ae2	fix: isFullMovable checkbox	2024-09-09 13:15:45 +02:00
Javier Segarra	7bc288ad71	fix: state cell	2024-09-09 13:15:37 +02:00
Javier Segarra	83d3246377	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:44 +00:00
Javier Segarra	2667d3afae	feat: show preparation field	2024-09-09 12:07:22 +02:00
Jon Elias	0b961050a0	refactor: refs #7553 rollback ticket advance due to slot problems	2024-09-09 08:14:53 +02:00
Jon Elias	4630496361	refactor: refs #7553 changed fields in ticket component & ticket filter	2024-09-09 08:10:05 +02:00