15804 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	3b7b31deb1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges	2023-05-23 08:31:52 +02:00
Vicent Llopis	b65ebc6af3	refs #5468 feat: cambiados acls	2023-05-23 07:09:51 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alex Moreno	f030ecd2a7	Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev ... Reviewed-on: #1526 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-22 14:44:37 +00:00
Alex Moreno	380287b819	Merge pull request 'correct type' (!1545) from 5094-fix_id_type into test ... Reviewed-on: #1545 Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>	2023-05-22 13:05:29 +00:00
Alex Moreno	3189799b4c	correct type	2023-05-22 14:45:00 +02:00
Alex Moreno	c42400a637	Merge branch 'dev' into 5579-db-export	2023-05-22 12:43:57 +00:00
Alexandre Riera	c15e77f5c1	Merge pull request 'fixes #5655 Afinar login' (!1516) from 5655-afinar-login into dev ... Reviewed-on: #1516 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-22 10:36:05 +00:00
Alexandre Riera	e589e70e06	Merge branch 'dev' into 5655-afinar-login	2023-05-22 10:31:27 +00:00
Alex Moreno	03d69f81c5	Merge pull request 'refs #5094 add scopes' (!1540) from 5094-test_docuware_autoSend into test ... Reviewed-on: #1540 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-22 09:32:48 +00:00
Carlos Satorres	a731cbf0cd	Merge pull request 'refs #5689 fix pixels' (!1530) from 5689-fixedPricesSize into dev ... Reviewed-on: #1530 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-22 06:53:59 +00:00
Carlos Satorres	e9222dbcb7	Merge branch 'dev' into 5689-fixedPricesSize	2023-05-22 06:31:51 +00:00
Juan Ferrer	e08f848812	refs #5667 Model id html fix	2023-05-21 14:35:50 +02:00
Juan Ferrer	69b892f2fd	refs #5667 Translations	2023-05-20 16:59:39 +02:00
Juan Ferrer	a4beb84e66	refs #5667 Translations fixes	2023-05-20 16:49:34 +02:00
Juan Ferrer	08e0bf7ddd	refs #5667 Color fixes	2023-05-20 14:16:24 +02:00
Juan Ferrer	35331e355f	refs #5667 Fixes: Colors, translation	2023-05-20 14:09:11 +02:00
Juan Ferrer	1160cbc279	refs #5667 Fixes: Style, translations, icons	2023-05-20 13:50:55 +02:00
Juan Ferrer	718002d5aa	refs #5667 Style fixes	2023-05-19 14:38:45 +02:00
Juan Ferrer	c1e222db83	refs #5667 Style fixes	2023-05-19 14:31:16 +02:00
Juan Ferrer	20b3c4f5b8	refs #5667 Style improved	2023-05-19 13:51:20 +02:00
Vicent Llopis	f81e9ec23e	Merge pull request '5638-ticket.summary_states' (!1538) from 5638-ticket.summary_states into dev ... Reviewed-on: #1538 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-05-19 11:35:31 +00:00
Juan Ferrer	a190f2152b	refs #5667 Fixes: Translations, help	2023-05-19 11:14:29 +02:00
Juan Ferrer	29610e52cc	refs #5667 No detail label fix	2023-05-19 11:01:34 +02:00
Juan Ferrer	c7febc9699	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-05-19 10:56:19 +02:00
Juan Ferrer	6b0fd99eb8	refs #5667 Fixes: Style, translations, fixtures, UI	2023-05-19 10:56:15 +02:00
Alex Moreno	8b0d7eb26c	Merge pull request 'refs #4548 hotFix(invoiceIn): report use invoiceIn.issued' (!1527) from hotFix_invoiceIn_issued into master ... Reviewed-on: #1527 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-19 06:27:28 +00:00
Alex Moreno	975154c929	Merge branch 'master' into hotFix_invoiceIn_issued	2023-05-19 06:16:18 +00:00
Vicent Llopis	8cf988b7d2	refs #5638 refactor: code	2023-05-19 08:02:17 +02:00
Alex Moreno	f54d9180b1	fix front test	2023-05-18 14:44:05 +02:00
Alex Moreno	15a1965a53	refs #5094 add scopes	2023-05-18 14:12:46 +02:00
Vicent Llopis	703ab3439a	refs #5638 fix: intermittent e2e	2023-05-18 09:52:20 +02:00
Vicent Llopis	d33a84c39f	refs #5638 feat: updated backTest	2023-05-18 09:30:21 +02:00
Vicent Llopis	463d209d77	refs #5638 refactor: eliminado if innecesario	2023-05-18 09:21:30 +02:00
Vicent Llopis	9263684ec5	refs #5638 fix: contempla que se le pase un filtro del 'nombre'	2023-05-18 08:58:13 +02:00
Vicent Llopis	c76b84d3cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states	2023-05-18 08:53:40 +02:00
Vicent Llopis	b66362d313	refs #5638 fix: cambiado nombre de variable	2023-05-18 08:33:17 +02:00
Alex Moreno	7c76521b02	Merge pull request 'feat(232201): new version' (!1537) from 232201_dev_version into dev ... Reviewed-on: #1537 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-18 06:05:46 +00:00
Alex Moreno	3af2b8c3ae	Merge pull request '232001_dev_to_test' (!1536) from 232001_dev_to_test into test ... Reviewed-on: #1536 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-18 06:02:01 +00:00
Alex Moreno	36205e75be	feat(232201): new version	2023-05-18 07:55:43 +02:00
Alex Moreno	e17b9a32b9	add schema	2023-05-18 07:46:51 +02:00
Alex Moreno	da5e6a43f6	set changes in changelog	2023-05-18 07:44:39 +02:00
Vicent Llopis	a9f71ccbc1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5638-ticket.summary_states	2023-05-18 07:33:08 +02:00
Alex Moreno	665a933a0f	Merge pull request '232001_test_to_dev' (!1535) from 232001_test_to_dev into dev ... Reviewed-on: #1535 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-18 05:31:26 +00:00
Alex Moreno	ba763abc26	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev	2023-05-18 07:17:31 +02:00
Juan Ferrer	48da4b13ff	refs #5667 Ticket translation fixes	2023-05-17 17:08:20 +02:00
Juan Ferrer	14d353f44e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-05-17 16:43:50 +02:00
Juan Ferrer	e8e04423f0	refs #5667 Atrs ordered by name	2023-05-17 16:43:48 +02:00
Alex Moreno	1933341220	Merge pull request '5696-ReclamacionesFueraDePlazoLanded' (!1532) from 5696-ReclamacionesFueraDePlazoLanded into master ... Reviewed-on: #1532 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-17 13:04:24 +00:00