4905 Commits

Author	SHA1	Message	Date
Joan Sanchez	cceb456209	Filter by province	2022-08-12 15:31:59 +02:00
Joan Sanchez	d0185017b7	Removed translate from grouping and packing	2022-08-11 08:29:24 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	8f54365350	refator: parametrizardo con ?	2022-08-10 09:19:23 +02:00
Joan Sanchez	d2b901d47f	Relative path for master versions	2022-08-09 11:49:28 +02:00
Alex Moreno	6054e0bef3	fix(mdb): use relative path	2022-08-05 13:24:48 +02:00
Joan Sanchez	1dda78c438	Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master ... Reviewed-on: #1036	2022-08-04 12:23:27 +00:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Juan Ferrer	22503375b3	Hotfix: User synchronization	2022-08-04 08:53:31 +02:00
Carlos Andrés	918a09ad5c	#3530 Eliminar uso tabla person	2022-07-29 15:17:00 +02:00
Vicent Llopis	537c383cd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-07-29 13:38:23 +02:00
Vicent Llopis	224ea61a62	fix: delete warehouseFk from itemType model	2022-07-29 13:07:25 +02:00
Vicent Llopis	840e792d13	fix: backTest	2022-07-29 12:52:53 +02:00
Vicent Llopis	605da52286	fix: replace it.warehouseFk by userConfig.warehouseFk	2022-07-29 12:22:03 +02:00
Alex Moreno	4c60303968	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-07-27 11:17:35 +02:00
Joan Sanchez	468da0c5a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-07-27 08:12:06 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	d3852bac5d	fix(vnInputTime): quit new date(null)	2022-07-26 11:45:12 +02:00
Vicent Llopis	5446c960fb	fix: frontTest	2022-07-21 10:11:31 +02:00
Vicent Llopis	699f19b0d4	refactor: change invoice id by refFk	2022-07-21 10:05:37 +02:00
Vicent Llopis	cb3e488df9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat	2022-07-20 14:12:08 +02:00
Carlos Jimenez Ruiz	7437da92a5	Merge branch 'dev' into 4294-zone_getEventsFiltered	2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz	c883f45653	Merge branch 'dev' into 4221-intrastat	2022-07-15 12:18:33 +00:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Vicent Llopis	6f3d4792d5	update backTest	2022-07-12 10:03:58 +02:00
Vicent Llopis	eaa7658b23	delete it.warehouseFk	2022-07-12 10:03:50 +02:00
Alex Moreno	051a849a21	fix(zone): fix getEventsFiltered	2022-07-12 08:10:29 +02:00
Vicent Llopis	2d57b3bd54	Merge branch 'dev' into 4221-intrastat	2022-07-12 06:10:20 +00:00
Carlos Jimenez Ruiz	136dcee214	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds	2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz	44c29aa489	updated file as per convention	2022-07-11 11:25:31 +02:00
Alex Moreno	b3d001bb9d	fix(timeEntry): fix back test	2022-07-11 08:17:32 +02:00
Joan Sanchez	fc87039571	Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev ... Reviewed-on: #1011	2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	d810b3712b	Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev ... Reviewed-on: #1017 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-30 12:22:41 +00:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Joan Sanchez	ae79163048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-30 13:17:04 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz	dab8c60f77	Merge branch 'dev' into 4268-client_list_scroll	2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz	14350358d6	added max width to email of 400px + title to overflowing content	2022-06-29 15:21:30 +02:00
Vicent Llopis	748dc1b37e	fix: delete engine memory to pass backTest	2022-06-29 14:36:17 +02:00
Vicent Llopis	24159cd3e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary	2022-06-29 14:28:54 +02:00
Vicent Llopis	d49a2666f1	refactor: don´t show 'description' if it is empty	2022-06-29 14:28:23 +02:00
Vicent Llopis	459a1fe518	feat: update instrastat.sql	2022-06-29 14:15:22 +02:00
Carlos Jimenez Ruiz	57a2cd46ce	ticket filter pending uses isNotValidated now	2022-06-29 12:55:11 +02:00
Alex Moreno	22fd0e91b0	title translations, and getWorkedHours test	2022-06-28 12:10:37 +02:00
Alex Moreno	a3f1c36226	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz	bdf4ecdf50	Merge branch 'dev' into 4223-claim_observations	2022-06-28 07:03:44 +00:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	7980a941a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 14:03:24 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	6370471bd5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations	2022-06-27 11:01:42 +02:00
Vicent Llopis	fcf79a507c	Merge branch 'dev' into 4213-item.summary	2022-06-27 05:32:21 +00:00
Alex Moreno	4155b45785	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Vicent Llopis	2c721867fc	feat(item.summary): add description	2022-06-22 14:30:25 +02:00
Joan Sanchez	2381a5d09a	Updated e2e tests	2022-06-22 12:40:11 +02:00
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +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
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	9751514b10	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-21 11:15:33 +00:00
Joan Sanchez	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Alex Moreno	8d9d64b49d	feat(client_web-access): add email field	2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Carlos Jimenez Ruiz	1e504b6b9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor	2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz	e151e35f7e	replaced isActive by active as per it's model and updated original data in controller	2022-06-16 16:25:21 +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
Vicent Llopis	00e48f5257	feat: add backTest	2022-06-16 10:59:31 +02:00
Vicent Llopis	84ffe3f594	feat: delete from ticketCollection and sectorCollection when a ticket is deleted	2022-06-16 09:58:15 +02:00
Vicent Llopis	f41b9b0b57	refator: delete console.log	2022-06-15 14:25:31 +02:00
Vicent Llopis	f3cca1c930	fix: warehouse changed from 'silla' to 'algemesi'	2022-06-15 14:24:35 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Joan Sanchez	9ab8b84290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz	096f225656	Merge branch 'dev' into 4024-client_defaulter	2022-06-10 07:21:54 +00:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00
Vicent Llopis	fb7f26216c	feat: update combo "Banck entity"	2022-06-09 08:43:33 +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
Alex Moreno	61cc3c19f3	refactor(client): creditInsuarnce change creditClassification for creditClassificationFk	2022-06-09 07:13:54 +02:00