13717 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	b4b7b8e204	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 09:08:39 +01:00
Alexandre Riera	ebb81a3377	Merge pull request 'fixes #3963 Adelantar la fecha de preparacion de tickets' (!1155) from 3963-ticket-advance into dev ... Reviewed-on: #1155 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-21 07:37:19 +00:00
Alexandre Riera	081ef7fc99	Merge branch 'dev' into 3963-ticket-advance	2022-12-21 07:30:17 +00:00
Vicent Llopis	144a1cb105	Merge pull request '3951-invoiceOut.index_downloadZip' (!1215) from 3951-invoiceOut.index_downloadZip into dev ... Reviewed-on: #1215 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-21 07:12:14 +00:00
Vicent Llopis	5a4a78d045	Merge branch 'dev' into 3951-invoiceOut.index_downloadZip	2022-12-21 07:02:12 +00:00
Pau	04055f2294	Merge pull request '4791-refactor-sendsms' (!1160) from 4791-refactor-sendsms into dev ... Reviewed-on: #1160 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-21 06:55:27 +00:00
Pau	c9b4e1ab9a	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-21 06:38:20 +00:00
Alexandre Riera	140509202b	Merge branch 'dev' into 3963-ticket-advance	2022-12-20 14:20:26 +00:00
Alexandre Riera	c949b7f6c7	Merge pull request 'fixes #4962 Refactor Ticket Tour a Futuro' (!1212) from 4700-split-tour into dev ... Reviewed-on: #1212 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-20 14:17:38 +00:00
Alexandre Riera	9291f4a380	refs #3963 sql moved	2022-12-20 12:10:02 +01:00
Pau	1305513b07	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 11:01:38 +00:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	4c6a735235	refs #4962 moved sql and methods to ticket	2022-12-20 11:53:54 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Alexandre Riera	342eec1e41	refs #3963 autoload fixed	2022-12-20 11:36:58 +01:00
Alexandre Riera	b356839148	refs #3963 autoload fixed	2022-12-20 11:36:37 +01:00
Vicent Llopis	8b5f5d928e	fix: backTest	2022-12-20 10:40:39 +01:00
Joan Sanchez	73ea928b33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-20 10:40:23 +01:00
Joan Sanchez	47e1c05e47	Renamed version	2022-12-20 10:39:39 +01:00
Joan Sanchez	70b1854cc5	Added version	2022-12-20 10:20:31 +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
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Vicent Llopis	63343998d8	refactor: cambiada la forma en que se descarga el zip	2022-12-20 09:48:58 +01:00
Pau	d8cae400a8	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 07:11:59 +00: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
Alex Moreno	5d2b69d063	test(item_fixedPrice): front recalculateRate2	2022-12-19 15:06:59 +01:00
Alex Moreno	f82870bec6	feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item	2022-12-19 14:39:38 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +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
Joan Sanchez	3524c027a0	Merge pull request 'TEST_hotFix_disable_outLayout' (!1210) from hotFix_disable_outLayout into test ... Reviewed-on: #1210 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-19 06:30:24 +00:00
Pau	28e0d0566c	Merge branch 'dev' into 4875-skip-tests	2022-12-19 06:13:45 +00:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Alexandre Riera	6130547420	Merge branch 'dev' into 4503-opcion-rocket	2022-12-16 12:42:42 +00:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Alexandre Riera	fb4432b088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-16 13:06:06 +01: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
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +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
Alex Moreno	47f624ec04	skip e2e test	2022-12-16 09:01:30 +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