1295 Commits

Author	SHA1	Message	Date
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Joan Sanchez	0bc48dc27b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 09:39:53 +02:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Alex Moreno	ff264ab930	hotFix(client): fiscal-data edit by salesAssistant	2022-05-27 09:45:08 +02:00
Alex Moreno	1b061852d2	fix e2e	2022-05-25 08:27:26 +02:00
Alex Moreno	3650567caf	test(account): e2e for ldap and samba	2022-05-19 15:02:39 +02:00
Alex Moreno	68c94ec3c1	typo	2022-05-18 15:02:06 +02:00
Alex Moreno	34bcdf1bd3	test(account): acl, connections and accounts secctions	2022-05-18 14:01:30 +02:00
Alex Moreno	89baf63646	feat(account): add e2e acl	2022-05-17 15:19:54 +02:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz	7bafc48d68	removed CI references for e2e	2022-05-13 18:29:20 +02:00
Carlos Jimenez Ruiz	39413c145d	e2e test battery moved out of gulp to npm script	2022-05-13 17:09:41 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Joan Sanchez	afe4f0ba94	Merge branch 'dev' into 3977-invoiceIn.tax	2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz	a47c0dbaea	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:47:14 +00:00
Carlos Jimenez Ruiz	0e65f382f9	Merge branch 'dev' into 3752-claim_action	2022-05-10 11:36:35 +00:00
Alex Moreno	5919c42df2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 11:42:35 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Vicent Llopis	f08a384a7c	fix: e2e test	2022-05-09 14:49:37 +02:00
Vicent Llopis	4a6873a0fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action	2022-04-21 09:34:37 +02:00
Alex Moreno	62f7b80ed4	quit $	2022-04-20 08:55:43 +02:00
Alex Moreno	36addcdb6c	fix name tests	2022-04-13 13:05:20 +02:00
Alex Moreno	b7931278be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3795-client_administraive	2022-04-13 13:03:07 +02:00
Carlos Jimenez Ruiz	9085098a04	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:19:50 +00:00
Carlos Jimenez Ruiz	6015050eed	Merge branch 'dev' into 3830-ticket_sale	2022-04-13 09:12:14 +00:00
Joan Sanchez	c2271b6071	Merge branch 'dev' into 3758-client_unpaid	2022-04-13 09:00:28 +00:00
Carlos Jimenez Ruiz	080975208b	Merge branch 'dev' into 2958-vnDescriptor_OpenSummaryPopup	2022-04-13 08:12:28 +00:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Vicent Llopis	4872407723	fix test	2022-04-12 11:57:56 +02:00
Alex Moreno	4a714a4b6f	feat(client): add privileges to administrative role	2022-04-12 07:56:03 +02:00
Alex Moreno	c9e8826627	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid	2022-04-12 07:08:55 +02:00
Carlos Jimenez Ruiz	56e52c35d8	Merge branch 'dev' into 3802-ticket_sale_mana	2022-04-11 10:40:52 +00:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Alex Moreno	786b7fa84f	feat(descriptor): button open summary popup	2022-04-11 08:02:05 +02:00
Joan Sanchez	d2ecbe898e	Merge branch 'dev' into 3863-client_name	2022-04-08 07:03:23 +00:00
Alex Moreno	238a9fd5da	feat(client.defaulter&claim): change socialName to name	2022-04-08 08:52:21 +02:00
Joan Sanchez	8414f94cf6	Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev ... Reviewed-on: #926 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-04-08 06:49:39 +00:00
Alex Moreno	574729b7c5	test(client_unpaid): add front test and e2e	2022-04-07 15:05:10 +02:00
Vicent Llopis	eba3ac40a5	refactor: delete item.compression	2022-04-06 11:48:12 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Vicent Llopis	fdf285dd5f	fix(worker_timeControl): corrected db procedure	2022-04-04 10:31:28 +02:00
Vicent Llopis	8e27ab612d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana	2022-03-29 15:08:48 +02:00
Vicent Llopis	63a857a616	fix: updated test e2e	2022-03-29 14:33:22 +02:00
Vicent Llopis	6c43ea716e	fix: update test failed	2022-03-29 09:10:42 +02:00
Alex Moreno	dc03a66c6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price	2022-03-23 12:01:50 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Alex Moreno	9a1c0a07fd	Merge branch 'dev' into 3680-claim_basic-data_packages	2022-03-23 08:42:52 +00:00
Alex Moreno	b56e1810c3	test(item_fixedPrice): fix back test & e2e	2022-03-18 10:30:30 +01:00