12527 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	121efcca2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-28 12:57:01 +02:00
Carlos Jimenez Ruiz	1981232df4	Merge branch 'dev' into 4217-worker_time-control_tests	2022-06-28 10:45:16 +00:00
Joan Sanchez	ebac2c17f8	Merge pull request '4098-rename_procedures' (#1015) from 4098-rename_procedures into dev ... Reviewed-on: #1015 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-28 10:28:50 +00:00
Joan Sanchez	df2be27dd3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-28 12:28:19 +02:00
Alex Moreno	22fd0e91b0	title translations, and getWorkedHours test	2022-06-28 12:10:37 +02:00
Joan Sanchez	ae8aae6c20	Changed scope	2022-06-28 11:58:01 +02:00
Joan Sanchez	5714eb80f2	fix(closure): Wrong error handler scope	2022-06-28 11:21:47 +02:00
Alex Moreno	a3f1c36226	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz	a52748348b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4098-rename_procedures	2022-06-28 11:09:24 +02:00
Carlos Jimenez Ruiz	f9dd4f19d0	Merge pull request '4223-claim_observations' (#1012) from 4223-claim_observations into dev ... Reviewed-on: #1012 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-06-28 09:00:22 +00:00
Carlos Jimenez Ruiz	bdf4ecdf50	Merge branch 'dev' into 4223-claim_observations	2022-06-28 07:03:44 +00:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Carlos Jimenez Ruiz	84606de1da	e2e path for claim notes + refactor	2022-06-27 17:25:35 +02:00
Alex Moreno	50836a96f7	translate errors	2022-06-27 15:14:38 +02:00
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	0197f08c48	typo	2022-06-27 14:13:50 +02:00
Alex Moreno	7980a941a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 14:03:24 +02:00
Joan Sanchez	4a8bf566dc	Merge pull request '4233-export-database' (#1013) from 4233-export-database into dev ... Reviewed-on: #1013 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-27 11:50:48 +00:00
Alex Moreno	212c351064	fix(item_create): fixtures and test	2022-06-27 13:17:22 +02:00
Carlos Jimenez Ruiz	57fd528e9b	removed fixtures from deprecated column	2022-06-27 12:20:17 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	6370471bd5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations	2022-06-27 11:01:42 +02:00
Carlos Jimenez Ruiz	f1cb5a958c	data migration from claim.observation to claimObservations	2022-06-27 11:01:29 +02:00
Vicent Llopis	fcf79a507c	Merge branch 'dev' into 4213-item.summary	2022-06-27 05:32:21 +00:00
Alex Moreno	4155b45785	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 07:22:43 +02:00
Alex Moreno	9acd98e7b7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4233-export-database	2022-06-27 07:15:43 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Joan Sanchez	2fedc58693	Merge pull request '4045-incoterms_authorization' (#1010) from 4045-incoterms_authorization into dev ... Reviewed-on: #1010 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-23 13:42:44 +00:00
Joan Sanchez	e3cb89b0a6	Moved SQL files from version	2022-06-23 15:19:02 +02:00
Alex Moreno	86eb31ce65	fix(db_structure): change vn.VN_ to util.VN_	2022-06-23 14:22:28 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Juan Ferrer	7d67ca0e89	DB structure & data export, DB Dockerfile version changed to 10.7.3	2022-06-23 12:14:16 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Vicent Llopis	2c721867fc	feat(item.summary): add description	2022-06-22 14:30:25 +02:00
Joan Sanchez	099189fdfb	Added translation	2022-06-22 14:17:41 +02:00
Joan Sanchez	2381a5d09a	Updated e2e tests	2022-06-22 12:40:11 +02:00
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +02:00
Joan Sanchez	cffff93cdc	Updated translations	2022-06-22 10:57:28 +02:00
Joan Sanchez	b2d57f4022	Added portuguese translation	2022-06-22 09:25:21 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Alex Moreno	e4d71cfa15	Merge pull request '2240-salix-version-refresh' (#1001) from 2240-salix-version-refresh into dev	2022-06-22 05:21:10 +00:00
Alex Moreno	6d6b248202	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-22 05:09:48 +00:00
Carlos Jimenez Ruiz	5aec6b4ac1	Merge pull request '4088-feat(client_web-access): add email field' (#1009) from 4088-client_web-access_email into dev ... Reviewed-on: #1009 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>	2022-06-21 12:45:05 +00:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	b41cf7a569	Merge pull request '4208-ticket.refund' (#1000) from 4208-ticket.refund into test ... Reviewed-on: #1000	2022-06-21 11:31:43 +00:00
Alex Moreno	c43b32bee7	Merge branch 'dev' into 2240-salix-version-refresh	2022-06-21 11:30:44 +00:00
Joan Sanchez	1d8fa517e7	Merge pull request 'refactor(ticket.create): display only active addresses' (#1008) from 4138-ticket_create_address_isActive into dev ... Reviewed-on: #1008 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-21 11:29:56 +00:00