13733 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e7100c3e5a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-13 08:15:41 +01:00
Guillermo Bonet	6ca8b646c2	refs #4898 Added userFk in QR	2022-12-12 19:36:11 +01:00
Guillermo Bonet	d7a6350995	refs #4898 Created report expedition-pallet-label	2022-12-12 18:27:45 +01:00
Joan Sanchez	dc777ea69f	Added version after merging to test	2022-12-12 14:23:40 +01:00
Joan Sanchez	e000103ca4	Deleted version	2022-12-12 14:22:32 +01:00
Alex Moreno	158a71a326	restrictions	2022-12-12 13:37:14 +01:00
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Alex Moreno	b2dcb84a7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-12 11:57:27 +01:00
Carlos Andrés	16d096d8ef	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 10:45:33 +00:00
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +01:00
Carlos Andrés	41b7b6ab06	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 08:24:11 +00:00
Vicent Llopis	f7178f4e32	Merge pull request 'MASTER_hotfix_invoiceOut' (!1197) from MASTER_hotfix_invoiceOut into master ... Reviewed-on: #1197	2022-12-02 12:25:33 +00:00
Alex Moreno	995fb6a5c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-02 13:13:53 +01:00
Vicent Llopis	af9d52a367	Merge branch 'master' into MASTER_hotfix_invoiceOut	2022-12-02 12:04:11 +00:00
Joan Sanchez	8a07e8810d	Merge pull request 'MASTER_hotfix_deleteTrashFiles3' (!1194) from MASTER_hotfix_deleteTrashFiles3 into master ... Reviewed-on: #1194	2022-12-02 11:57:50 +00:00
Joan Sanchez	ac447d4981	Updated SQL version nomenclature	2022-12-02 12:48:12 +01:00
Vicent Llopis	14a3a815da	fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE	2022-12-02 12:05:25 +01:00
Joan Sanchez	6128414685	m3 decimal	2022-12-02 11:26:21 +01:00
Joan Sanchez	0c4ab815fd	decimal	2022-12-02 11:24:08 +01:00
Joan Sanchez	6562b68341	fix(agencyTerm): permitir decimales en m3 minimos	2022-12-02 11:16:49 +01:00
Alexandre Riera	48a7635449	refs #4893 regex changed	2022-12-02 09:18:52 +01:00
Joan Sanchez	12cfa05696	fix(invoicePdf): invoice correction	2022-12-02 08:33:56 +01:00
Pau	691d157da8	Merge branch 'dev' into 4875-skip-tests	2022-12-01 13:33:52 +00:00
Pau	c54844f7ff	removed pending from working test	2022-12-01 14:32:05 +01:00
Vicent Llopis	e7173fe156	fix: backTest	2022-12-01 11:59:30 +01:00
Vicent Llopis	ede721a37b	Merge branch 'master' into MASTER_hotfix_deleteTrashFiles3	2022-12-01 10:57:44 +00:00
Joan Sanchez	e815292d6b	fix(componentUpdate): updated filter where sintax	2022-12-01 09:24:56 +01:00
Vicent Llopis	2bb6c1c1da	fix: borra registros aunq no tengan file adjunto	2022-12-01 07:54:32 +01:00
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +01:00
Joan Sanchez	e9c189a963	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-12-01 07:31:45 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Pau	d428753088	Merge pull request 'refs #4875 skipped failing test' (!1193) from 4875-skip-tests into dev ... Reviewed-on: #1193 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-30 13:56:01 +00:00
Joan Sanchez	9ab2144008	Merge pull request 'hotFix: not transfer all sales if all sales is negatives' (!1192) from hotFix_withoutNegatives into master ... Reviewed-on: #1192	2022-11-30 13:53:11 +00:00
Alex Moreno	43bd583d6f	Merge branch 'dev' into 4875-skip-tests	2022-11-30 13:49:59 +00:00
Pau	79f8e30ded	add pending to the tests	2022-11-30 14:49:00 +01:00
Pau	67384b724d	refs #4875 skipped failing test	2022-11-30 14:41:03 +01:00
Alex Moreno	b769845a28	hotFix: not transfer all sales if all sales is negatives	2022-11-30 14:29:44 +01:00
Vicent Llopis	c1089c637a	fix: backTest	2022-11-30 13:43:29 +01:00
Vicent Llopis	1588492f9a	feat: solo añade los logs de salix con el model 'Sale'	2022-11-30 13:29:39 +01:00
Pau	9ed9c1a82c	Delete sendsms from core/components	2022-11-30 13:13:06 +01:00
Juan Ferrer	204eb52f78	Merge pull request 'refs #4550 fixed no ellipsize in agencyDescription' (!1191) from 4550-HOTFIX-collection-label into master ... Reviewed-on: #1191	2022-11-30 12:07:29 +00:00
Guillermo Bonet	23f429d94a	refs #4550 fixed no ellipsize in agencyDescription	2022-11-30 12:44:33 +01:00
Joan Sanchez	5423cc4298	Merge pull request 'refs #4550 changed font-family of collection-label' (!1187) from #4550-HOTFIX-collection-label-font into master ... Reviewed-on: #1187	2022-11-30 10:35:35 +00:00
Guillermo Bonet	0c8b066bc4	Merge branch 'master' into #4550-HOTFIX-collection-label-font	2022-11-30 10:32:49 +00:00
Guillermo Bonet	497e3e54a2	refs #4550 changes	2022-11-30 10:52:52 +01:00
Alex Moreno	67cf4ebbea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-30 10:28:21 +01:00
Pau	c68aa890b9	Merge pull request 'refs #4914 @1h' (!1190) from hotfix(#4914)-Bug-Client-Phone into dev ... Reviewed-on: #1190 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-30 09:13:17 +00:00
Joan Sanchez	53dc9eb0c7	Merge pull request 'fix balances' (!1189) from fix-balance into master ... Reviewed-on: #1189	2022-11-30 09:03:00 +00:00
Pau	97baa89a71	Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone	2022-11-30 09:52:19 +01:00
Alexandre Riera	492b852be8	delete orderBy	2022-11-30 09:22:53 +01:00