13957 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	f7a25c64b5	format sql	2023-01-17 10:13:41 +01:00
Pau	176005fcdc	requested changes	2023-01-12 13:54:22 +01:00
Pau	dfd264ff82	Merge branch 'dev' into 4732-previa-label	2023-01-12 13:29:45 +01:00
Vicent Llopis	bca8a324d8	Merge pull request 'fix: se excluyen los test de back que fallan intermitente' (!1225) from 5035-intermittent_backTest into dev ... Reviewed-on: #1225 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-12 07:40:00 +00:00
Vicent Llopis	352fba9acf	Merge branch 'dev' into 5035-intermittent_backTest	2023-01-12 07:32:44 +00:00
Alexandre Riera	e51e445b3e	Merge pull request 'fixes #3571 Refactorizar E2E (03-worker)' (!1233) from 3571-refactor-e2e into dev ... Reviewed-on: #1233 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-01-12 06:58:26 +00:00
Alexandre Riera	7bdc04cd13	Merge branch 'dev' into 3571-refactor-e2e	2023-01-12 06:55:09 +00:00
Pau	71db01a45c	Merge pull request '4875-fix-back-tests' (!1240) from 4875-fix-back-tests into dev ... Reviewed-on: #1240 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-11 13:25:36 +00:00
Pau	c908a71ebf	Merge branch 'dev' into 4875-fix-back-tests	2023-01-11 13:22:40 +00:00
Vicent Llopis	b1e12c90ae	Merge pull request '2952-ticket.sale-checked' (!1246) from 2952-ticket.sale-checked into dev ... Reviewed-on: #1246 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 13:33:02 +00:00
Vicent Llopis	6f94987392	Merge branch 'dev' into 2952-ticket.sale-checked	2023-01-10 13:11:06 +00:00
Vicent Llopis	ef40c15a4e	Merge pull request '4846-claim.search-panel' (!1174) from 4846-claim.search-panel into dev ... Reviewed-on: #1174 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 13:09:19 +00:00
Pau	e0cf45546e	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 12:57:39 +00:00
Vicent Llopis	984a3294f9	Merge branch 'dev' into 4846-claim.search-panel	2023-01-10 11:58:00 +00:00
Alexandre Riera	1f1a69a2b4	Merge pull request 'fixes #4984 Añadir autoincrement a 2 tablas' (!1239) from 4984-autoincrement-vnReport-vnPrinter into dev ... Reviewed-on: #1239 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 10:43:55 +00:00
Alexandre Riera	6a1e170e91	Merge branch 'dev' into 4984-autoincrement-vnReport-vnPrinter	2023-01-10 10:35:29 +00:00
Vicent Llopis	ac3e68d846	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest	2023-01-10 10:14:46 +01:00
Alexandre Riera	73aab50155	Merge pull request 'fixes #4937 viewReceipt added' (!1223) from 4937-marcar-verRecibo into dev ... Reviewed-on: #1223 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-10 08:47:40 +00:00
Vicent Llopis	ff653ad834	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 09:18:02 +01:00
Alexandre Riera	28ac2677a3	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-10 08:02:51 +00:00
Alexandre Riera	5a49da26f6	Merge pull request 'fixes #4926 item.basic-data añadir campo' (!1227) from 4926-add-itemPackingOut into dev ... Reviewed-on: #1227 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-10 08:00:55 +00:00
Joan Sanchez	4cfa63918f	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 07:41:26 +00:00
Vicent Llopis	5f0fa5e369	add changelog	2023-01-10 08:34:38 +01:00
Vicent Llopis	eb3ed95b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 08:32:44 +01:00
Alexandre Riera	07fc5b69ad	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-10 07:32:03 +00:00
Vicent Llopis	cdee85e1e8	refacotor: change description	2023-01-10 08:31:32 +01:00
Robert Ferrús	e01dc33262	Merge pull request 'refactor(invoiceOut): updated translation' (!1243) from 4857-invoiceOutTranslate into dev ... Reviewed-on: #1243 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-09 09:11:40 +00:00
Alexandre Riera	d051d66417	Merge branch 'dev' into 4984-autoincrement-vnReport-vnPrinter	2023-01-09 08:43:29 +00:00
Robert Ferrús	bcefea726c	Merge branch 'dev' into 4857-invoiceOutTranslate	2023-01-05 13:54:01 +00:00
Pau	9911c3bccd	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2023-01-05 14:40:27 +01:00
Pau	7cc4a2e635	cambiar report body y estilos para centrar mas la label	2023-01-05 14:39:53 +01:00
Pau	4ae903191a	Merge branch 'dev' into 4732-previa-label	2023-01-05 12:48:03 +00:00
Robert Ferrús	6891da4863	refactor(invoiceOut): updated translation ... Refs #4857	2023-01-05 11:43:08 +01:00
Vicent Llopis	1aa21c16b5	refactor: borrado join a worker	2023-01-05 11:42:21 +01:00
Vicent Llopis	810a1afcd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2023-01-05 11:40:25 +01:00
Pau	252a2d2aad	Merge branch 'dev' into 4875-fix-back-tests	2023-01-05 08:49:40 +00:00
Pau	0e426db296	remove seed and randomize false on the test	2023-01-05 09:32:31 +01:00
Pau	80cc341bf0	refs #4875 @3h	2023-01-05 09:26:36 +01:00
Pau	f0761a92a2	reactivate working tests	2023-01-05 09:26:11 +01:00
Joan Sanchez	8f118748b6	Merge pull request 'fix(icons): prevent icon translation when using google translator' (!1237) from 5044-notranslate_icons into dev ... Reviewed-on: #1237 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-01-05 07:29:52 +00:00
Alexandre Riera	e82035606f	refs #4984 autoincrement added	2023-01-04 11:31:09 +01:00
Joan Sanchez	731e32c972	Merge branch 'dev' into 5044-notranslate_icons	2023-01-03 12:28:35 +00:00
Pau	56354ba771	reactivate test	2023-01-03 13:24:44 +01:00
Vicent Llopis	415fa04e3b	refs #2952 feat: add chips	2023-01-03 13:06:30 +01:00
Vicent Llopis	25dad4b358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-03 13:03:36 +01:00
Alexandre Riera	c6ad9a6aff	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-03 12:00:39 +00:00
Pau	4dee2313f4	Merge branch 'dev' into 4875-fix-back-tests	2023-01-03 12:53:03 +01:00
Alexandre Riera	2eea1e68e8	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-03 11:45:35 +00:00
Alexandre Riera	8397345cef	Merge branch 'dev' into 3571-refactor-e2e	2023-01-03 11:40:02 +00:00
Alexandre Riera	949c73a465	Merge pull request 'fixes #5051 Arreglar tests de back y e2e con fallo por cambio de fecha' (!1235) from 5051-fixBackE2E-dateChange into dev ... Reviewed-on: #1235 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-03 11:26:42 +00:00