12689 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	c1f457c263	allowContentTypes and removeFile refactors	2021-03-29 15:42:14 +02:00
Javi Gallego	de3f338629	test	2021-03-29 15:31:00 +02:00
Carlos Jimenez Ruiz	740cc79bc0	uploadFile refactor	2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz	de2a17e840	removeFile and filter refactors	2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz	8d8bdacd86	updateClaimAction refactor + tests	2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz	3054cbcadb	updateClaim refactor + tests	2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz	c4cbc064c9	regularice claim refactor + test	2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz	ee79f23185	createFromSales refactor + tests	2021-03-29 15:14:23 +02:00
Joan Sanchez	eddd769af0	Excluded unit test	2021-03-29 08:39:33 +02:00
Joan Sanchez	3f0fe15763	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-29 07:50:34 +02:00
Joan Sanchez	dbb6ccd89d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-03-29 07:50:16 +02:00
Joan Sanchez	13d71b590a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-29 07:33:49 +02:00
Joan Sanchez	407c0e6280	Supplier "Contacts" changes	2021-03-29 07:33:20 +02:00
Joan Sanchez	320e3143cd	Ticket filter hotfix	2021-03-26 12:51:14 +01:00
Joan Sanchez	4dbcc0dd5c	HOTFIX: Ticket filter changed ticketGetTotal() args	2021-03-26 12:32:32 +01:00
Carlos Jimenez Ruiz	8a5c675266	Merge pull request '2844-item last entries show the total cost in the "cost" column' (#585) from 2844-item_lastEntries_sum into dev ... Reviewed-on: #585 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-26 11:26:24 +00:00
Carlos Jimenez Ruiz	767665e3c9	endpoint indentation + type updated yo array of objects	2021-03-26 10:39:19 +01:00
Carlos Jimenez Ruiz	f46c18b6b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum	2021-03-26 10:33:58 +01:00
Carlos Jimenez Ruiz	3c8ed85e69	sum is now made on backend and html amends	2021-03-26 10:33:53 +01:00
Joan Sanchez	1da245ba46	Merge pull request '2840-ticket_card_sale_deprecations' (#586) from 2840-ticket_card_sale_deprecations into dev ... Reviewed-on: #586 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-25 09:11:44 +00:00
Carlos Jimenez Ruiz	1cc4e60bad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2840-ticket_card_sale_deprecations	2021-03-24 16:45:57 +01:00
Carlos Jimenez Ruiz	41bb4cbaab	deprecated vat and subTotal related methods + tests fixed	2021-03-24 16:43:54 +01:00
Joan Sanchez	de7f1bbc12	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 14:26:09 +01:00
Joan Sanchez	302dedef0f	Missing translations & attachment fix	2021-03-24 14:25:57 +01:00
jorgebl	393b9ba38c	Correct name	2021-03-24 14:17:27 +01:00
jorgebl	81fbc81314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2844-item_lastEntries_sum	2021-03-24 13:54:41 +01:00
jorgebl	e01b7420d9	Added total cost of item	2021-03-24 13:54:29 +01:00
Joan Sanchez	2c1b155122	Added missing translation	2021-03-24 13:48:14 +01:00
Carlos Jimenez Ruiz	ba7818ff43	Merge pull request '2819-notify_assignment' (#584) from 2819-notify_assignment into dev ... Reviewed-on: #584 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-24 12:40:33 +00:00
Joan Sanchez	e767e95729	Loggable fixes	2021-03-24 13:09:35 +01:00
Joan Sanchez	c65fbef3df	Merge branch 'dev' into 2819-notify_assignment	2021-03-24 11:47:38 +00:00
Joan Sanchez	32805dbafb	Added model unit test	2021-03-24 12:45:26 +01:00
Joan Sanchez	412dd34229	Merge pull request 'e2e for account create and home firefox fix' (#583) from 2841-e2e_account_create_and_basic_data into dev ... Reviewed-on: #583 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-24 10:21:56 +00:00
Joan Sanchez	23facc8a50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2841-e2e_account_create_and_basic_data	2021-03-24 11:14:20 +01:00
Joan Sanchez	00aeaafc49	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 11:12:51 +01:00
Joan Sanchez	0e9b3bd39a	Missing translation	2021-03-24 11:12:36 +01:00
Carlos Jimenez Ruiz	3e47e124dc	made the name shorter to fix display issues on firefox	2021-03-24 11:10:24 +01:00
Joan Sanchez	7a35e60b8a	Merge branch 'dev' into 2841-e2e_account_create_and_basic_data	2021-03-24 10:10:22 +00:00
Carlos Jimenez Ruiz	81ae63356a	removed the edition steps to avoid errors	2021-03-24 11:09:58 +01:00
Carlos Jimenez Ruiz	a62c030166	made the name shorter to fix display issues on firefox	2021-03-24 11:06:48 +01:00
Joan Sanchez	14f0cbaf42	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 11:06:15 +01:00
Joan Sanchez	53ae45d4c8	Deleted old .keep file	2021-03-24 11:05:41 +01:00
Joan Sanchez	c6ee58a278	Added new changes version	2021-03-24 11:05:05 +01:00
Joan Sanchez	5599487eb8	Merge pull request '2846 - Added title property to descriptor name' (#582) from 2846-descriptor_title into dev ... Reviewed-on: #582 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-24 09:47:46 +00:00
Carlos Jimenez Ruiz	b6824450ef	Merge branch 'dev' into 2846-descriptor_title	2021-03-24 09:43:46 +00:00
Carlos Jimenez Ruiz	5941baae40	removed the edition steps to avoid errors	2021-03-24 10:05:12 +01:00
Carlos Jimenez Ruiz	7c46f513e2	Merge pull request '2705-route_tickets_refactor' (#576) from 2705-route_tickets_refactor into dev ... Reviewed-on: #576 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-24 08:04:34 +00:00
Joan Sanchez	f889e7942b	2846 - Added title property to descriptor name	2021-03-24 07:44:38 +01:00
Carlos Jimenez Ruiz	409f56ec7f	e2e path resurrected for route tickets	2021-03-23 17:19:05 +01:00
Joan Sanchez	b3d333368b	#2819 - Notify worker assignment	2021-03-23 16:19:45 +01:00