13596 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	d97a2738a4	refs #4975 Upload method modified and addedd model	2022-12-22 07:12:09 +01:00
Guillermo Bonet	dc82e610b7	refs #4975 Minor changes	2022-12-19 11:24:18 +01:00
Guillermo Bonet	a46c2ced7c	refs #4975: Added last mdbVersion/last method	2022-12-19 07:26:07 +01:00
Vicent Llopis	1fcf5a85a6	Merge pull request 'fixes #4990 acquireTimeout to 60000' (!1209) from 4990-fix-jenkins-backTests into dev ... Reviewed-on: #1209 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-12-15 13:27:15 +00:00
Alex Moreno	4b16b413dc	fixes #4990 acquireTimeout to 60000	2022-12-15 14:09:35 +01:00
Joan Sanchez	c004a2917d	Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev ... Reviewed-on: #1204 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:24:34 +00:00
Joan Sanchez	3b9cd5be09	Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev ... Reviewed-on: #1200 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-15 07:21:01 +00:00
Joan Sanchez	e6867f6004	Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev ... Reviewed-on: #1203 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:20:00 +00:00
Guillermo Bonet	76001ec022	refs #4204 labelCount argument not required	2022-12-14 16:15:41 +01:00
Alex Moreno	d753243061	fix package.json	2022-12-14 12:33:35 +01:00
Alex Moreno	c14059df75	fix(supplier_consumption): fix JOIN	2022-12-14 10:12:51 +01:00
Guillermo Bonet	b7a369a41c	refs #4204 Added param URL labelCount and ... changes in the css	2022-12-13 18:05:29 +01:00
Alex Moreno	1e0b0028f2	fix: only edit structure	2022-12-13 13:37:25 +01:00
Alex Moreno	8900656b14	Merge branch 'dev' into 4859-export_db	2022-12-13 08:29:32 +00:00
Alexandre Riera	1f0f5adcd8	Merge pull request 'fixes #4893 Comprobar formato del correo al insertar' (!1196) from 4893-formato-correo into dev ... Reviewed-on: #1196 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-13 08:13:40 +00:00
Alexandre Riera	86a58a26ea	Merge branch 'dev' into 4893-formato-correo	2022-12-13 08:07:48 +00:00
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
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +01: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
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
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