13635 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	8b5f5d928e	fix: backTest	2022-12-20 10:40:39 +01:00
Vicent Llopis	b7100873a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip	2022-12-20 10:11:52 +01:00
Vicent Llopis	63343998d8	refactor: cambiada la forma en que se descarga el zip	2022-12-20 09:48:58 +01:00
Alexandre Riera	2bb37e733a	Merge pull request 'fixes #4928 Supplier payMethod notify' (!1202) from 4928-supplier-payMethod-notify into dev ... Reviewed-on: #1202 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-12-20 07:07:35 +00:00
Alexandre Riera	cd71a59dfe	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-20 07:01:45 +00:00
Alexandre Riera	6517e9e6ce	Merge pull request 'fixes #4503 Añadir opción de rocket si o rocket no' (!1145) from 4503-opcion-rocket into dev ... Reviewed-on: #1145 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-20 06:59:28 +00:00
Alexandre Riera	0009f27462	Merge branch 'dev' into 4503-opcion-rocket	2022-12-20 06:55:11 +00:00
Joan Sanchez	c94c8a159e	Merge pull request '4548 fix: invoiceIn' (!1211) from 4548-invoiceIn-pdf-2 into dev ... Reviewed-on: #1211 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-19 07:45:32 +00:00
Alex Moreno	17a3896c1c	Merge branch 'dev' into 4548-invoiceIn-pdf-2	2022-12-19 07:32:52 +00:00
Pau	410e51f96b	Merge pull request 'removed pending from working test' (!1195) from 4875-skip-tests into dev ... Reviewed-on: #1195 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-19 06:43:31 +00:00
Pau	28e0d0566c	Merge branch 'dev' into 4875-skip-tests	2022-12-19 06:13:45 +00:00
Alexandre Riera	6130547420	Merge branch 'dev' into 4503-opcion-rocket	2022-12-16 12:42:42 +00:00
Alexandre Riera	93602a4ea0	Merge branch '4928-supplier-payMethod-notify' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-16 12:50:12 +01:00
Alexandre Riera	b72cb64bf8	refs #4928 findById	2022-12-16 12:50:09 +01:00
Alex Moreno	0a18c855e7	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-16 10:43:40 +00:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Carlos Andrés	98b8d652cb	Merge pull request 'refs #4865 Sintaxis mensajes rocket' (!1180) from 4865-sintaxis-mensajes-de-rocket into dev ... Reviewed-on: #1180 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-16 08:42:55 +00:00
Carlos Andrés	be5ee91fc4	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-16 07:44:47 +00:00
Joan Sanchez	dac6b4cb22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-16 08:41:43 +01:00
Joan Sanchez	e7883d1c59	Removed deprecated foreign key	2022-12-16 08:39:59 +01:00
Joan Sanchez	5b23ee6d5a	Removed deprecated fields	2022-12-16 08:10:39 +01:00
Alex Moreno	b8a0d179f1	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-16 07:08:39 +00:00
Joan Sanchez	f9593b121f	Merge pull request 'Use proper module codes' (!1206) from 4919-module_code into dev ... Reviewed-on: #1206 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-12-16 06:58:51 +00:00
Carlos Andrés	31d7145c51	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-15 13:28:34 +00: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
Alex Moreno	bab6fa0c9d	acquireTimeout: 60000	2022-12-15 14:02:18 +01:00
Alex Moreno	5cc8764a3f	acquireTimeout 10000	2022-12-15 13:54:17 +01:00
Alexandre Riera	522000cd04	refs #4928 fix fixtures	2022-12-15 09:52:34 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +01:00
Carlos Andrés	fc69098c62	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-15 08:18:24 +00:00
Alex Moreno	279456b377	Merge branch 'dev' into 4919-module_code	2022-12-15 07:58:18 +00:00
Alexandre Riera	33196acac6	refs #4928 fixture notification, fix test supplier	2022-12-15 08:31:47 +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
Joan Sanchez	11db08b32b	Updated unit test	2022-12-14 14:20:41 +01:00
Joan Sanchez	a86636bee4	Use proper module codes	2022-12-14 13:49:49 +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
Alexandre Riera	f4ed7781b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-14 08:30:36 +01:00
Alexandre Riera	f00fdcff7c	refactor sql	2022-12-14 08:06:02 +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
Alexandre Riera	95967a29db	refs #4928 email template added and proc modified	2022-12-13 11:50:17 +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