628 Commits

Author	SHA1	Message	Date
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	2b19688ca4	quit focus	2022-07-25 08:25:46 +02:00
Alex Moreno	8048d4ce90	feat(notification): basic functionality and test	2022-07-25 08:25:10 +02:00
Alex Moreno	f432d64f56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue	2022-07-25 07:45:26 +02:00
Vicent Llopis	5491fce0c6	fix: musn't delete files on test enviroment	2022-07-21 13:16:30 +02:00
Vicent Llopis	eccbd942f7	feat: can close a ticket	2022-07-21 13:11:24 +02:00
Vicent Llopis	0ff3a9d45a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-07-21 12:23:44 +02:00
Alex Moreno	9b48cbb078	feat(notification): send	2022-07-20 14:54:50 +02:00
Alex Moreno	7895decf4e	feat(notification): create models	2022-07-19 15:17:22 +02:00
Vicent Llopis	1be0e9b7a9	feat: delete dms trash file	2022-07-19 12:40:52 +02:00
Vicent Llopis	5eec01bdc3	feat: close tickets	2022-07-19 11:20:08 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Juan Ferrer	86605c3d67	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 10:18:03 +00:00
Carlos Jimenez Ruiz	cd5dba6fcb	Merge branch 'dev' into 4040-chat_sendQueued	2022-06-09 08:44:22 +00:00
Joan Sanchez	7fe7fb2e8f	Replaced fs sync functions	2022-06-09 10:13:45 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Vicent Llopis	93bb678738	updated endpoints description	2022-06-08 13:08:53 +02:00
Joan Sanchez	33e9dacf60	Merge branch 'dev' into 4164-edi_updateData	2022-06-07 11:07:19 +00:00
Joan Sanchez	f77f5cee58	4164 - Endpoint refactor	2022-06-07 13:06:42 +02:00
Joan Sanchez	70632ddc7c	Clean	2022-06-04 12:58:58 +02:00
Joan Sanchez	5918ddce3c	Fix table cleaning	2022-06-04 12:45:02 +02:00
Joan Sanchez	0bb142a5d9	Removed rmdir	2022-06-04 12:25:05 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Vicent Llopis	e4b23fa14d	fix: bugs	2022-06-03 14:02:23 +02:00
Joan Sanchez	5059f72ea5	Clean directory	2022-06-03 13:54:58 +02:00
Vicent Llopis	e30817644a	fix: bug	2022-06-03 13:48:44 +02:00
Joan Sanchez	bdb581db94	Disable file delete	2022-06-03 13:47:40 +02:00
Vicent Llopis	9f57481390	refator: change comments	2022-06-03 13:44:42 +02:00
Vicent Llopis	fa27e6dd58	fix: backTest	2022-06-03 13:36:21 +02:00
Joan Sanchez	391960b390	Fixed sql table name	2022-06-03 13:27:58 +02:00
Joan Sanchez	3752ca2347	Changed when file is removed	2022-06-03 13:22:32 +02:00
Joan Sanchez	33049c507f	Transaction fix	2022-06-03 13:01:39 +02:00
Joan Sanchez	b790ee88d9	Edi fixes	2022-06-03 12:57:39 +02:00
Joan Sanchez	9bb264da38	Fixes	2022-06-03 12:52:41 +02:00
Joan Sanchez	d0e7ef8f47	Fixed SQL templates	2022-06-03 12:44:39 +02:00
Joan Sanchez	b1ce77d362	Debug logs	2022-06-03 12:35:45 +02:00
Vicent Llopis	3eac002fb4	feat: add queue to send rocket messages	2022-06-03 12:22:07 +02:00
Joan Sanchez	b98ac4f233	Debugging logs	2022-06-03 12:18:06 +02:00
Joan Sanchez	f3eb36f8ee	Edi fixes	2022-06-03 11:47:43 +02:00
Vicent Llopis	f6028316f4	feat: endpoint sendQueued addded	2022-06-02 14:55:39 +02:00
Alex Moreno	9a25bdad06	relaunch tests	2022-06-02 09:01:34 +02:00
Vicent Llopis	7de0fd6634	feat: create table chat	2022-06-01 13:49:45 +02:00
Alex Moreno	316bd56acc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2470-account_e2e	2022-05-25 07:35:59 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz	c721d9ae82	Merge branch 'dev' into 4022-client.balance.create	2022-05-23 12:43:00 +00:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Vicent Llopis	c9bfbe990a	refactor: request changues	2022-05-20 12:53:10 +02:00
Alex Moreno	34bcdf1bd3	test(account): acl, connections and accounts secctions	2022-05-18 14:01:30 +02:00
Vicent Llopis	eeede417eb	feat: update date depending of accountingType	2022-05-17 12:24:35 +02:00
Vicent Llopis	ebbb0466a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-17 10:13:05 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00: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	dcdbafe25f	removed test failure	2022-05-13 12:58:06 +02:00
Carlos Jimenez Ruiz	dc62ec21b4	forced test failure to test CI junit check	2022-05-13 12:57:11 +02:00
Carlos Jimenez Ruiz	ddc3b552d7	jasmine reporters are now added using addReporter	2022-05-13 12:51:02 +02:00
Carlos Jimenez Ruiz	8b95150437	minor refactor on reporters definition	2022-05-13 12:44:21 +02:00
Carlos Jimenez Ruiz	fa55263516	renamed junit reporters constant	2022-05-13 12:35:39 +02:00
Carlos Jimenez Ruiz	42270bf61b	allowed both spec reporters for CI	2022-05-13 12:33:08 +02:00
Carlos Jimenez Ruiz	d4fab02252	junit reporter added for CI	2022-05-13 12:25:35 +02:00
Carlos Jimenez Ruiz	09a1dc62df	jasmine default timeout 30 secs on CI	2022-05-13 12:05:41 +02:00
Carlos Jimenez Ruiz	9be7d46fb2	added timeout to failing test	2022-05-13 11:57:36 +02:00
Joan Sanchez	ccf3366e1a	Timeout	2022-05-13 11:55:04 +02:00
Joan Sanchez	0c6852f35a	Included test	2022-05-13 11:52:49 +02:00
Joan Sanchez	65e68cf4dd	Increased timeout	2022-05-13 11:51:45 +02:00
Joan Sanchez	330763a745	Sleep	2022-05-13 11:46:44 +02:00
Joan Sanchez	490b5fc6df	Sleep	2022-05-13 11:44:04 +02:00
Joan Sanchez	35a579f06b	Launch on boot	2022-05-13 11:41:22 +02:00
Joan Sanchez	057d825be9	Log on boot	2022-05-13 11:37:31 +02:00
Joan Sanchez	d8ebc69612	Excluded back unit test	2022-05-13 11:31:18 +02:00
Joan Sanchez	2ed9b36b0d	Updated unit test	2022-05-13 11:23:09 +02:00
Joan Sanchez	5cbe5b6359	Updated unit test	2022-05-13 11:17:11 +02:00
Joan Sanchez	4479337731	Updated test	2022-05-13 10:59:13 +02:00
Joan Sanchez	649be482b5	Updated changePassword()	2022-05-13 10:52:05 +02:00
Joan Sanchez	75da4cfc3f	Disabled ldap sync	2022-05-13 10:22:05 +02:00
Joan Sanchez	04d86da48f	Run changePassword()	2022-05-13 08:47:53 +02:00
Carlos Jimenez Ruiz	526bc99c4f	docker container.run now receives boolean flag isCI	2022-05-12 13:51:31 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Javi Gallego	0d63f3c3af	Merge branch 'dev' into 3851-dms_delete	2022-05-12 11:13:34 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Carlos Jimenez Ruiz	833addcb75	gulp-jasmine replaced by jasmine	2022-05-11 19:38:10 +02:00
Carlos Jimenez Ruiz	442644d3f1	Merge branch 'dev' into 3940-export_database	2022-05-11 12:57:29 +00:00
Alex Moreno	fde73b35e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3887-multi-check	2022-05-10 08:57:28 +02:00
Joan Sanchez	7365143eac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-09 16:09:17 +02:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Vicent Llopis	3fa86f0f15	fix: backTest	2022-05-06 09:08:34 +02:00
Vicent Llopis	a0af774837	fix: test	2022-05-06 09:02:52 +02:00
Javi Gallego	6584a29ce5	create deleteTrashFiles	2022-05-03 11:16:56 +02:00
Joan Sanchez	2e09456bfa	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-02 09:54:06 +02:00
Vicent Llopis	bad90c12f4	feat: add required fields and models	2022-04-27 14:17:41 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz	8efcb6233f	feat(user): added userConfig.darkMode relation towards account.user	2022-04-20 10:25:01 +02:00
Alex Moreno	04f993e227	fix	2022-04-13 13:55:18 +02:00
Joan Sanchez	62daa6b38d	Send to user when no department channel is specified	2022-04-12 14:44:32 +02:00
Joan Sanchez	b13f526726	Notify to group with for user with busy status	2022-04-12 13:01:34 +02:00
Joan Sanchez	99499b214e	Updated RocketChat unit tests	2022-04-11 14:43:20 +02:00
Joan Sanchez	4dd591e447	Renamed variable name	2022-04-11 13:38:49 +02:00
Joan Sanchez	fb514c21d6	Removed model ACL	2022-04-11 12:11:59 +02:00
Joan Sanchez	47a2f76aa4	3837 - Import data from external service	2022-04-11 11:58:40 +02:00
Joan Sanchez	763d4f2677	Rollback	2022-04-07 13:20:09 +02:00
Joan Sanchez	7186e84687	Send response	2022-04-07 13:09:50 +02:00
Joan Sanchez	479e345ef0	Param name rollback	2022-04-07 13:08:53 +02:00
Joan Sanchez	fa58280e4e	Rocket fix	2022-04-07 11:54:08 +02:00
Joan Sanchez	287aa0c3c6	Updated unit tests	2022-04-07 08:53:03 +02:00
Joan Sanchez	3ed116d614	Always return a value instead of a promise	2022-04-06 14:06:53 +02:00
Joan Sanchez	cd098235bb	fix(sms): send response when de recipient is the same as the emisor	2022-04-06 13:44:11 +02:00
Alex Moreno	d616367714	fix(test): use static dates	2022-04-05 07:46:49 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Joan Sanchez	00c53a7709	3668 - Deprecated field "isOfficial"	2022-03-18 11:06:16 +01:00
Vicent Llopis	10d48f9bb4	refactor uppercase	2022-03-04 12:01:32 +01:00
Joan Sanchez	3512e287ae	Updated endpoints description	2022-03-01 11:09:10 +01:00
Joan Sanchez	b71e7440b3	Merge branch 'dev' into 3634-rocketchat_status	2022-03-01 09:49:11 +00:00
Alex Moreno	cf9851c8dc	typo	2022-02-28 13:27:03 +01:00
Joan Sanchez	9d298c2a5e	Updated unit tests	2022-02-23 12:07:05 +01:00
Alex Moreno	f3ff64c44d	refactor(docuware): name for code	2022-02-23 08:11:54 +01:00
Alex Moreno	4606b0d7ea	change name for code	2022-02-22 15:23:23 +01:00
Joan Sanchez	0d8dffac30	refactor(chat): check rocketchat status before sending message	2022-02-22 07:30:26 +01:00
Alex Moreno	0f4649c50f	feat(ticket_descriptor-menu): docuware implemented	2022-02-21 08:48:53 +01:00
Alex Moreno	3aeb2adb56	feat(ticket): docuware pdf	2022-02-16 14:57:47 +01:00
Alex Moreno	651c92698f	feat(docuware): start download docuware	2022-02-15 16:48:37 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Alex Moreno	e08a3d31bc	remove f of focus	2022-02-07 08:23:19 +01:00
Alex Moreno	dc78cd2dc5	feat(collection): setQuantitySale	2022-02-07 08:05:05 +01:00
Alex Moreno	386155f242	feat(setQuantitySale): transaction	2022-02-02 14:55:21 +01:00
Alex Moreno	77d0dcae0d	feat(setQuantitySale): back route and test	2022-02-02 08:28:07 +01:00
Vicent Llopis	f8cd5d3ea3	fix: change 'query' by 'form'	2022-01-12 08:32:01 +01:00
Alex Moreno	f96f22c231	misspelled word	2021-11-25 11:44:27 +01:00
Alex Moreno	fc2e81826d	export database	2021-11-24 13:02:58 +01:00
Carlos Jimenez Ruiz	1d253fc53d	definitions corrected for myOptions of endpoints	2021-11-18 11:17:30 +01:00
Carlos Jimenez Ruiz	0bf553e11e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-10 17:07:39 +01:00
Vicent Llopis	fbbb1ecdf6	feat(client_balance): add maxImport if "cash"	2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz	b27a443729	show/hide columns and load default view	2021-10-27 17:11:33 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Joan Sanchez	7ccb325ecc	fix(model): added everyone ACL to model	2021-10-01 08:39:42 +02:00
Carlos Jimenez Ruiz	ca82d7e759	fix(coillection): collection created dates were wrong for testing purposes	2021-09-06 16:35:31 +02:00
Carlos Jimenez Ruiz	6b465f9150	Merge branch 'dev' into 3068-ticket_colletion	2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz	0337a1d6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production	2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz	85844973d6	refactor(geolocation): create province now uses autonomy instead of country	2021-09-02 11:56:59 +02:00
Joan Sanchez	84c4b8b7f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-09-02 08:22:39 +02:00
Joan Sanchez	4f8e319b89	fix(model): Added missing property "isAutoConciliated" to accounting-type model	2021-09-02 08:22:18 +02:00
Joan Sanchez	7a98613ef8	Updated unit tests	2021-09-01 11:48:21 +02:00
Carlos Jimenez Ruiz	abbce74100	clone invoiceIn from descriptor	2021-07-23 14:06:48 +02:00
Carlos Jimenez Ruiz	dd3473b93d	small refactors correcting constants and adding transactions	2021-07-12 12:50:15 +02:00
Carlos Jimenez Ruiz	3b2b4e3819	client module changes for transactions	2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz	15c7c0cb4b	read acl set on the model	2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	df4ebbd775	minor refactor to use better semantics	2021-06-02 10:31:26 +02:00
Carlos Jimenez Ruiz	9f00fd11d2	favorite modules positions	2021-06-01 22:18:13 +02:00
Carlos Jimenez Ruiz	ec86e908e1	get user config test updated	2021-05-25 09:25:22 +02:00
Carlos Jimenez Ruiz	18f22fa350	minor refactor	2021-05-25 09:17:51 +02:00
Carlos Jimenez Ruiz	d440a631c8	getUserConfig now gets default company and warehouse with dynamic code	2021-05-24 17:41:22 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Carlos Jimenez Ruiz	8a8c2fa39f	e2e partially working for account module	2021-05-03 08:01:29 +02:00
Joan Sanchez	7e29c865fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-12 22:26:30 +02:00
Joan Sanchez	db81d7d6d4	HOTFIX: Notify when ticket doesn't have a team	2021-04-12 22:25:55 +02:00
Joan Sanchez	de769a2565	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-12 08:02:35 +02:00
Joan Sanchez	6eba19a1b7	OsTicket notifications	2021-04-12 07:48:29 +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	de2a17e840	removeFile and filter refactors	2021-03-29 15:18:49 +02:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
Carlos Jimenez Ruiz	0870a902af	chat.send tests fixed + small refactor	2021-03-15 12:26:11 +01:00
Carlos Jimenez Ruiz	2b8286eb28	deprecated dependencies, replaced babel/polyfill	2021-03-12 17:15:26 +01:00
Carlos Jimenez Ruiz	97667595e5	removed unused ACL and fixed typos	2021-03-02 10:33:35 +01:00
Carlos Jimenez Ruiz	fe7017f83c	final amends on tests and model descriptions	2021-03-01 22:21:04 +01:00
Carlos Jimenez Ruiz	d6e440751b	e2e path for starred modules	2021-03-01 17:43:34 +01:00
Carlos Jimenez Ruiz	cd084a53e5	styling update + acls	2021-03-01 16:13:47 +01:00
Carlos Jimenez Ruiz	bebaef7879	sql changes moved to correct folder	2021-03-01 13:07:23 +01:00
Carlos Jimenez Ruiz	23cc4bbfeb	starred modules working pre-e2e and css amends	2021-03-01 12:15:13 +01:00
Carlos Jimenez Ruiz	bb2912d05a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2585-pinned_module_icons	2021-02-26 09:10:28 +01:00
Carlos Jimenez Ruiz	3dff5f06ff	starred modules front and backend 1st steps	2021-02-26 09:08:31 +01:00
Joan Sanchez	89abf424fb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-25 08:17:26 +01:00
Joan Sanchez	1c819e692e	Floramondo image download fixes	2021-02-24 14:37:49 +01:00
Joan Sanchez	347ac77878	Changes to file names	2021-02-24 09:59:41 +01:00
Joan Sanchez	5b40edb284	Line break	2021-02-17 16:11:34 +01:00
Jorge Padawan	aa29f546ae	put global bank entity model	2021-02-17 15:05:17 +01:00
Javi Gallego	a3d7fc9313	done	2021-02-12 13:18:02 +01:00
Joan Sanchez	623b90279b	Update dms fix access	2021-02-08 07:28:00 +01:00
Joan Sanchez	2c9fd45958	2778 - Allow edit order number	2021-02-05 12:09:48 +01:00
Joan Sanchez	d589dd435c	Default image refs to 1	2021-02-04 18:23:22 +01:00
Joan Sanchez	a845f53f0a	Bug fixes	2021-02-03 12:43:30 +01:00
Joan Sanchez	b34e5804ae	Updated unit test	2021-02-02 08:15:20 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Carlos Jimenez Ruiz	bf9f5bba49	corrected model types	2021-01-21 11:02:48 +01:00
Javi Gallego	043a74b548	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-19 10:20:45 +01:00
Javi Gallego	d3b5300553	test	2021-01-11 16:30:14 +01:00
Joan Sanchez	292a46106e	Translation fix	2021-01-04 15:08:52 +01:00
Javi Gallego	36bace2a94	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-22 07:42:28 +01:00
Joan Sanchez	027a37bdad	Requested changes	2020-12-21 10:14:15 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Javi Gallego	2bb9125eee	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2020-12-16 08:34:54 +01:00
Javi Gallego	963db11686	funcionalidad	2020-12-16 08:33:08 +01:00
Joan Sanchez	0a4016be41	Updated unit tests & changed ACL	2020-12-11 15:04:55 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Carlos Jimenez Ruiz	4172d0bb9b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-23 18:51:16 +01:00
Joan Sanchez	d40ea52560	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community	2020-11-20 15:06:34 +01:00
Joan Sanchez	7693a1c449	2569 - Section changes	2020-11-20 15:05:57 +01:00
Bernat Exposito	4d91b26537	checkinbox moved to worker	2020-11-20 13:35:01 +01:00
Joan Sanchez	8a3f5345f4	Merge branch 'dev' into 2575-image_download	2020-11-16 13:54:47 +00:00
Juan Ferrer	0490edc2d4	Model redeclaration fix	2020-11-13 11:07:05 +01:00
Juan Ferrer	80cbb53dfe	Merge branch 'test' into dev	2020-11-13 10:49:59 +01:00
Juan Ferrer	cdf6cb661f	Login sync fixes	2020-11-13 10:33:34 +01:00
Bernat Exposito	6fc14d569c	Merge branch 'dev' into 2575-image_download	2020-11-13 08:32:39 +00:00
Joan Sanchez	cb8e9655af	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-13 07:22:12 +01:00
Juan Ferrer	4b46b0787b	User syncronization fixes, improvements, refactor	2020-11-12 23:20:25 +01:00
Bernat Exposito	2454999938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-12 08:14:55 +01:00
Joan Sanchez	136c127cae	Updated back unit test	2020-11-11 14:32:53 +01:00
Bernat Exposito	a060ac5c70	fix pr changes	2020-11-11 11:58:14 +01:00
Bernat Exposito	1e95f0105a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-11 10:52:46 +01:00
Bernat Exposito	75ffa108fb	refactor back download	2020-11-11 10:52:35 +01:00
Carlos Jimenez Ruiz	45a2a2d8e6	Merge branch 'dev' into 2584-client_consumption	2020-11-10 13:30:38 +00:00
Bernat Exposito	c673f2130a	fix e2e	2020-11-10 11:33:01 +01:00
Bernat Exposito	e4e4f37609	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-10 08:46:37 +01:00
Bernat Exposito	4ea5993dcc	user image	2020-11-10 08:39:34 +01:00
Carlos Jimenez Ruiz	54d31f15bb	fixed collection tests pollution	2020-11-09 14:53:26 +01:00
Joan Sanchez	bcd5e6ea76	2584 - Client consumption fixes	2020-11-06 08:21:25 +01:00
Joan Sanchez	c77cd696c7	Test fix	2020-11-04 14:38:15 +01:00
Joan Sanchez	15b7280222	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData	2020-11-02 14:31:39 +01:00
Joan Sanchez	9e3186c0df	Updated unit tests	2020-11-02 08:16:42 +01:00
Juan Ferrer	e25a978b19	Merge branch 'test' into dev	2020-11-01 00:03:05 +01:00
Juan Ferrer	9b563cb8bf	LDAP & Samba synchronization fixes + improvements	2020-10-31 00:02:27 +01:00
Joan Sanchez	245b32a47f	Added section	2020-10-30 15:11:45 +01:00
Joan Sanchez	f87a7664e5	Added loggable utils	2020-10-22 11:24:53 +02:00
Joan Sanchez	fc9b9eb718	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 07:49:04 +02:00
Joan Sanchez	b5c5d78d3a	Param name hotfix	2020-10-21 14:51:07 +02:00
Joan Sanchez	c87783b446	2528 - Rocket notifications hotfix	2020-10-21 13:25:52 +02:00
Carlos Jimenez Ruiz	b96007aa62	fixed login/out problems at random + others	2020-10-16 11:16:24 +02:00
Carlos Jimenez Ruiz	49bdbc139d	fixed sytanx error	2020-10-13 11:04:17 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Carlos Jimenez Ruiz	0dbdb5103e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Joan Sanchez	91fa3e2aec	Updated description	2020-10-05 14:47:42 +02:00
Joan Sanchez	71e29e747a	Requested changes	2020-10-05 14:45:39 +02:00
Joan Sanchez	e3b14405b7	Added unit tests	2020-10-05 08:50:07 +02:00
Joan Sanchez	cdde4d95d7	Added filter	2020-10-05 07:53:03 +02:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Joan Sanchez	53386e3974	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-09-23 15:08:43 +02:00
Bernat Exposito Domenech	3f4e5a6c0c	fix checkinbox	2020-09-23 09:31:21 +02:00
Bernat Exposito Domenech	1f23f6c53c	delete import	2020-09-23 09:11:00 +02:00
Bernat Exposito Domenech	eff0641769	delete console.log	2020-09-23 08:13:36 +02:00