15734 Commits

All Branches

Search

Author	SHA1	Message	Date
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	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
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
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
Vicent Llopis	8cf988b7d2	refs #5638 refactor: code	2023-05-19 08:02:17 +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	36205e75be	feat(232201): new version	2023-05-18 07:55:43 +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
Alex Moreno	b1bbc22afc	Merge branch 'dev' into 5579-db-export	2023-05-17 11:15:39 +00:00
Alex Moreno	cd34ccad8f	refs #5579 use variable	2023-05-17 13:14:43 +02:00
Carlos Satorres	60bfb1b079	refs #5689 fix pixels	2023-05-17 12:53:18 +02:00
Vicent Llopis	c7da71d8c0	Merge pull request '5594-sendPdf_whenMakeInvoice' (!1489) from 5594-sendPdf_whenMakeInvoice into dev ... Reviewed-on: #1489 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-17 07:37:34 +00:00
Vicent Llopis	eaaa860e97	Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice	2023-05-17 07:27:46 +00:00
Alex Moreno	cc23fd1337	refs #5579 fix mockTimes and remove userLog_add	2023-05-17 09:23:37 +02:00
Alex Moreno	c9af22780b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export	2023-05-17 08:24:23 +02:00
Alex Moreno	7f881409fc	refs #5579 fix mockTime	2023-05-16 15:00:31 +02:00
Vicent Llopis	191fb72331	test jenkins	2023-05-16 13:54:09 +02:00
Pablo Natek	addd53feca	Merge pull request 'refs #5153' (!1483) from 5153-worker-sin-tr into dev ... Reviewed-on: #1483 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-05-16 10:36:48 +00:00
Pablo Natek	3d05b79748	Merge branch 'dev' into 5153-worker-sin-tr	2023-05-16 10:30:28 +00:00
Alex Moreno	799045314f	Merge pull request 'refs #5160 increase jasmine timeout' (!1524) from 5160-increase_jasmine_timeout into dev ... Reviewed-on: #1524 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-16 07:21:01 +00:00
Alex Moreno	9f0d5097fe	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00
Alex Moreno	3e33030b1d	refs #5579 update mariadb version to 10.7.6	2023-05-15 15:16:22 +02:00
Vicent Llopis	9ce3e79e00	refs #5594 eliminado archivo ducplicado	2023-05-15 11:50:51 +02:00
Vicent Llopis	d5f5115980	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice	2023-05-15 11:50:09 +02:00
Alex Moreno	ea6837e33a	refs #5579 export structure and data	2023-05-12 13:07:24 +02:00
Pablo Natek	8419c76b12	refs #5153 worker sin tr	2023-05-12 12:51:07 +02:00
Alexandre Riera	b9ec6b93b6	Merge branch 'dev' into 5655-afinar-login	2023-05-12 07:46:10 +00:00
Pablo Natek	65082be077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr	2023-05-12 08:28:19 +02:00
Carlos Satorres	f53eef0455	Merge pull request 'refs move reports views' (!1518) from footnotesSolve into test ... Reviewed-on: #1518 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-11 12:50:27 +00:00
Alex Moreno	5924a557e9	Merge branch 'test' into footnotesSolve	2023-05-11 12:16:17 +00:00
Javi Gallego	8a843b37bd	refs #5160 Back test timeout workaround	2023-05-11 13:54:42 +02:00
Juan Ferrer	d0c8be5697	refs #5517, #5667 Fix crudModel status, log fixes	2023-05-11 12:07:14 +02:00
Carlos Satorres	43ab07d954	refs move reports views	2023-05-11 11:57:13 +02:00
Alexandre Riera	7bcb00c127	refs #5655 removed relation	2023-05-11 08:55:11 +02:00
Alex Moreno	4818e985ff	Merge pull request 'master to test' (!1515) from 231801_master_to_test into test ... Reviewed-on: #1515 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-11 06:19:32 +00:00
Alex Moreno	7704256079	master to test	2023-05-11 08:00:49 +02:00
Alex Moreno	1654cc410a	Merge pull request 'test_to_dev' (!1513) from test_to_dev into dev ... Reviewed-on: #1513 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-10 10:41:11 +00:00
Alex Moreno	49e2c38ddd	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_to_dev	2023-05-10 12:30:56 +02:00
Alex Moreno	9ab850b34d	Merge pull request 'test(e2e_order): fiter optimized' (!1510) from fix_orders_e2e into test ... Reviewed-on: #1510 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-10 09:41:43 +00:00