18582 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Alex Moreno	02451818ef	typo	2023-05-17 14:31:19 +02:00
Carlos Satorres	69a25d8d03	refs #5696 horas a 00	2023-05-17 14:04:13 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Carlos Satorres	c31eee4906	refs #5696 landed	2023-05-17 13:35:55 +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
Juan Ferrer	e7f9984b4b	refs #5667 Fix decimal places	2023-05-17 13:02:51 +02:00
Carlos Satorres	60bfb1b079	refs #5689 fix pixels	2023-05-17 12:53:18 +02:00
Juan Ferrer	0d51987d47	refs #5667 Client sample translations	2023-05-17 12:41:25 +02:00
Alexandre Riera	0d980334b8	refs #5634 conditional merge	2023-05-17 12:41:00 +02:00
Juan Ferrer	f9fdf80350	refs #5667 Item translations added	2023-05-17 12:06:31 +02:00
Alex Moreno	c8c7f52408	Merge branch 'master' into hotFix_invoiceIn_issued	2023-05-17 09:56:21 +00:00
Alex Moreno	058f828b92	refs #4548 fix(invoiceIn): report use invoiceIn.issued	2023-05-17 11:54:59 +02:00
Juan Ferrer	f55e5f9f74	refs #5667 Business translations	2023-05-17 11:52:13 +02:00
Juan Ferrer	fa40bd9811	refs #5667 Style & translation fixes	2023-05-17 10:18:41 +02:00
Carlos Satorres	adafd7444b	refs #5334 worker-department	2023-05-17 10:04:44 +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
Carlos Satorres	f63dd0f9a3	refs #5334 datos	2023-05-17 09:05:28 +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
Juan Ferrer	dd9699e120	refs #5667 Translation fix	2023-05-16 20:54:13 +02:00
Juan Ferrer	d8eeacb371	refs #5667 Translation improved	2023-05-16 20:24:04 +02:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	7f881409fc	refs #5579 fix mockTime	2023-05-16 15:00:31 +02:00
Carlos Satorres	5c9ee21cfc	refs #5334 department.card	2023-05-16 14:00:05 +02:00
Vicent Llopis	191fb72331	test jenkins	2023-05-16 13:54:09 +02:00
Alexandre Riera	62d0af25d3	refs #5642 uncommented tests	2023-05-16 13:31:22 +02:00
Carlos Satorres	9f9963af56	refs #5334 descriptor	2023-05-16 13:10:26 +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
Carlos Satorres	d09889b08a	refs #5334 fix summary route	2023-05-16 12:12:25 +02:00
Carlos Satorres	3dcdbe0223	refs #5334 summary basic data	2023-05-16 11:41:42 +02:00
Carlos Satorres	612d0a2dfb	refs #5334 fix index	2023-05-16 09:52:48 +02:00
Alexandre Riera	ccdc43d4a3	Merge branch 'dev' into 4797-worker-notification-selector	2023-05-16 07:22:13 +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	1dcce0f3ee	Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master ... Reviewed-on: #1523 Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>	2023-05-16 07:01:44 +00:00