9524 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	129d3373d0	Merge pull request 'entry index changes' (#515) from 2589-entry_index into dev ... Reviewed-on: #515 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-04-01 14:49:44 +00:00
Joan Sanchez	b4cceff4cb	2866 - Limit descriptor photo size to width 100%	2021-04-01 14:20:00 +02:00
Joan Sanchez	fa0b01a0d5	Fixed buttons alignment	2021-04-01 14:00:34 +02:00
Joan Sanchez	91c26ee5a5	Removed filter import	2021-04-01 13:55:01 +02:00
Joan Sanchez	389f10bda0	Removed entry import	2021-04-01 13:51:55 +02:00
Joan Sanchez	f89419962d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index	2021-04-01 13:42:38 +02:00
Joan Sanchez	21de6a0f7c	Updated readme	2021-04-01 13:34:21 +02:00
Joan Sanchez	a84555430f	Updated readme extensions	2021-04-01 13:32:42 +02:00
Joan Sanchez	5712f1c43b	Changes	2021-04-01 13:12:02 +02:00
Joan Sanchez	41ee6e70a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail	2021-04-01 08:42:02 +02:00
Joan Sanchez	a799458c50	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-01 08:29:45 +02:00
Joan Sanchez	4b9b29fc94	Hotfix: Removed default nRefs value for image model	2021-04-01 07:58:39 +02:00
Carlos Jimenez Ruiz	b72357cb7d	Merge pull request '2785-getBalance-tests' (#588) from 2785-getBalance-tests into dev ... Reviewed-on: #588 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2021-03-31 07:17:32 +00:00
Carlos Jimenez Ruiz	b1b2a1ee19	Merge branch 'dev' into 2785-getBalance-tests	2021-03-31 07:14:13 +00:00
Javi Gallego	a034220ffa	cambio descripcion del it	2021-03-31 07:54:50 +02:00
Carlos Jimenez Ruiz	6a28318ed5	Merge pull request 'width changed from medium to large' (#591) from 2870-supplier_contact_width into dev ... Reviewed-on: #591 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2021-03-30 16:14:16 +00:00
Carlos Jimenez Ruiz	694055f85c	width changed from medium to large	2021-03-30 16:19:54 +02:00
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
Joan Sanchez	4aa616601e	2615 - Waste changes	2021-03-30 10:28:44 +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
Javi Gallego	3cb0859f85	Merge branch 'dev' into 2785-getBalance-tests	2021-03-29 15:42:22 +02:00
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