12077 Commits

All Branches

Search

Author	SHA1	Message	Date
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	3bf2b46689	feat(ticket_line): update workerMana if check claimMana option	2022-03-30 10:09:01 +02:00
Vicent Llopis	23cb8c1215	refactor(ticket_sale): update frontTest	2022-03-30 09:54:01 +02:00
Vicent Llopis	b78ecc06d2	fix(ticker_sale): only show mana options if currentWorker has mana	2022-03-30 09:29:57 +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
Vicent Llopis	5b1d610f2f	refator: updated translate	2022-03-30 07:55:37 +02:00
Vicent Llopis	572cc30a4e	refactor: updated translate	2022-03-30 07:53:00 +02:00
Vicent Llopis	e0244f388c	refator: single quotes in sql files	2022-03-30 07:39:42 +02:00
Vicent Llopis	d06b2e8bb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3	2022-03-30 07:30:39 +02:00
Vicent Llopis	8e27ab612d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana	2022-03-29 15:08:48 +02:00
Vicent Llopis	63a857a616	fix: updated test e2e	2022-03-29 14:33:22 +02:00
Vicent Llopis	86350b2afa	feat(ticket_sale): add backTest	2022-03-29 14:00:53 +02:00
Vicent Llopis	c15aea213f	feat(ticket_sale): add front test	2022-03-29 13:42:56 +02:00
Vicent Llopis	a5ca116571	feat(ticket_sale): add mana options	2022-03-29 13:42:37 +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
Vicent Llopis	133152460a	fix: translate	2022-03-28 14:14:41 +02:00
Alex Moreno	1959340163	remove $applyAsync test	2022-03-28 14:04:26 +02:00
Alex Moreno	f853696d03	change fixture name	2022-03-28 13:59:39 +02:00
Vicent Llopis	b72d26f214	fix: update backTest	2022-03-28 13:40:52 +02:00
Vicent Llopis	f4d53c4040	pull request changes required	2022-03-28 13:35:36 +02:00
Vicent Llopis	64ae7ee8ea	feat: modify filter	2022-03-28 13:24:26 +02:00
Vicent Llopis	a5b3bdfa8d	feat: add backTest	2022-03-28 13:24:11 +02:00
Carlos Jimenez Ruiz	23c473de89	Merge branch 'dev' into 3408-worker_calendar	2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz	49ae4d0e74	Merge branch 'dev' into 3734-item_diary_scroll	2022-03-28 10:14:34 +00:00