11627 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b8a954caec	feat(client): section unpaid	2022-04-07 11:41:35 +02:00
Joan Sanchez	67c53d7611	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-07 10:31:18 +02:00
Joan Sanchez	0a4b7bd000	Added new version folder	2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz	4a59ef2bd5	Merge pull request '3686-client_create' (#910) from 3686-client_create into dev ... Reviewed-on: #910 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-04-07 08:28:50 +00:00
Carlos Jimenez Ruiz	47ef80b1c3	Merge branch 'dev' into 3686-client_create	2022-04-07 08:25:06 +00:00
Joan Sanchez	86ffedf28d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-07 09:12:40 +02:00
Joan Sanchez	287aa0c3c6	Updated unit tests	2022-04-07 08:53:03 +02:00
Joan Sanchez	0e75555bcd	Updated unit tests	2022-04-07 08:51:07 +02:00
Joan Sanchez	f5a6521f20	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-04-06 14:34:23 +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
Joan Sanchez	4be3f9c00f	Open client summary	2022-04-05 09:58:15 +02:00
Joan Sanchez	7a8dbdfb16	Updated SQL files	2022-04-05 09:56:39 +02:00
Vicent Llopis	86b24ecd1d	feat(client): add backTest	2022-04-01 12:13:24 +02:00
Vicent Llopis	d4136cde0b	fix: excluded backTest	2022-04-01 11:22:38 +02:00
Vicent Llopis	39e5f8b418	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3686-client_create	2022-04-01 10:04:54 +02:00
Vicent Llopis	3de9ea2ce5	refactor(client_create): added checks on back route	2022-04-01 10:04:15 +02:00
Vicent Llopis	da14d6064b	refactor(client_create): deteled checks on hook	2022-04-01 10:02:23 +02:00
Carlos Jimenez Ruiz	43fcd0c473	Merge pull request '3742-client_updatePortfolio' (#922) from 3742-client_updatePortfolio into dev ... Reviewed-on: #922 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-31 09:19:01 +00:00
Carlos Jimenez Ruiz	786d8bd574	Merge branch 'dev' into 3742-client_updatePortfolio	2022-03-31 09:13:08 +00:00
Carlos Jimenez Ruiz	47df23587a	Merge pull request '3525-ticket_line' (#923) from 3525-ticket_line into dev ... Reviewed-on: #923 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-31 09:12:08 +00:00
Vicent Llopis	b29261cb75	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3686-client_create	2022-03-30 12:35:37 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Vicent Llopis	98fb3c1a67	refactor(client_updatePorfolio): included backTest	2022-03-30 08:09:52 +02:00
Carlos Jimenez Ruiz	419ec4ac18	Merge pull request '3791-travel_extra-community' (#918) from 3791-travel_extra-community into dev ... Reviewed-on: #918 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 10:27:31 +00:00
Carlos Jimenez Ruiz	b68e458890	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 10:21:31 +00:00
Carlos Jimenez Ruiz	6e8499ddfb	Merge pull request '3781-export_database' (#919) from 3781-export_database into dev ... Reviewed-on: #919 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 10:21:07 +00:00
Joan Sanchez	bbbb0df1cd	Merge branch 'dev' into 3781-export_database	2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz	9ad782cb59	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 08:39:21 +00:00
Carlos Jimenez Ruiz	7b19a70f96	Merge pull request '3734-fix(item_diary): apply async scroll' (#913) from 3734-item_diary_scroll into dev ... Reviewed-on: #913 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 08:38:39 +00:00
Carlos Jimenez Ruiz	e2aaa616af	Merge branch 'dev' into 3734-item_diary_scroll	2022-03-29 08:34:35 +00:00
Carlos Jimenez Ruiz	ab7a24441a	Merge pull request '3637-feat(department): add hasToMistake in model' (#912) from 3637-departments_hasToMistake into dev ... Reviewed-on: #912 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 08:33:01 +00:00
Carlos Jimenez Ruiz	7d3f8844cc	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:27:46 +00:00
Carlos Jimenez Ruiz	d3946cd568	Merge pull request '3621-fix(worker_calendar): absence in holiday day' (#911) from 3621-worker_calendar into dev ... Reviewed-on: #911 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 08:27:23 +00:00
Carlos Jimenez Ruiz	b27a7ca263	Merge branch 'dev' into 3637-departments_hasToMistake	2022-03-29 08:19:01 +00:00
Carlos Jimenez Ruiz	74fb7c95c2	Merge branch 'dev' into 3621-worker_calendar	2022-03-29 08:18:13 +00:00
Vicent Llopis	8c744a0135	refacto: translate corrected	2022-03-29 10:17:26 +02:00
Carlos Jimenez Ruiz	7209bc52de	Merge branch 'dev' into 3791-travel_extra-community	2022-03-29 08:10:30 +00:00
Carlos Jimenez Ruiz	0801209965	Merge pull request '3408-worker_calendar' (#914) from 3408-worker_calendar into dev ... Reviewed-on: #914 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 08:09:49 +00:00
Alex Moreno	fd02038c8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar	2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz	407fe2850b	Merge branch 'dev' into 3408-worker_calendar	2022-03-29 08:06:25 +00:00
Carlos Jimenez Ruiz	589a9a1f9d	Merge pull request '3607-supplier_agencyTerm' (#905) from 3607-supplier_agencyTerm into dev ... Reviewed-on: #905 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-03-29 08:03:00 +00:00
Carlos Jimenez Ruiz	e4ae263d42	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-29 07:54:00 +00:00
Vicent Llopis	6c43ea716e	fix: update test failed	2022-03-29 09:10:42 +02:00
Vicent Llopis	889dcf8763	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database	2022-03-29 08:56:59 +02:00
Vicent Llopis	396d5360b5	delete jenkins changes	2022-03-29 07:38:08 +02:00
Vicent Llopis	6190ad9166	delete jenkins changes	2022-03-29 07:37:26 +02:00
Vicent Llopis	2ab45fe2eb	delete jenkins changes	2022-03-29 07:34:35 +02:00
Vicent Llopis	08249afc4e	test	2022-03-28 15:15:23 +02:00
Vicent Llopis	9faf9d8688	test Jenkins NOT PUSH	2022-03-28 15:01:58 +02:00