12446 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
Joan Sanchez	64cf5a91d0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-08-10 12:18:15 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Joan Sanchez	398df267a7	Item-label locale	2022-08-09 11:58:42 +02:00
Joan Sanchez	748e7ff5ea	Merge pull request 'MASTER_hot_fix(mdb): use relative path' (#1038) from useRelativePath into master ... Reviewed-on: #1038 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-09 09:50:26 +00:00
Joan Sanchez	d2b901d47f	Relative path for master versions	2022-08-09 11:49:28 +02:00
Alex Moreno	6054e0bef3	fix(mdb): use relative path	2022-08-05 13:24:48 +02:00
Joan Sanchez	69ca28ae14	Added SQL version	2022-08-05 11:42:36 +02:00
Joan Sanchez	e08619d126	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-08-05 11:19:39 +02:00
Joan Sanchez	cabc30ef87	Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev ... Reviewed-on: #1029 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-05 09:18:53 +00:00
Joan Sanchez	104773d909	Merge pull request '4372-refund_3.0' (#1037) from 4372-refund_3.0 into test ... Reviewed-on: #1037 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-08-05 08:45:41 +00:00
Joan Sanchez	624428212b	Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev ... Reviewed-on: #1026 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-08-04 12:51:41 +00:00
Joan Sanchez	1dda78c438	Merge pull request '3530-Eliminar-el-uso-de-person' (#1036) from 3530-Eliminar-el-uso-de-person into master ... Reviewed-on: #1036	2022-08-04 12:23:27 +00:00
Vicent Llopis	6f754d962e	fix: quantity negative for refunds	2022-08-04 14:19:21 +02:00
Vicent Llopis	a82bc7a8e8	delete: old versions of db changes	2022-08-04 13:55:30 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Juan Ferrer	22503375b3	Hotfix: User synchronization	2022-08-04 08:53:31 +02:00