15794 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
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
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
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	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
Alex Moreno	504791fd6d	typo	2023-05-16 08:48:25 +02:00
Alex Moreno	a1a3f910d3	hotFix(reset-passowrd): use model vnUser	2023-05-16 08:46:16 +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	7d589d5101	Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master ... Reviewed-on: #1520 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-05-15 08:12:29 +00:00
Alex Moreno	0aa12a5efb	hotFix(worker_new): use postcode not postalCode	2023-05-15 09:54:40 +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
Juan Ferrer	4abc8521d3	refs #5517 Style fixes	2023-05-12 11:25:16 +02:00
Juan Ferrer	f6e1ffa849	refs #5517 Log loader fix	2023-05-12 09:48:22 +02:00
Alexandre Riera	b9ec6b93b6	Merge branch 'dev' into 5655-afinar-login	2023-05-12 07:46:10 +00:00
Alex Moreno	598fe7ac0d	Merge pull request '231801_test_to_master' (!1519) from 231801_test_to_master into master ... Reviewed-on: #1519 Reviewed-by: Vicent Llopis <vicent@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-05-12 06:29:54 +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
Alex Moreno	1d6a541b02	test into master	2023-05-11 15:07:02 +02:00
Alex Moreno	30e71a9d5e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 231801_test_to_master	2023-05-11 15:06:50 +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