15716 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Juan Ferrer	e7f9984b4b	refs #5667 Fix decimal places	2023-05-17 13:02:51 +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
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	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	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
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
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
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
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
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	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
Alex Moreno	e97d063832	Merge branch 'test' into fix_orders_e2e	2023-05-10 08:17:37 +00:00
Juan Ferrer	df1803a2e3	refs #5517 Front test fix	2023-05-10 10:11:52 +02:00
Alex Moreno	706c62f624	typo	2023-05-10 09:26:33 +02:00
Alex Moreno	3b8cafc783	fix(ticketConfigSql): correct folder	2023-05-10 09:22:33 +02:00
Alex Moreno	8c0deb6cfa	test(e2e_order): fiter optimized	2023-05-10 09:16:19 +02:00
Juan Ferrer	7a668adf18	refs #5517 pagination fixes	2023-05-08 16:50:20 +02:00