17337 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	47f624ec04	skip e2e test	2022-12-16 09:01:30 +01:00
Vicent Llopis	85148ab929	refactor: movidos changes sql	2022-12-16 08:59:06 +01:00
Vicent Llopis	3642b295b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-16 08:50:51 +01:00
Carlos Andrés	be5ee91fc4	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-16 07:44:47 +00:00
Alex Moreno	19cbd5b57b	fix css	2022-12-16 08:43:34 +01: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
Alexandre Riera	900b378c88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 07:56:38 +01:00
Alex Moreno	ed68637059	disable outLayout	2022-12-15 15:05:17 +01:00
Vicent Llopis	1b30ee9d2d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-15 14:32:51 +01: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
Alexandre Riera	45317c0850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-15 14:26:10 +01:00
Alexandre Riera	92a961ecc9	refs #3302 refactor	2022-12-15 14:24:57 +01:00
Alexandre Riera	0af4f337e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-15 14:23:44 +01: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
Alex Moreno	0ad4a1ae3a	Merge pull request 'add reset-password' (!1207) from hotFix-reset-password into test ... Reviewed-on: #1207 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:16:48 +00:00
Alex Moreno	8d7757ddbe	add reset-password	2022-12-15 07:40:51 +01:00
Vicent Llopis	4e8896202a	delete: transacción innecesaria	2022-12-15 07:17:26 +01:00
Vicent Llopis	859c084430	refactor: movidos changes sql	2022-12-15 07:17:13 +01:00
Vicent Llopis	6793b8e9a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-15 07:13:09 +01:00
Guillermo Bonet	76001ec022	refs #4204 labelCount argument not required	2022-12-14 16:15:41 +01:00
Alex Moreno	156f2b9129	feat: handle errors and autogenerate user and code	2022-12-14 15:03:55 +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
Vicent Llopis	e616835600	delete: hasDateRange()	2022-12-14 13:40:28 +01:00
Vicent Llopis	f7a97a8139	fix: siempre muestra el botón si hay datos	2022-12-14 13:31:56 +01:00
Alexandre Riera	f80f851e8d	refs #4962 model TicketFuture deleted	2022-12-14 13:10:33 +01:00
Alex Moreno	d753243061	fix package.json	2022-12-14 12:33:35 +01:00
Alexandre Riera	0c98ac2bb2	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-14 12:27:17 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alexandre Riera	dc33a46eee	refs #4926 ticket tour future refactor	2022-12-14 12:17:12 +01:00
Alex Moreno	b378598113	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2022-12-14 10:15:11 +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