12161 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Carlos Jimenez Ruiz	9fd812dd0f	Merge pull request 'Rename db changes folder' (#1006) from renameDbChangesFolder into dev ... Reviewed-on: #1006 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 14:43:40 +00:00
Carlos Jimenez Ruiz	a5f53364c3	Merge branch 'dev' into renameDbChangesFolder	2022-06-17 11:30:33 +00:00
Carlos Jimenez Ruiz	b5cea244ca	Merge pull request '4081-ticket.setDeleted' (#1003) from 4081-ticket.setDeleted into dev ... Reviewed-on: #1003 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 11:30:23 +00:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	f12d686c33	Merge pull request '4197-entry.lastetBuysFilter' (#1002) from 4197-entry.lastetBuysFilter into dev ... Reviewed-on: #1002 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-17 10:48:01 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Joan Sanchez	7d6d53b7db	Merge pull request '2808-e2e_account_descriptor' (#979) from 2808-e2e_account_descriptor into dev ... Reviewed-on: #979 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-17 10:32:15 +00:00
Alex Moreno	e775c67b1b	rename	2022-06-17 09:44:59 +02:00
Carlos Jimenez Ruiz	9e70b8c5fd	web access user changed to a non-worker	2022-06-17 09:28:54 +02: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
Joan Sanchez	4374fc6f0f	Merge pull request '4185-secure_client_pass_changes' (#1004) from 4185-secure_client_pass_changes into dev ... Reviewed-on: #1004 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-16 14:35:51 +00: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	869c9caf98	corrected a typo	2022-06-16 14:53:35 +02:00
Carlos Jimenez Ruiz	5dd91a0be9	excluded web access e2e path for another task to fix it.	2022-06-16 12:08:58 +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	c49f563299	feat: add fixtures	2022-06-16 10:59:17 +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	b64174ff5d	Merge pull request '3925-staticDate' (#999) from 3498-staticDate into dev	2022-06-15 08:44:16 +00:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Carlos Jimenez Ruiz	b0827bd98b	Merge pull request '4024-refactor(client_defaulter)' (#972) from 4024-client_defaulter into dev ... Reviewed-on: #972 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-13 07:10:03 +00:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Alex Moreno	15f8a261d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-10 14:08:58 +02:00
Joan Sanchez	2f082ece34	Added SQL version	2022-06-10 10:18:56 +02:00
Carlos Jimenez Ruiz	096f225656	Merge branch 'dev' into 4024-client_defaulter	2022-06-10 07:21:54 +00:00
Carlos Jimenez Ruiz	9dbd1e6f72	Merge pull request '3653-refactor(clientInsurance): rename column add Fk' (#997) from 3653-clientInsurance into dev ... Reviewed-on: #997 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-10 07:13:38 +00:00
Alex Moreno	7dffe4edcb	quit vn_curdate of sql in print	2022-06-10 07:58:56 +02: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	36ea903333	change NumberFormat	2022-06-09 15:10:53 +02:00
Alex Moreno	417c798afd	add schema	2022-06-09 14:52:01 +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
Joan Sanchez	d08e1cee23	Merge pull request '4164 - Endpoint refactor' (#996) from 4164-edi_updateData into dev ... Reviewed-on: #996 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-06-09 11:10:31 +00:00
Juan Ferrer	86605c3d67	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 10:18:03 +00:00
Joan Sanchez	4a823f1a35	Merge pull request '4163-supplier.account' (#998) from 4163-supplier.account into dev ... Reviewed-on: #998 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-09 10:06:11 +00:00
Joan Sanchez	1bb8527c49	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:59:18 +00:00
Joan Sanchez	be50663faa	Merge pull request '4040-chat_sendQueued' (#993) from 4040-chat_sendQueued into dev ... Reviewed-on: #993 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-09 09:57:56 +00:00
Joan Sanchez	83d4627f2d	Removed font color	2022-06-09 11:31:18 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	626057fc4e	Merge branch 'dev' into 4164-edi_updateData	2022-06-09 08:49:28 +00:00
Carlos Jimenez Ruiz	cd5dba6fcb	Merge branch 'dev' into 4040-chat_sendQueued	2022-06-09 08:44:22 +00:00
Carlos Jimenez Ruiz	a3c928d196	Merge pull request '3817-updatePortfolio' (#989) from 3817-updatePortfolio into dev ... Reviewed-on: #989 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-09 08:42:44 +00:00
Joan Sanchez	7fe7fb2e8f	Replaced fs sync functions	2022-06-09 10:13:45 +02:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00