629 Commits

Author	SHA1	Message	Date
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	d7843f3298	Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation	2022-11-22 14:24:55 +01:00
Alexandre Riera	34fb80beec	fix translations	2022-11-22 14:24:19 +01:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alex Moreno	8dcd567a68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-15 13:20:52 +01:00
Alexandre Riera	607f61092a	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:06:10 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Vicent Llopis	284837083c	feat: coge el idioma local	2022-11-15 12:34:18 +01:00
Vicent Llopis	fc516d4029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-15 12:23:59 +01:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Alex Moreno	bcab493f37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-15 07:33:53 +01:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	03ea2b4f11	refs #4700 translations	2022-11-14 08:55:27 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Vicent Llopis	918ea3030d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-10 14:41:12 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Vicent Llopis	1bc8cf52d5	add translate	2022-11-08 08:20:36 +01:00
Vicent Llopis	d34a4ae992	add translate	2022-11-08 08:19:25 +01:00
Vicent Llopis	51b047eacc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 07:40:31 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Vicent Llopis	7fc18c89df	feat: error handlers	2022-11-07 13:57:54 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Alex Moreno	36894c31de	Merge branch 'dev' into 4077-login_recover-password	2022-11-03 08:39:04 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Vicent Llopis	6df74facdc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-02 14:23:20 +01:00
Alex Moreno	6a9134d8f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-02 13:48:36 +01:00
Alex Moreno	9c671ed3a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 13:47:00 +01:00
Alex Moreno	755a1667dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-02 07:35:04 +01:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Vicent Llopis	d9107719fa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-10-31 15:04:33 +01:00
Vicent Llopis	3243d35bd7	feat: send email	2022-10-31 14:48:37 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Alex Moreno	bcfbeb7032	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-21 12:41:39 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Alex Moreno	8985a678d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-18 09:49:06 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Pau	d91814473e	Merge branch 'dev' into 4124-webp-images	2022-10-17 06:45:49 +00:00
Alex Moreno	6bfd54fc71	feat(verify): use user.verify	2022-10-17 07:22:22 +02:00
Alex Moreno	acc88c8239	use ejs template	2022-10-11 14:56:33 +02:00
Alex Moreno	ce2ad32ac9	add email template	2022-10-10 15:16:56 +02:00
Alex Moreno	5c4daee35e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-10-10 14:20:22 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Pau	452745b04a	Added webp to the list of allowed images	2022-10-10 09:01:52 +02:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Joan Sanchez	f2eaa9d0e5	Merge branch 'dev' into 4077-login_recover-password	2022-10-06 06:28:00 +00:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Alex Moreno	81752e7f30	quit userError	2022-09-28 12:20:29 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Alex Moreno	d2cbaa565e	add translation	2022-09-26 08:48:46 +02:00
Alex Moreno	dc605387ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-09-26 08:23:10 +02:00
Alex Moreno	fc5460dc9e	feat(account): send verifyEmail when change email and tests	2022-09-26 08:21:58 +02:00
Alex Moreno	c79f884526	feat(recover-password): open changePass in front and tests done	2022-09-22 09:22:24 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Joan Sanchez	284524e3fa	Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev ... Reviewed-on: #1054 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-21 06:49:44 +00:00
Alex Moreno	918863ee8e	feat(account): recover-password	2022-09-20 15:21:01 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Alex Moreno	4f7218ab76	translation	2022-09-14 13:01:40 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Alex Moreno	cac4e74793	refactor	2022-05-31 09:06:15 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02:00
Vicent Llopis	579ff3aa4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo	2022-04-21 07:13:34 +02:00
Vicent Llopis	5db20ee3e2	refactor: deleteOldFiles in claim	2022-04-20 14:46:37 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Joan Sanchez	47a2f76aa4	3837 - Import data from external service	2022-04-11 11:58:40 +02:00
Vicent Llopis	5567e07773	feat(claim_photo): can upload videos	2022-04-08 09:34:46 +02:00
Vicent Llopis	1915850a09	feat(claim_photo): added videos	2022-04-07 14:12:56 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Vicent Llopis	e29f820e60	feat(ticket_line): new table ticketRefund and update proc ticket_doRefund	2022-03-30 08:56:35 +02:00
Carlos Jimenez Ruiz	39694b31b8	Merge branch 'dev' into 3607-supplier_agencyTerm	2022-03-28 08:40:32 +00:00
Vicent Llopis	fd7afc962f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-23 12:53:33 +01:00
Vicent Llopis	1056060957	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-23 12:37:34 +01:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Vicent Llopis	29036cc39d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-21 13:17:52 +01:00
Vicent Llopis	fae267f539	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data	2022-03-21 13:15:46 +01:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Vicent Llopis	644c24fa3b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm	2022-03-17 11:55:07 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Vicent Llopis	2f53733151	refactor translates	2022-03-15 15:05:09 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	aa5ff474ec	solved test e2e	2022-03-11 12:21:39 +01:00
Vicent Llopis	a32ebc37da	add supplier autonomous	2022-03-09 23:54:23 +01:00
Vicent Llopis	03c8ceffb2	refactor code	2022-03-07 13:54:18 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Carlos Jimenez Ruiz	5a9523642d	Merge branch 'dev' into 3258-import_buys	2022-02-01 12:07:41 +00:00
Joan Sanchez	87ae05c997	Added translation	2022-02-01 12:51:38 +01:00
Joan Sanchez	67985077e7	fix(loggable): removed private properties from logs	2022-02-01 11:24:04 +01:00
Alex Moreno	8794f8639f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback	2022-01-25 15:04:52 +01:00
Alex Moreno	6d9afd5f4c	feat(ticket_sale): role restriction to create payBack	2022-01-21 11:40:48 +01:00
Javi Gallego	6d66ab7bea	getTotals without transaction	2022-01-20 10:05:24 +01:00
Joan Sanchez	52d7b4f600	Updated unit tests	2022-01-20 09:53:40 +01:00
Javi Gallego	3c8e6a16a2	Merge branch 'dev' into 2883-invoiceIn-Booking	2022-01-19 14:19:29 +01:00
Carlos Jimenez Ruiz	cc3e2fbc3a	can't transfer claimed sales without claimManager role	2022-01-12 10:17:51 +01:00
Alex Moreno	5462af91ee	extract to variable	2022-01-10 11:38:02 +01:00
Alex Moreno	860499db82	refactor(ticket): add more text in error when change zone	2022-01-07 08:28:57 +01:00
Joan Sanchez	c24df3ade9	Updated translations	2022-01-05 16:23:58 +01:00
Alex Moreno	f67edffcf1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data	2021-12-20 13:51:44 +01:00
Carlos Jimenez Ruiz	b4f1e66fed	order module transactions	2021-12-15 15:29:22 +01:00
Javi Gallego	a99174e42a	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-12-14 09:50:39 +01:00
Alex Moreno	6465a5c460	feat(supplier): payMethodChecked for financial	2021-12-14 08:23:11 +01:00
Vicent Llopis	4c064f8a80	feat(worker_calendar): add restrictions to add absence and to add hours recorded	2021-11-30 09:11:23 +01:00
Carlos Jimenez Ruiz	dd19ac975d	Merge branch 'dev' into 3338-worker_calendar	2021-11-22 13:18:53 +00:00
Joan Sanchez	8c5f0d3019	feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago ... Refs: 3278	2021-11-19 09:24:31 +01:00
Javi Gallego	c8e9416448	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-19 07:33:54 +01:00
Alex Moreno	16c28cfa56	fix(client): validate businessType	2021-11-18 12:15:37 +01:00
Javi Gallego	b936272898	Merge branch 'dev' into 2883-invoiceIn-Booking	2021-11-18 07:36:03 +01:00
Vicent Llopis	7efb19ab83	feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"	2021-11-15 14:49:14 +01:00
Vicent Llopis	095e137c06	translate to english	2021-11-15 10:10:57 +01:00
Vicent Llopis	9b46b31010	translate	2021-11-10 12:03:53 +01:00
Vicent Llopis	d94e2900d0	feat(ticket-request): send rocket message when ticket-reques is denied	2021-10-27 12:16:37 +02:00
Alex Moreno	9c4e46f363	export_database	2021-10-20 13:32:03 +02:00
Carlos Jimenez Ruiz	5e8c216cd2	fix(dependencies): jasmine and it's reporters upgraded	2021-10-15 14:39:45 +02:00
Joan Sanchez	197ed2009f	fix(invoicePdf): Create PDF document on invoice download ... Refs: 3109, 3110	2021-09-29 12:15:42 +02:00
Javi Gallego	e5c9ea850b	testback done	2021-09-24 08:24:34 +02:00
Joan Sanchez	e8792d5686	refactor(client): added restriction to change the credit amount from zero set by a manager ... Refs: 3087	2021-09-09 14:43:18 +02:00
Carlos Jimenez Ruiz	a0fd0ba8f3	refactor(fiscaldata): added translation for the backend error	2021-09-08 11:22:59 +02:00
Carlos Jimenez Ruiz	f2f81442d9	fix(cloneWithEntries): endpoint was broken due to production changes	2021-09-02 14:17:35 +02:00
Carlos Jimenez Ruiz	71f77ea69c	test(clone): e2e path for clone is broken #3082	2021-09-02 12:56:35 +02:00
Joan Sanchez	a0efe5f896	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-31 06:27:23 +00:00
Carlos Jimenez Ruiz	0b331c4026	adapted a test that was using the niches model	2021-08-30 13:27:51 +02:00
Javi Gallego	249ea918dd	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-13 08:18:34 +02:00
Javi Gallego	5efcd6a57e	translation	2021-08-12 14:00:15 +02:00
Javi Gallego	87fe3c529a	Merge branch 'dev' into 2940-invoiceInTax-section	2021-08-12 09:39:35 +02:00
Javi Gallego	3b9bdc18bf	funciona	2021-08-12 09:23:19 +02:00
Javi Gallego	54634ed22d	test okl	2021-08-12 07:39:26 +02:00
Joan Sanchez	3b127b6806	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global	2021-08-10 13:23:45 +02:00
Joan Sanchez	e65e90d00f	Global invoicing improvements	2021-08-10 11:48:29 +02:00
Carlos Jimenez Ruiz	e7a8bc0b6d	e2e for manual invoice	2021-08-09 18:24:53 +02:00
Joan Sanchez	8e84f98629	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global	2021-08-09 12:59:00 +02:00
Joan Sanchez	9911a6d6a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual	2021-08-06 12:37:25 +02:00
Joan Sanchez	41a1b3d909	2984 - Global invoicing endpoint	2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz	a771fd584f	minor refactors + missing transaction on discount	2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz	34b487a451	translations	2021-07-29 17:58:36 +02:00
Carlos Jimenez Ruiz	8d682f4e03	chat notifications for many sales modifications	2021-07-29 17:20:57 +02:00
Joan Sanchez	531937ebbc	2985 - Create a manual invoice from a ticket or client	2021-07-27 09:07:04 +02:00
Carlos Jimenez Ruiz	03b1ab0166	Merge branch 'dev' into 2983-ticket_invoice	2021-07-01 12:30:54 +00:00
Joan Sanchez	92b6318c79	Ammends	2021-07-01 13:31:04 +02:00
Joan Sanchez	9cd6728956	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2847-driver_route	2021-07-01 08:35:17 +02:00
Joan Sanchez	7e836e570f	2983 - Invoice tickets	2021-06-30 16:10:26 +02:00
Carlos Jimenez Ruiz	7e4e6fae21	e2e path for ticket dms import	2021-06-28 16:04:21 +02:00
Carlos Jimenez Ruiz	e2ff3ff17f	validation message for dup entry	2021-06-28 13:30:49 +02:00
Joan Sanchez	3ae520d247	2847 - Driver route now shows item packaging type	2021-06-21 09:10:47 +00:00
Carlos Jimenez Ruiz	6a2638ad9b	nickname added to english loopback locale	2021-06-18 16:10:24 +02:00
Joan Sanchez	3fcd78e1f3	Changes	2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz	d6ef5352a2	sale module now has canEdit endpoint to check arrays of sales	2021-05-26 09:14:18 +02:00
Carlos Jimenez Ruiz	d83d3b6765	documented the missing argument	2021-05-14 19:21:31 +02:00
Javi Gallego	84cd89d7f7	modifica la descripcion de la compensacion	2021-05-07 08:45:20 +02:00
Carlos Jimenez Ruiz	01f0fed0c3	Merge branch 'dev' into 2483-email_replyTo	2021-04-13 08:41:56 +00:00
Joan Sanchez	de769a2565	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-04-12 08:02:35 +02:00
Joan Sanchez	6eba19a1b7	OsTicket notifications	2021-04-12 07:48:29 +02:00
Joan Sanchez	465955d0c5	2483 - Added replyTo param when sending an email to client	2021-04-07 13:09:53 +02:00
Joan Sanchez	1a572ae256	Added english translation	2021-04-07 11:25:13 +02:00
Joan Sanchez	d4c6695629	2631 - Notify status change to incomplete	2021-04-07 07:45:00 +02:00
Joan Sanchez	de7f1bbc12	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-24 14:26:09 +01:00
Joan Sanchez	302dedef0f	Missing translations & attachment fix	2021-03-24 14:25:57 +01:00
Joan Sanchez	2c1b155122	Added missing translation	2021-03-24 13:48:14 +01:00
Joan Sanchez	e767e95729	Loggable fixes	2021-03-24 13:09:35 +01:00
Joan Sanchez	b3d333368b	#2819 - Notify worker assignment	2021-03-23 16:19:45 +01:00
Joan Sanchez	7ac4d67f97	Empty value not being logged in	2021-03-22 09:08:27 +01:00
Joan Sanchez	6210e60896	2669 - Changes to the translate values function	2021-03-19 19:20:19 +01:00
jorgebl	e12be7bf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-18 13:40:56 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
jorgebl	c74b635a1a	Translate and show url of item	2021-03-12 12:24:08 +01:00
Joan Sanchez	1ed4dd27d6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-11 08:59:02 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz	5908dea010	e2e path for account role	2021-03-05 16:25:09 +01:00
jorgebl	63ac492845	Added message for duplicated names	2021-03-05 08:45:14 +01:00
Javi Gallego	7c0e690f8f	sin console	2021-02-15 14:34:13 +01:00
Jorge Padawan	8800f76684	Translations recovered	2021-02-12 11:35:33 +01:00
Jorge Padawan	bb02a0de6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date	2021-02-10 16:59:29 +01:00
Javi Gallego	f87ea1b051	arrow-spacing	2021-02-10 08:13:45 +01:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00