258 Commits

Author	SHA1	Message	Date
Alexandre Riera	83319894b2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev	2023-04-25 11:25:29 +02:00
Alex Moreno	7a79dfd4d1	deploy: 231401 test to dev	2023-04-21 12:49:03 +02:00
Alexandre Riera	b3a10698af	hotfix negativeBases	2023-04-21 08:20:38 +02:00
Alex Moreno	7df4a2b15d	fix(231401): fix tests and fixtures	2023-04-20 08:25:15 +02:00
Joan Sanchez	fded7d062b	section fix	2023-04-18 09:49:23 +02:00
Juan Ferrer	c5dcfd3cab	refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing	2023-04-15 14:24:50 +02:00
Carlos Andrés	6b375cbaaa	refs #5000 InvoiceOut	2023-03-14 09:34:41 +01:00
Vicent Llopis	0bda8c0ed6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-07 09:14:30 +01:00
Vicent Llopis	5248fd7fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing	2023-03-06 10:20:57 +01:00
Javi Gallego	780572a9f2	test fixed	2023-03-06 08:14:26 +01:00
Carlos Andrés	6f5e25493d	invoicing test	2023-03-01 10:36:38 +01:00
Alexandre Riera	2e09845dbd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund	2023-03-01 08:29:58 +01:00
Alexandre Riera	e9dca9211c	refs #5149 checked if ticket has refunds, added translations	2023-02-28 13:42:18 +01:00
Alexandre Riera	7d617c0ac4	refs #5129 translations and userErrors added	2023-01-31 09:04:45 +01:00
Vicent Llopis	7f80c7ed2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-22 09:30:35 +01:00
Vicent Llopis	06075aa17b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms	2022-12-21 12:15:21 +01:00
Vicent Llopis	1d7145d74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-21 08:05:19 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Carlos Andrés	41b7b6ab06	Merge branch 'dev' into 4865-sintaxis-mensajes-de-rocket	2022-12-12 08:24:11 +00:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Vicent Llopis	1588492f9a	feat: solo añade los logs de salix con el model 'Sale'	2022-11-30 13:29:39 +01:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Carlos Andrés	6b76804913	refs #4865 Sintaxis mensajes rocket	2022-11-28 10:52:15 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
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
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
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	36c0cc1a38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-31 14:12:40 +01:00
Alex Moreno	cf24301bfe	feat(account): email-verify refs #4077	2022-10-26 13:28:26 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +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
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
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
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	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Alex Moreno	22fd0e91b0	title translations, and getWorkedHours test	2022-06-28 12:10:37 +02:00
Alex Moreno	50836a96f7	translate errors	2022-06-27 15:14:38 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +02:00
Alex Moreno	5bad0592a5	change errors	2022-05-10 08:48:51 +02: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
Vicent Llopis	e4eed95724	notify rocket when claimState change to canceled	2022-03-21 10:02:56 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Alex Moreno	e09e84c36b	refactor(setSaleQuantity): rename, remove transaction	2022-02-08 12:41:55 +01:00
Joan Sanchez	52d7b4f600	Updated unit tests	2022-01-20 09:53:40 +01:00
Alex Moreno	16c28cfa56	fix(client): validate businessType	2021-11-18 12:15:37 +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
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
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
Javi Gallego	5efcd6a57e	translation	2021-08-12 14:00:15 +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
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	7e4e6fae21	e2e path for ticket dms import	2021-06-28 16:04:21 +02:00
Carlos Jimenez Ruiz	6a2638ad9b	nickname added to english loopback locale	2021-06-18 16:10:24 +02:00
Javi Gallego	84cd89d7f7	modifica la descripcion de la compensacion	2021-05-07 08:45:20 +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	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
jorgebl	c74b635a1a	Translate and show url of item	2021-03-12 12:24:08 +01:00
Carlos Jimenez Ruiz	5908dea010	e2e path for account role	2021-03-05 16:25:09 +01:00
Javi Gallego	7c0e690f8f	sin console	2021-02-15 14:34:13 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Joan Sanchez	4ac207c568	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2763-notify_urgent_issue	2021-02-01 12:58:50 +01:00
Joan Sanchez	f5f4c5936d	2763 - Notify urgen issues	2021-02-01 09:29:47 +01:00
Javi Gallego	6c2138a69a	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-08 15:24:05 +01:00
Javi Gallego	c0cc91b6c3	Merge branch 'dev' into 2517-clientBalanceCompensaciones	2021-01-07 09:11:34 +01:00
Joan Sanchez	e5b13267e2	2605 - Ticket request send chat notification	2021-01-05 15:03:35 +01:00
Carlos Jimenez Ruiz	5765fee47d	e2e path for entry.observation - missing role	2020-12-31 16:42:38 +01:00
Carlos Jimenez Ruiz	a867df7085	removed focus on describe and added translation	2020-12-31 12:38:54 +01:00
Javi Gallego	963db11686	funcionalidad	2020-12-16 08:33:08 +01:00
Carlos Jimenez Ruiz	840da5e6bc	e2e path for supplier.fiscalData	2020-11-04 18:14:08 +01:00
Joan Sanchez	146b4f5bcd	2534 - Fill sage data before enable taxDataChecked	2020-10-28 14:12:57 +01:00
Joan Sanchez	a45bd0987b	Removed comma	2020-10-27 12:33:43 +01:00
Joan Sanchez	c0dddba3c4	Added translation	2020-10-27 12:15:05 +01:00
Joan Sanchez	c87783b446	2528 - Rocket notifications hotfix	2020-10-21 13:25:52 +02:00
Joan Sanchez	f7e9372bf0	2525 - Change to past date	2020-10-20 15:12:00 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	420dfdbdff	Send notification by email	2020-10-02 12:23:48 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Joan Sanchez	94a219760c	2223 Added pickup checkbox	2020-05-13 15:04:57 +02:00
Joan Sanchez	835c415ba7	1934 - Moved procedure logic to method	2020-03-26 14:45:38 +01:00
Joan Sanchez	15bedc5f12	Updated unit tests	2020-03-03 15:03:54 +01:00
Joan Sanchez	39470e837b	2094 Regularize claim send chat even if doesn't have destination	2020-02-13 13:20:31 +01:00
Joan Sanchez	494b14bab4	added translation	2020-02-04 12:28:01 +01:00
Joan Sanchez	499bd082fc	changed messages	2020-01-29 14:13:25 +01:00
Joan Sanchez	0044bd2efa	updated tests	2020-01-28 09:03:20 +01:00
Joan Sanchez	57acca2f5e	refactor & updated tests	2020-01-23 13:31:07 +01:00
Joan Sanchez	676b5198a8	changed discount popover width + refresh discount	2019-12-13 08:01:13 +01:00
Joan Sanchez	b320d64462	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-12 14:54:13 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Bernat	74a2c58954	Bug #1862 fix e2e and front test	2019-11-12 08:51:50 +01:00
Joan Sanchez	2e22c79e18	fixed #1734 canHaveStowaway validation	2019-10-02 14:36:24 +02:00
Joan Sanchez	f56e4f4b7d	pick	2019-09-18 10:37:54 +02:00
Joan Sanchez	64a4e5f43d	ticket.basicData Select zone for productionBoss #1604	2019-07-26 11:48:01 +02:00
Joan Sanchez	bddfbc4b34	add new item from ticket.sale #1414, checkedLines fixed	2019-07-02 12:12:15 +02:00
Carlos Jimenez Ruiz	5270693bdd	#1387 e2e Ticket Edit sale path	2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz	63febf8bd0	#1537 refactor fixtures + e2e fixes	2019-06-19 09:03:45 +02:00
Bernat	2504d06bab	Bug/Test #1515 Dump structure de production a dev	2019-06-11 12:23:55 +02:00
Carlos Jimenez Ruiz	40654f94c4	#1475 no borrar servicios de tickets no editables	2019-05-29 13:06:42 +02:00
Carlos Jimenez Ruiz	28057ecf3f	#1445 e2e ticket.services	2019-05-20 11:16:56 +02:00
Carlos Jimenez Ruiz	2ca85394f3	#1385 excluded tests	2019-04-26 16:10:51 +02:00
Carlos Jimenez Ruiz	2b04eebe84	#1334 E2E ticket.descriptor - Make invoice	2019-04-23 08:58:49 +02:00
Carlos Jimenez Ruiz	b483ccba27	#1228e2e verifiedData solo cuando el NIF correto	2019-04-01 10:00:15 +02:00
Carlos Jimenez Ruiz	0fb95bc8d2	test repairs plus some traductions	2019-03-29 13:14:48 +01:00
Carlos Jimenez Ruiz	5e3c89005d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-03-12 10:58:10 +01:00
Carlos Jimenez Ruiz	2e4e7f8dd1	en.json update	2019-03-11 10:37:42 +01:00
Javi Gallego	159f8fdd6f	Quito la traduccion porque ya no existe	2019-03-04 08:34:01 +01:00
Joan Sanchez	4729dda5f6	isDefaultAddress to defaultAddressFk migration #1108	2019-02-28 08:55:34 +01:00
Javi Gallego	a0cf617cca	#498 e2e arreglado	2019-02-19 08:42:36 +01:00
Carlos Jimenez Ruiz	b5a1e52bf3	#1051	2019-02-07 14:33:52 +01:00
Carlos Jimenez Ruiz	50399ba325	merge	2019-02-06 16:10:18 +01:00
Carlos Jimenez Ruiz	8aed4013e1	#1051	2019-02-06 16:08:23 +01:00
Javi Gallego	6e421d8442	Tarea #808 order.basic-data cr juan	2019-02-06 14:56:36 +01:00