12670 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	a695468bb7	refator: deleted sensitive information	2022-09-16 10:32:37 +02:00
Vicent Llopis	7480bf8a69	feat: do nothing if user and password are empty in osTicketConfig	2022-09-16 10:31:02 +02:00
Vicent Llopis	cfe5c66fe4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets	2022-09-16 09:23:56 +02:00
Joan Sanchez	fe71e485aa	Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev ... Reviewed-on: #1055	2022-09-16 07:15:41 +00:00
Joan Sanchez	9f9581c722	Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev ... Reviewed-on: #1048 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:12:41 +00:00
Joan Sanchez	1b09f3bf7f	Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev ... Reviewed-on: #1052 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:11:59 +00:00
Joan Sanchez	f9f09440ec	Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev ... Reviewed-on: #1053 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-16 07:10:48 +00:00
Vicent Llopis	503e78d4f0	fix: rollback mariadb version	2022-09-16 09:07:43 +02:00
Joan Sanchez	793705413e	#452 - Dumped db	2022-09-16 07:05:27 +00:00
Alex Moreno	54b41faf12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss	2022-09-16 08:55:39 +02:00
Alex Moreno	24e4a606d7	remove change	2022-09-16 08:49:18 +02:00
Vicent Llopis	f5bbe3a9ac	fix: scope updated	2022-09-15 11:55:07 +02:00
Joan Sanchez	9d5351c84c	Updated db image	2022-09-15 07:31:49 +00:00
Vicent Llopis	5fce5b3e4f	refator: delete console.log	2022-09-15 08:38:00 +02:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Vicent Llopis	28bf7bd747	feat: check general status 'open' to close ticket	2022-09-15 08:34:42 +02:00
Vicent Llopis	182fe4a38e	fix: te2e	2022-09-14 14:03:49 +02:00
Vicent Llopis	eb7bd3dc59	update brach	2022-09-14 14:03:15 +02:00
Alex Moreno	e72c0ae919	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-09-14 13:09:00 +02:00
Alex Moreno	4f7218ab76	translation	2022-09-14 13:01:40 +02:00
Alex Moreno	06eab58b3d	is agency	2022-09-14 12:45:40 +02:00
Alex Moreno	8c984b5ebe	refactor(client): change rol manager to financialBoss	2022-09-14 12:32:19 +02:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +02:00
Alex Moreno	49a7a05310	feat(travel_extra-community): add vn-anchor	2022-09-14 08:08:07 +02:00
Alex Moreno	2b101cf7c1	refactor(travel_extra-community): use smart-table, fix scroll	2022-09-13 15:11:14 +02:00
Joan Sanchez	7e3add46ea	Merge pull request '4533-zone.events_addEvent' (#1051) from 4533-zone.events_addEvent into master ... Reviewed-on: #1051	2022-09-13 12:59:00 +00:00
Vicent Llopis	a6a5a84add	fix: incorrect name of function	2022-09-13 14:42:15 +02:00
Joan Sanchez	5a46444875	Use POST request method instead of GET	2022-09-13 13:53:44 +02:00
Vicent Llopis	3bf5f5f86e	fix: tfront	2022-09-13 13:47:54 +02:00
Vicent Llopis	bddc998b86	feat: allow update route.isOk field	2022-09-13 13:34:32 +02:00
Joan Sanchez	f3fe19360a	Closure refactor	2022-09-13 13:20:18 +02:00
Joan Sanchez	5cff983d4c	Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev ... Reviewed-on: #1040 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:33:04 +00:00
Vicent Llopis	6e31865add	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent	2022-09-13 12:17:30 +02:00
Vicent Llopis	cc6ba8712c	feat: log when a day is excluded	2022-09-13 12:15:28 +02:00
Joan Sanchez	1f850d13e9	Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev ... Reviewed-on: #1035 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 10:00:36 +00:00
Joan Sanchez	4965bfd923	Merge pull request '4496-entry.buy_import' (#1047) from 4496-entry.buy_import into dev ... Reviewed-on: #1047 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-13 09:58:27 +00:00
Vicent Llopis	1fd97f167c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-09-13 11:35:15 +02:00
Vicent Llopis	b02aa8466c	fix: tfront	2022-09-13 10:27:17 +02:00
Vicent Llopis	8c6c7345cd	fix: change GET by POST, to solve "Request Header Fields Too Large"	2022-09-13 10:27:08 +02:00
Joan Sanchez	e6410f6b13	Merge pull request 'fix(report): debtor letter with portuguese IBAN' (#1046) from 4245-debtor_portuguese into dev ... Reviewed-on: #1046	2022-09-12 11:10:37 +00:00
Joan Sanchez	27ecff685e	fix(report): debtor letter with portuguese IBAN	2022-09-12 12:45:52 +02:00
Joan Sanchez	3210f91bf7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-12 12:20:49 +02:00
Joan Sanchez	de3e14e739	4514 - Write permissions for rrhh	2022-09-12 10:23:17 +02:00
Joan Sanchez	faa3865da1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-09 11:53:57 +02:00
Alex Moreno	c9721f4c7f	fix(entry_latestBuys): save chekeds when crudModel load more data	2022-09-08 14:52:43 +02:00
Joan Sanchez	fce26342a9	Return inside try-catch	2022-09-08 11:42:16 +02:00
Joan Sanchez	da92f771ac	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-09-08 11:21:52 +02:00
Joan Sanchez	4251b0baeb	Removed debug logs	2022-09-08 11:19:04 +02:00
Joan Sanchez	b499de7c08	tx commit	2022-09-08 10:33:51 +02:00
Joan Sanchez	151e1b52ed	Updated transaction	2022-09-08 09:21:05 +02:00