12471 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Joan Sanchez	9d5351c84c	Updated db image	2022-09-15 07:31:49 +00:00
Joan	90229112e9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-15 06:35:03 +00:00
Alex Moreno	6b252f7e33	refactor(item_waste): refactor table and add totals in table_head	2022-09-14 10:13:30 +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
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
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
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
Joan Sanchez	44b63af0a7	Merge pull request 'hotFix(monitor_salesFilter): mariadb not optimize query' (#1044) from hotFix_monitorSQL_optimizer into master ... Reviewed-on: #1044 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-08 06:22:02 +00:00
Alex Moreno	a15c051098	fix(monitor_salesFilter): mariadb not optimize query	2022-09-08 08:07:46 +02:00
Joan Sanchez	ab86ba0652	Disabled transaction	2022-09-07 12:28:53 +02:00
Joan Sanchez	aec053868d	Debug logs	2022-09-07 11:50:02 +02:00
Joan Sanchez	48916e2b07	Debug logs	2022-09-07 11:26:58 +02:00
Joan Sanchez	313ce773ae	Merge pull request 'hotFix(smartTable): refresh button await query' (#1043) from hotFix_smartTable_awaitRefresh into master ... Reviewed-on: #1043	2022-09-07 09:04:25 +00:00
Joan Sanchez	8f86cacc96	Missing await	2022-09-07 10:48:24 +02:00
Alex Moreno	bbc5790945	fix(smartTable): refresh button await query	2022-09-07 10:30:50 +02:00
Joan Sanchez	aba1696ad7	Changes	2022-09-07 10:26:32 +02:00
Joan Sanchez	1db6aaac1f	Merge pull request '4104-refactor(claim_action): add translations' (#1041) from 4104-claim_action_translations into dev ... Reviewed-on: #1041 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-07 07:06:46 +00:00
Joan Sanchez	ee23e26104	Merge pull request 'MASTER_hotFix(monitor): fix left join salesFilter' (#1042) from hotFix_salesFilter_straight_join into master ... Reviewed-on: #1042 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-07 07:03:59 +00:00
Alex Moreno	886abfd897	fix(monitor): fix left join salesFilter	2022-09-07 08:49:24 +02:00
Joan Sanchez	7264595646	Throw error for max-retries	2022-09-06 14:23:25 +02:00
Joan Sanchez	5c5440cdfc	Removed callback	2022-09-06 13:13:49 +02:00
Joan Sanchez	37f0b557f4	Removed callback	2022-09-06 13:13:29 +02:00
Joan Sanchez	6410a4db42	Send response before ending task execution	2022-09-06 12:54:33 +02:00
Joan Sanchez	011e372558	Removed wrong commit code pick	2022-09-06 12:21:38 +02:00
Alex Moreno	6fcb1e54b4	refactor(claim_action): set translations	2022-09-06 09:35:01 +02:00
Javi Gallego	9fe32788fc	regularizado	2022-08-24 14:38:05 +02:00
Javi Gallego	e376dbf038	Merge pull request 'quito left en taxes' (#1039) from cau-#052809-fallo-invoiceOut-left into master ... Reviewed-on: #1039 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-08-17 10:41:04 +00:00
Javi Gallego	5e54e27718	quito left en taxes	2022-08-17 12:19:54 +02:00
Joan Sanchez	7a04cf0a6e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-08-12 15:53:24 +02:00
Joan Sanchez	4de596df4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-08-12 15:53:07 +02:00
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	6b6d00cf95	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-08-10 12:23:28 +02:00