1482 Commits

Author	SHA1	Message	Date
Alex Moreno	021c475de7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2023-01-04 09:39:26 +01:00
Alex Moreno	9b98249398	test: front test and e2e	2023-01-04 09:23:18 +01:00
Alex Moreno	ef437f2fee	test: e2e and backTest	2023-01-03 14:50:29 +01:00
Alexandre Riera	ac56744244	Merge branch 'dev' into 4866-detalle-faltas	2023-01-03 12:15:26 +00:00
Alexandre Riera	2eea1e68e8	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-03 11:45:35 +00:00
Alexandre Riera	3514c0ac81	refs #3571 pending tests	2023-01-03 09:14:25 +01:00
Alexandre Riera	81c7fff7e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3571-refactor-e2e	2023-01-03 08:35:49 +01:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alexandre Riera	7c45ac158c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut	2023-01-02 07:09:30 +01:00
Alexandre Riera	b2af21ba01	refs #3571 fdescribed removed	2022-12-28 13:17:47 +01:00
Alexandre Riera	3b717e54fa	refs #3571 refactor e2e worker	2022-12-28 13:06:00 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Alex Moreno	bee65f9c69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-28 07:24:08 +01:00
Alexandre Riera	96a6f0b9d9	refs #4926 packingOut added	2022-12-27 07:48:09 +01:00
Alexandre Riera	aec22fad9d	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-23 08:16:36 +01:00
Alexandre Riera	eefc5ab80d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-23 08:01:52 +01:00
Alex Moreno	186a64f7fa	unfocus	2022-12-22 07:46:06 +01:00
Alex Moreno	27288d011d	fix(searchBar): applyParams	2022-12-21 15:01:05 +01:00
Alex Moreno	d18e360f73	unfocus e2e	2022-12-21 13:47:43 +01:00
Alex Moreno	502a692521	test(item_fixedPrice_rate2): backTest and e2e	2022-12-21 12:55:11 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	5b87514501	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-20 12:15:50 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Alexandre Riera	342eec1e41	refs #3963 autoload fixed	2022-12-20 11:36:58 +01:00
Alexandre Riera	b356839148	refs #3963 autoload fixed	2022-12-20 11:36:37 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +01:00
Alex Moreno	47f624ec04	skip e2e test	2022-12-16 09:01:30 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alexandre Riera	dce48a8a93	refs #4700 corrections	2022-12-13 14:00:46 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alexandre Riera	569a0e8cc9	refs #3302 log modified and fixed e2e tests	2022-12-05 15:30:41 +01:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	164b797ab8	front and e2e tests done	2022-11-23 11:09:32 +01:00
Alex Moreno	0f8eca4700	fix: e2e	2022-11-23 08:23:58 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +01:00
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01:00
Alexandre Riera	44053e08be	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:53:04 +01:00
Alexandre Riera	edb495c744	fix describe	2022-11-16 11:52:35 +01:00
Alexandre Riera	66002968f6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:10:21 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Pau	66e6a47692	fix(e2e test expected withoutNegatives checkbox to not be checked already)	2022-11-16 08:25:07 +01:00
Alex Moreno	080d6aedf4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-16 08:19:39 +01:00
Alex Moreno	925c384622	Actualizar 'e2e/paths/05-ticket/02_expeditions_and_log.spec.js' ... remove focus	2022-11-16 06:36:35 +00:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alex Moreno	31eb2c86b5	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-15 09:20:26 +00:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	0ef64481b9	refs #4700 e2e finished	2022-11-14 08:51:15 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Alexandre Riera	117e2c03f5	refs #4700 tests back y empezando e2e	2022-11-10 15:54:00 +01:00
Alex Moreno	37d412bf3b	refactor: delete unnecessary test	2022-11-10 14:38:37 +01:00
Alex Moreno	617e2d804f	typo	2022-11-09 14:52:25 +01:00
Alex Moreno	5339bc1143	feat(recoverPassword): use loopback	2022-11-09 14:51:30 +01:00
Vicent Llopis	ae513fb2b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-04 09:12:16 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	d100ab4112	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:39:47 +00:00
Alexandre Riera	4be3106245	Merge branch 'dev' into 4645-refactor-entry.ref	2022-11-03 07:29:49 +00:00
Alex Moreno	ec9139f985	Merge branch 'dev' into 4159-tableQ_filter	2022-11-03 07:24:05 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Alex Moreno	f8f44aaae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-11-02 07:37:28 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Alexandre Riera	405bc8765a	refs #4645 valores ref cambiados	2022-10-26 12:48:48 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	1e1d4f00f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-26 08:26:23 +02:00
Alex Moreno	e1e13468a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-25 11:58:43 +02:00
Vicent Llopis	dd15d06f5e	delete focus test	2022-10-20 10:21:44 +02:00
Vicent Llopis	5824fee213	feat: add e2e	2022-10-20 09:40:23 +02:00
Vicent Llopis	2da34d0850	feat: add e2e	2022-10-20 09:40:11 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Pau	b1a792eb2d	Merge branch '4153-supplier.fiscal-data' of https://gitea.verdnatura.es/verdnatura/salix into 4153-supplier.fiscal-data	2022-10-20 08:00:49 +02:00
Pau	0b4df19c43	Fixed E2E tests	2022-10-20 08:00:46 +02:00
Vicent Llopis	abd2d9a849	fix: e2e	2022-10-19 15:10:43 +02:00
Alex Moreno	37d645c6de	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-17 07:23:31 +02:00
Alex Moreno	84d17f4d55	Merge branch 'dev' into 4159-tableQ_filter	2022-10-14 11:28:39 +00:00
Alex Moreno	cfc626494f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter	2022-10-14 07:39:23 +02:00
Alex Moreno	e85d6bec8c	fix e2e	2022-10-10 14:03:29 +02:00
Vicent Llopis	ea1714240e	fix: test e2e	2022-10-10 13:45:34 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00:00
Joan Sanchez	8f3e09b88f	Merge branch 'dev' into 4033-route	2022-10-06 08:23:19 +00:00
Joan Sanchez	fd219f853f	Merge branch 'dev' into 4581-client.web-access	2022-10-05 14:26:03 +00:00
Joan Sanchez	f2407ceb0e	Removed focus	2022-10-05 13:17:29 +02:00
Vicent Llopis	3e4fb87f6b	fix: te2e	2022-10-05 13:09:06 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Vicent Llopis	6a01aa0f9f	delete focus	2022-10-04 10:08:36 +02:00
Vicent Llopis	0fc2801f2f	fix: te2e	2022-10-04 10:08:12 +02:00
Vicent Llopis	68e4f3a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-04 09:10:15 +02:00