9446 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	2bb050c535	Merge pull request '2869-getSuggestedTickets_started_to_created' (#589) from 2869-getSuggestedTickets_started_to_created into dev ... Reviewed-on: #589 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-30 14:08:09 +00:00
Carlos Jimenez Ruiz	75155c796d	removed unused code	2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz	4207bfcc70	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created	2021-03-30 15:19:38 +02:00
Carlos Jimenez Ruiz	9589f2efa7	Merge pull request '2855-claim_module_backend_transactions' (#587) from 2855-claim_module_backend_transactions into dev ... Reviewed-on: #587 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-30 13:17:26 +00:00
Carlos Jimenez Ruiz	061626e521	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions	2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz	ed5c5feea7	Merge pull request '2871-export_db' (#590) from 2871-export_db into dev ... Reviewed-on: #590 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-30 12:48:04 +00:00
Carlos Jimenez Ruiz	d69bc13170	Merge branch '2871-export_db' of https://gitea.verdnatura.es/verdnatura/salix into 2871-export_db	2021-03-30 14:43:42 +02:00
Carlos Jimenez Ruiz	847e0bd2c8	tests fixed for production sneaky changes	2021-03-30 14:43:21 +02:00
Joan Sanchez	d9834ae740	Removed old versions	2021-03-30 14:02:15 +02:00
Joan Sanchez	50f1fd30aa	Risk tolerance fixture	2021-03-30 13:15:42 +02:00
Joan Sanchez	d66cf68e89	Fixed table error	2021-03-30 12:28:43 +02:00
Joan Sanchez	e2a9a64f88	#2871 and #2868. Included ticket filter unit test	2021-03-30 11:20:26 +02:00
Carlos Jimenez Ruiz	e025368af1	updaloadFile transaction commit conditional	2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz	dbf5296041	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created	2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz	70f6728c8f	started to created date changes	2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz	8797444553	importTicketSales refactor + tests	2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz	c1f457c263	allowContentTypes and removeFile refactors	2021-03-29 15:42:14 +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