17333 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	c27ecf42bb	Merge pull request 'fix(searchBar): applyParams' (!1219) from 4960-hotFix_searchBar into master ... Reviewed-on: #1219	2022-12-22 06:52:34 +00:00
Alex Moreno	186a64f7fa	unfocus	2022-12-22 07:46:06 +01:00
Pau	00b3e37e6f	Merge branch 'Hotfix-crear-report-Factura-Electronica' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-crear-report-Factura-Electronica	2022-12-22 07:16:28 +01:00
Pau	05f4db7924	Add requested changes to the fixtures	2022-12-22 07:16:22 +01:00
Pau	314bd69d6e	Merge branch 'master' into Hotfix-crear-report-Factura-Electronica	2022-12-22 06:13:01 +00:00
Guillermo Bonet	5a25b0ef4c	refs #4975 Added model MdbVersionTree	2022-12-22 07:12:44 +01:00
Guillermo Bonet	d97a2738a4	refs #4975 Upload method modified and addedd model	2022-12-22 07:12:09 +01:00
Vicent Llopis	8880a83b89	feat: añadido saleTracking	2022-12-21 15:03:41 +01:00
Alex Moreno	27288d011d	fix(searchBar): applyParams	2022-12-21 15:01:05 +01:00
Alex Moreno	7e6cdc9152	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2	2022-12-21 13:47:54 +01:00
Alex Moreno	d18e360f73	unfocus e2e	2022-12-21 13:47:43 +01:00
Alex Moreno	502a692521	test(item_fixedPrice_rate2): backTest and e2e	2022-12-21 12:55:11 +01:00
Vicent Llopis	7731ca143e	Merge pull request '4804-ticket.descriptor_sms' (!1217) from 4804-ticket.descriptor_sms into dev ... Reviewed-on: #1217 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-21 11:29:59 +00:00
Vicent Llopis	630890cd04	fix: colum name in model	2022-12-21 12:23:16 +01:00
Vicent Llopis	a45ef27e3f	move changes sql	2022-12-21 12:15:33 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	2becc0200c	Merge branch 'master' into 4943-master_closeTickets	2022-12-21 10:53:37 +00:00
Vicent Llopis	4490614f3b	Merge pull request 'MASTER: hotfix_4961-travel.extra-community' (!1205) from hotfix_4961-travel.extra-community into master ... Reviewed-on: #1205	2022-12-21 10:51:02 +00:00
Vicent Llopis	3a33750890	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2022-12-21 10:11:37 +01:00
Vicent Llopis	a1134879e6	Merge branch 'master' into hotfix_4961-travel.extra-community	2022-12-21 08:57:59 +00:00
Vicent Llopis	7261415e16	fix: añadido length	2022-12-21 09:36:31 +01:00
Vicent Llopis	e4f4e70cc6	Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:26:53 +00:00
Vicent Llopis	6634ebcec5	fix: id duplicado en util.notification	2022-12-21 09:25:52 +01:00
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	b0595dd0da	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification	2022-12-21 08:12:59 +01: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	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Vicent Llopis	5a4a78d045	Merge branch 'dev' into 3951-invoiceOut.index_downloadZip	2022-12-21 07:02:12 +00:00
Pau	1430749892	Merge branch 'dev' into 4732-previa-label	2022-12-21 07:02:02 +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	c3508c50d4	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 15:29:44 +01:00
Alexandre Riera	c99bfef917	refs #3302 fixed scss	2022-12-20 15:29:21 +01:00
Alexandre Riera	140509202b	Merge branch 'dev' into 3963-ticket-advance	2022-12-20 14:20:26 +00:00
Vicent Llopis	799c26796e	feat: añadidos chips	2022-12-20 15:19:05 +01: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	1982e4c989	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 14:25:38 +01:00
Alexandre Riera	27e0c2d0be	refs #3302 where with changedModel and changedModelId	2022-12-20 14:23:47 +01:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	5b87514501	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat	2022-12-20 12:15:50 +01: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